X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FMetricsPageTest.kt;h=4d26b6c0c25a40545338e3ad09b7fde501971991;hb=HEAD;hp=ca69e6672ca08063f9afe5c1c2c253a904369bce;hpb=6562eedae6d6b25ecfb2f662a827db85f7026d50;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/MetricsPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/MetricsPageTest.kt
index ca69e66..4d26b6c 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/MetricsPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/MetricsPageTest.kt
@@ -1,5 +1,5 @@
 /**
- * Sone - MetricsPageTest.kt - Copyright © 2019 David ‘Bombe’ Roden
+ * Sone - MetricsPageTest.kt - Copyright © 2019–2020 David ‘Bombe’ Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,11 +25,10 @@ import org.hamcrest.MatcherAssert.*
 import org.hamcrest.Matchers.*
 import kotlin.test.*
 
-class MetricsPageTest : WebPageTest({ webInterface, loaders, templateRenderer -> MetricsPage(webInterface, loaders, templateRenderer, metricRegistry) }) {
+class MetricsPageTest : WebPageTest() {
 
-	companion object {
-		val metricRegistry = MetricRegistry()
-	}
+	private val metricRegistry = MetricRegistry()
+	override val page by lazy { MetricsPage(webInterface, loaders, templateRenderer, metricRegistry) }
 
 	@Test
 	fun `page returns correct path`() {
@@ -63,22 +62,16 @@ class MetricsPageTest : WebPageTest({ webInterface, loaders, templateRenderer ->
 	}
 
 	@Test
-	fun `metrics page lists stats about sone parsing durations`() {
-		createHistogram("sone.parsing.duration")
+	@Suppress("UNCHECKED_CAST")
+	fun `metrics page stores histograms in template context`() {
+		createHistogram("sone.random.duration2")
+		createHistogram("sone.random.duration1")
 		page.handleRequest(soneRequest, templateContext)
-		verifyHistogram("soneParsingDuration")
-	}
-
-	private fun verifyHistogram(name: String) {
-		assertThat(templateContext["${name}Count"] as Int, equalTo(5))
-		assertThat(templateContext["${name}Min"] as Long, equalTo(1L))
-		assertThat(templateContext["${name}Max"] as Long, equalTo(10L))
-		assertThat(templateContext["${name}Median"] as Double, equalTo(8.0))
-		assertThat(templateContext["${name}Percentile75"] as Double, equalTo(9.0))
-		assertThat(templateContext["${name}Percentile95"] as Double, equalTo(10.0))
-		assertThat(templateContext["${name}Percentile98"] as Double, equalTo(10.0))
-		assertThat(templateContext["${name}Percentile99"] as Double, equalTo(10.0))
-		assertThat(templateContext["${name}Percentile999"] as Double, equalTo(10.0))
+		val histograms = templateContext["histograms"] as Map<String, Histogram>
+		assertThat(histograms.entries.map { it.key to it.value }, containsInAnyOrder(
+				"sone.random.duration1" to metricRegistry.histogram("sone.random.duration1"),
+				"sone.random.duration2" to metricRegistry.histogram("sone.random.duration2")
+		))
 	}
 
 	private fun createHistogram(name: String) = metricRegistry.histogram(name).run {