X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterfaceModuleTest.kt;h=8840caf6436f7c15f4a71845a1e4512675d8b413;hp=ec09b201d0fd415e14e91ba10c727cae2e44fbd0;hb=faf66247a34f64946990a985d2ea3003465969cb;hpb=6579401cd867c5ade1ebf098d64d85dc2016defe

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
index ec09b20..8840caf 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
@@ -3,7 +3,6 @@ package net.pterodactylus.sone.web
 import com.google.inject.Guice.*
 import freenet.client.*
 import freenet.clients.http.*
-import freenet.l10n.*
 import freenet.support.api.*
 import net.pterodactylus.sone.core.*
 import net.pterodactylus.sone.data.*
@@ -14,23 +13,28 @@ import net.pterodactylus.sone.main.*
 import net.pterodactylus.sone.template.*
 import net.pterodactylus.sone.test.*
 import net.pterodactylus.sone.text.*
+import net.pterodactylus.sone.web.notification.*
 import net.pterodactylus.sone.web.page.*
+import net.pterodactylus.util.notify.*
 import net.pterodactylus.util.template.*
 import net.pterodactylus.util.web.*
 import org.hamcrest.MatcherAssert.*
 import org.hamcrest.Matchers.*
-import org.junit.*
-import kotlin.test.Test
+import java.util.*
+import kotlin.test.*
 
 class WebInterfaceModuleTest {
 
 	private val webInterfaceModule = WebInterfaceModule()
-	private val l10n = mock<BaseL10n>()
 	private val loaders = mock<Loaders>()
+	private val translation = object : Translation {
+		override val currentLocale = Locale.ENGLISH
+		override fun translate(key: String) = if (key == "View.Sone.Text.UnknownDate") "unknown" else key
+	}
 	private val additionalModules = arrayOf(
 			Core::class.isProvidedByMock(),
 			SoneProvider::class.isProvidedByMock(),
-			BaseL10n::class.isProvidedBy(l10n),
+			Translation::class.isProvidedBy(translation),
 			SoneTextParser::class.isProvidedByMock(),
 			ElementLoader::class.isProvidedByMock(),
 			Loaders::class.isProvidedBy(loaders),
@@ -191,7 +195,6 @@ class WebInterfaceModuleTest {
 
 	@Test
 	fun `unknown date filter uses correct l10n key`() {
-		whenever(l10n.getString("View.Sone.Text.UnknownDate")).thenReturn("unknown")
 		assertThat(getFilter("unknown")!!.format(null, 0L, emptyMap()), equalTo<Any>("unknown"))
 	}
 
@@ -240,6 +243,11 @@ class WebInterfaceModuleTest {
 		verifyFilter<PaginationFilter>("paginate")
 	}
 
+	@Test
+	fun `template context histogram renderer`() {
+		verifyFilter<HistogramRenderer>("render-histogram")
+	}
+
 	private inline fun <reified F : Filter> verifyFilter(name: String) {
 		assertThat(getFilter(name), instanceOf(F::class.java))
 	}
@@ -248,9 +256,7 @@ class WebInterfaceModuleTest {
 
 	@Test
 	fun `template context factory is created as singleton`() {
-	    val factory1 = injector.getInstance<TemplateContextFactory>()
-	    val factory2 = injector.getInstance<TemplateContextFactory>()
-		assertThat(factory1, sameInstance(factory2))
+		injector.verifySingletonInstance<TemplateContextFactory>()
 	}
 
 	@Test
@@ -272,7 +278,12 @@ class WebInterfaceModuleTest {
 	@Test
 	fun `page toadlet factory is created with correct prefix`() {
 		val page = mock<Page<FreenetRequest>>()
-	    assertThat(injector.getInstance<PageToadletFactory>().createPageToadlet(page).path(), startsWith("/Sone/"))
+		assertThat(injector.getInstance<PageToadletFactory>().createPageToadlet(page).path(), startsWith("/Sone/"))
+	}
+
+	@Test
+	fun `notification manager is created as singleton`() {
+		injector.verifySingletonInstance<NotificationManager>()
 	}
 
 }