From 90e43deb171e0d178feac3c25d398a9dbe808768 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Tue, 30 Jul 2019 09:57:52 +0200 Subject: [PATCH] =?utf8?q?=E2=9C=85=20Fix=20initialization=20of=20metrics?= =?utf8?q?=20page=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../kotlin/net/pterodactylus/sone/web/pages/MetricsPageTest.kt | 7 +++---- src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) 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..0565612 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/pages/MetricsPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/MetricsPageTest.kt @@ -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`() { diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt index f51bece..61d1a03 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt @@ -43,7 +43,7 @@ open class WebPageTest(pageSupplier: (WebInterface, Loaders, TemplateRenderer) - val l10n = webInterface.l10n!! val sessionManager = mock() - val page by lazy { pageSupplier(webInterface, loaders, templateRenderer) } + open val page by lazy { pageSupplier(webInterface, loaders, templateRenderer) } val httpRequest = mock() val freenetRequest = mock() -- 2.7.4