X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterfaceModuleTest.kt;h=c931aaf6468b7aeb076a6ef2b579383d91c24ad3;hb=8e5d39243ef21fa42158b361dcee7361c5e9e4a2;hp=14427ef2c420d439b562f4eb69c662e8c928d6c3;hpb=ab598a7019581eca9981cf1101b315e13a3bcbaa;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
index 14427ef..c931aaf 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
@@ -2,8 +2,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,14 +12,15 @@ 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 java.util.*
-import kotlin.test.Test
+import kotlin.test.*
 
 class WebInterfaceModuleTest {
 
@@ -38,8 +37,7 @@ class WebInterfaceModuleTest {
 			SoneTextParser::class.isProvidedByMock(),
 			ElementLoader::class.isProvidedByMock(),
 			Loaders::class.isProvidedBy(loaders),
-			HighLevelSimpleClient::class.isProvidedByMock(),
-			SessionManager::class.isProvidedByMock()
+			HighLevelSimpleClient::class.isProvidedByMock()
 	)
 	private val injector = createInjector(webInterfaceModule, *additionalModules)!!
 	private val templateContext by lazy { injector.getInstance<TemplateContextFactory>().createTemplateContext()!! }
@@ -256,9 +254,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
@@ -280,7 +276,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>()
 	}
 
 }