X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSoneModuleTest.kt;h=7f6b8d02f3dea52d29d29e50a5cbb2dea558e04e;hp=6cac0a887096d9ac289ee008c99a2d333fb78dd4;hb=c7e1d396f81935e872d0e49339fa19baf16abada;hpb=33b58cb4388ee7ca267470c0d883653e1a16dff4

diff --git a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
index 6cac0a8..7f6b8d0 100644
--- a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
@@ -1,15 +1,17 @@
 package net.pterodactylus.sone.main
 
+import com.codahale.metrics.*
 import com.google.common.base.*
 import com.google.common.eventbus.*
 import com.google.inject.Guice.*
 import com.google.inject.name.Names.*
 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.util.config.*
@@ -41,7 +43,8 @@ class SoneModuleTest {
 		createInjector(
 				SoneModule(sonePlugin, EventBus()),
 				FreenetInterface::class.isProvidedByDeepMock(),
-				PluginRespirator::class.isProvidedByDeepMock()
+				PluginRespiratorFacade::class.isProvidedByDeepMock(),
+				PluginConnector::class.isProvidedByDeepMock()
 		)
 	}
 
@@ -102,12 +105,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())
 	}
@@ -153,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
@@ -193,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
@@ -204,10 +199,21 @@ 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 is created as singleton`() {
+		injector.verifySingletonInstance<MetricRegistry>()
+	}
+
+	@Test
+	fun `wot connector is created as singleton`() {
+		injector.verifySingletonInstance<WebOfTrustConnector>()
+	}
+
 }