X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSoneModuleTest.kt;h=01d12854338d84eaf9589d1b026256e432838469;hb=5c5bee980f9cab5792e34d1c9840f73b8b191830;hp=28481ada3ffecdd93d73e516fd9254a2e1ed09d0;hpb=47562abd9b9be05511954ebad829bb268057fd03;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
index 28481ad..01d1285 100644
--- a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
@@ -4,9 +4,10 @@ import com.codahale.metrics.*
 import com.google.common.base.*
 import com.google.common.eventbus.*
 import com.google.inject.Guice.*
+import com.google.inject.Injector
 import com.google.inject.name.Names.*
+import freenet.clients.http.SessionManager
 import freenet.l10n.*
-import freenet.pluginmanager.*
 import net.pterodactylus.sone.core.*
 import net.pterodactylus.sone.database.*
 import net.pterodactylus.sone.database.memory.*
@@ -14,10 +15,12 @@ import net.pterodactylus.sone.freenet.*
 import net.pterodactylus.sone.freenet.plugin.*
 import net.pterodactylus.sone.freenet.wot.*
 import net.pterodactylus.sone.test.*
+import net.pterodactylus.sone.web.SessionProvider
 import net.pterodactylus.util.config.*
 import net.pterodactylus.util.version.Version
 import org.hamcrest.MatcherAssert.*
 import org.hamcrest.Matchers.*
+import org.junit.experimental.categories.*
 import org.mockito.Mockito.*
 import java.io.*
 import java.util.concurrent.*
@@ -26,6 +29,7 @@ import kotlin.test.*
 
 const val versionString = "v80"
 
+@Category(NotParallel::class)
 class SoneModuleTest {
 
 	private val currentDir: File = File(".")
@@ -40,14 +44,7 @@ class SoneModuleTest {
 		whenever(l10n()).thenReturn(l10n)
 	}
 
-	private val injector by lazy {
-		createInjector(
-				SoneModule(sonePlugin, EventBus()),
-				FreenetInterface::class.isProvidedByDeepMock(),
-				PluginRespiratorFacade::class.isProvidedByDeepMock(),
-				PluginConnector::class.isProvidedByDeepMock()
-		)
-	}
+	private val injector by lazy { createInjector() }
 
 	@AfterTest
 	fun removePropertiesFromCurrentDirectory() {
@@ -197,16 +194,20 @@ class SoneModuleTest {
 	@Test
 	fun `core is registered with event bus`() {
 		val eventBus = mock<EventBus>()
-		val injector = createInjector(
-				SoneModule(sonePlugin, eventBus),
-				FreenetInterface::class.isProvidedByDeepMock(),
-				PluginRespiratorFacade::class.isProvidedByDeepMock(),
-				PluginConnector::class.isProvidedByDeepMock()
-		)
+		val injector = createInjector(eventBus)
 		val core = injector.getInstance<Core>()
 		verify(eventBus).register(core)
 	}
 
+	private fun createInjector(eventBus: EventBus = EventBus()): Injector =
+			createInjector(
+					SoneModule(sonePlugin, eventBus),
+					FreenetInterface::class.isProvidedByDeepMock(),
+					PluginRespiratorFacade::class.isProvidedByDeepMock(),
+					PluginConnector::class.isProvidedByDeepMock(),
+					SessionManager::class.isProvidedByMock()
+			)
+
 	@Test
 	fun `metrics registry is created as singleton`() {
 		injector.verifySingletonInstance<MetricRegistry>()
@@ -227,4 +228,14 @@ class SoneModuleTest {
 		injector.verifySingletonInstance<TickerShutdown>()
 	}
 
+	@Test
+	fun `sone URI creator is created as singleton`() {
+		injector.verifySingletonInstance<SoneUriCreator>()
+	}
+
+	@Test
+	fun `session provider is created as singleton`() {
+		injector.verifySingletonInstance<SessionProvider>()
+	}
+
 }