X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSoneModuleTest.kt;h=c6283347476efd47f7f1bf416082415ecce791c2;hp=d125769cb06f38e42fd6d538dfa3d0f4b805df56;hb=d673c44ae56fcaf8368bcf3488f417e3b947158e;hpb=a1c8d845054f6adcc6ef98e46e7b578874cc866a

diff --git a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
index d125769..c628334 100644
--- a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
@@ -6,23 +6,27 @@ 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.*
 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(".")
@@ -41,7 +45,8 @@ class SoneModuleTest {
 		createInjector(
 				SoneModule(sonePlugin, EventBus()),
 				FreenetInterface::class.isProvidedByDeepMock(),
-				PluginRespirator::class.isProvidedByDeepMock()
+				PluginRespiratorFacade::class.isProvidedByDeepMock(),
+				PluginConnector::class.isProvidedByDeepMock()
 		)
 	}
 
@@ -102,18 +107,6 @@ class SoneModuleTest {
 	}
 
 	@Test
-	fun `show version information 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 `show metrics debug information flag is read from config`() {
-		File(currentDir, "sone.properties").writeText("Debug/ShowMetrics=true")
-		assertThat(injector.getInstance<Core>().debugInformation.showMetrics, equalTo(true))
-	}
-
-	@Test
 	fun `event bus is bound`() {
 		assertThat(injector.getInstance<EventBus>(), notNullValue())
 	}
@@ -159,8 +152,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
@@ -199,9 +192,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
@@ -210,22 +201,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 `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>()
 	}
 
 }