X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSoneModuleTest.kt;h=1a71f4b867ba3c797b502de4973f523cb22dccf4;hb=79ef6e4644845290d9feb45a06f8588864dd0a83;hp=31b232d9a916850ecf38f0ef5f2346eb05d36b23;hpb=49872c388489260aa2e4ecd42dfda1aaebb8d2db;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 31b232d..1a71f4b 100644
--- a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
@@ -6,10 +6,11 @@ import com.google.common.eventbus.*
 import com.google.inject.Guice.*
 import com.google.inject.name.Names.*
 import freenet.l10n.*
-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.util.config.*
@@ -18,6 +19,7 @@ import org.hamcrest.MatcherAssert.*
 import org.hamcrest.Matchers.*
 import org.mockito.Mockito.*
 import java.io.*
+import java.util.concurrent.*
 import java.util.concurrent.atomic.*
 import kotlin.test.*
 
@@ -41,7 +43,8 @@ class SoneModuleTest {
 		createInjector(
 				SoneModule(sonePlugin, EventBus()),
 				FreenetInterface::class.isProvidedByDeepMock(),
-				PluginRespirator::class.isProvidedByDeepMock()
+				PluginRespiratorFacade::class.isProvidedByDeepMock(),
+				PluginConnector::class.isProvidedByDeepMock()
 		)
 	}
 
@@ -147,8 +150,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
@@ -187,9 +190,7 @@ 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
@@ -198,22 +199,31 @@ class SoneModuleTest {
 		val injector = createInjector(
 				SoneModule(sonePlugin, eventBus),
 				FreenetInterface::class.isProvidedByDeepMock(),
-				PluginRespirator::class.isProvidedByDeepMock()
+				PluginRespiratorFacade::class.isProvidedByDeepMock(),
+				PluginConnector::class.isProvidedByDeepMock()
 		)
 		val core = injector.getInstance<Core>()
 		verify(eventBus).register(core)
 	}
 
 	@Test
-	fun `metrics registry can be created`() {
-		assertThat(injector.getInstance<MetricRegistry>(), notNullValue())
+	fun `metrics registry is created as singleton`() {
+		injector.verifySingletonInstance<MetricRegistry>()
 	}
 
 	@Test
-	fun `metrics registry is created as singleton`() {
-		val firstMetricRegistry = injector.getInstance<MetricRegistry>()
-		val secondMetricRegistry = injector.getInstance<MetricRegistry>()
-		assertThat(firstMetricRegistry, sameInstance(secondMetricRegistry))
+	fun `wot connector is created as singleton`() {
+		injector.verifySingletonInstance<WebOfTrustConnector>()
+	}
+
+	@Test
+	fun `notification ticker is created as singleton`() {
+		injector.verifySingletonInstance<ScheduledExecutorService>(named("notification"))
+	}
+
+	@Test
+	fun `ticker shutdown is created as singleton`() {
+		injector.verifySingletonInstance<TickerShutdown>()
 	}
 
 }