🔀 Merge branch 'release/v82'

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / main / SoneModuleTest.kt

diff --git a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
index 93a041c..01d1285 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
@@ -4,26 +4,32 @@ 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.node.*
-import freenet.pluginmanager.*
 import net.pterodactylus.sone.core.*
 import net.pterodactylus.sone.database.*
 import net.pterodactylus.sone.database.memory.*
+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.*
 import java.util.concurrent.atomic.*
 import kotlin.test.*
 
 const val versionString = "v80"
 
+@Category(NotParallel::class)
 class SoneModuleTest {
 
        private val currentDir: File = File(".")
@@ -38,13 +44,7 @@ class SoneModuleTest {
                whenever(l10n()).thenReturn(l10n)
        }
 
-       private val injector by lazy {
-               createInjector(
-                               SoneModule(sonePlugin, EventBus()),
-                               FreenetInterface::class.isProvidedByDeepMock(),
-                               PluginRespirator::class.isProvidedByDeepMock()
-               )
-       }
+       private val injector by lazy { createInjector() }
 
        @AfterTest
        fun removePropertiesFromCurrentDirectory() {
@@ -103,12 +103,6 @@ class SoneModuleTest {
        }
 
        @Test
-       fun `debug information flag is read from config`() {
-               File(currentDir, "sone.properties").writeText("Debug/ShowVersionInformation=true")
-               assertThat(injector.getInstance<Core>().debugInformation.showVersionInformation, equalTo(true))
-       }
-
-       @Test
        fun `event bus is bound`() {
                assertThat(injector.getInstance<EventBus>(), notNullValue())
        }
@@ -154,8 +148,8 @@ class SoneModuleTest {
        }
 
        @Test
-       fun `base l10n is bound correctly`() {
-               assertThat(injector.getInstance(), sameInstance(l10n.base))
+       fun `translation is bound correctly`() {
+               assertThat(injector.getInstance<Translation>(), notNullValue())
        }
 
        @Test
@@ -194,33 +188,54 @@ class SoneModuleTest {
 
        @Test
        fun `core is created as singleton`() {
-               val firstCore = injector.getInstance<Core>()
-               val secondCore = injector.getInstance<Core>()
-               assertThat(secondCore, sameInstance(firstCore))
+               injector.verifySingletonInstance<Core>()
        }
 
        @Test
        fun `core is registered with event bus`() {
                val eventBus = mock<EventBus>()
-               val injector = createInjector(
-                               SoneModule(sonePlugin, eventBus),
-                               FreenetInterface::class.isProvidedByDeepMock(),
-                               PluginRespirator::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>()
+       }
+
        @Test
-       fun `metrics registry can be created`() {
-               assertThat(injector.getInstance<MetricRegistry>(), notNullValue())
+       fun `wot connector is created as singleton`() {
+               injector.verifySingletonInstance<WebOfTrustConnector>()
        }
 
        @Test
-       fun `metrics registry is created as singleton`() {
-               val firstMetricRegistry = injector.getInstance<MetricRegistry>()
-               val secondMetricRegistry = injector.getInstance<MetricRegistry>()
-               assertThat(firstMetricRegistry, sameInstance(secondMetricRegistry))
+       fun `notification ticker is created as singleton`() {
+               injector.verifySingletonInstance<ScheduledExecutorService>(named("notification"))
+       }
+
+       @Test
+       fun `ticker shutdown is created as singleton`() {
+               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>()
        }
 
 }