X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterfaceModuleTest.kt;h=9c0860c7d771f75ee486394e0761a48c8f655593;hp=2bb31c94739e8ae1b0dfb5d7f4b131a0337dc001;hb=64740709990291688170ebd1f192af5eb9090618;hpb=8c387bf3c1315ee19902a8d15616ef394b486ffe

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
index 2bb31c9..9c0860c 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,16 +12,14 @@ 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 {
 
@@ -40,8 +36,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()!! }
@@ -258,9 +253,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
@@ -282,26 +275,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`() {
-		val firstNotificationManager = injector.getInstance<NotificationManager>()
-		val secondNotificationManager = injector.getInstance<NotificationManager>()
-		assertThat(firstNotificationManager, sameInstance(secondNotificationManager))
-	}
-
-	@Test
-	fun `notification handler can be created`() {
-		assertThat(injector.getInstance<NotificationHandler>(), notNullValue())
-	}
-
-	@Test
-	fun `notification handler is created as singleton`() {
-		val firstNotificationHandler = injector.getInstance<NotificationHandler>()
-		val secondNotificationHandler = injector.getInstance<NotificationHandler>()
-		assertThat(firstNotificationHandler, sameInstance(secondNotificationHandler))
+		injector.verifySingletonInstance<NotificationManager>()
 	}
 
 }