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

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 b727909..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
@@ -62,30 +62,16 @@ class MetricsPageTest : WebPageTest() {
 	}
 
 	@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")
-	}
-
-	@Test
-	fun `metrics page delivers correct histogram size`() {
-		val histogram = metricRegistry.histogram("sone.parsing.duration")
-		(0..4000).forEach(histogram::update)
-		page.handleRequest(soneRequest, templateContext)
-		assertThat(templateContext["soneParsingDurationCount"] as Long, equalTo(4001L))
-	}
-
-	private fun verifyHistogram(name: String) {
-		assertThat(templateContext["${name}Count"] as Long, equalTo(5L))
-		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 {