X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSoneModuleTest.kt;h=28481ada3ffecdd93d73e516fd9254a2e1ed09d0;hb=47562abd9b9be05511954ebad829bb268057fd03;hp=a5efbe6fbbb0306999b8ab28597fb98e10720418;hpb=fdc8dbd38e871da0a278bded063ba9dba8af9edc;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 a5efbe6..28481ad 100644
--- a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
@@ -10,6 +10,7 @@ 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.*
@@ -19,6 +20,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.*
 
@@ -149,8 +151,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
@@ -189,9 +191,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
@@ -208,27 +208,23 @@ class SoneModuleTest {
 	}
 
 	@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 `wot connector can be created`() {
-		assertThat(injector.getInstance<WebOfTrustConnector>(), notNullValue())
+	fun `notification ticker is created as singleton`() {
+		injector.verifySingletonInstance<ScheduledExecutorService>(named("notification"))
 	}
 
 	@Test
-	fun `wot connector is created as singleton`() {
-		val firstWebOfTrustConnector = injector.getInstance<WebOfTrustConnector>()
-		val secondWebOfTrustConnector = injector.getInstance<WebOfTrustConnector>()
-		assertThat(firstWebOfTrustConnector, sameInstance(secondWebOfTrustConnector))
+	fun `ticker shutdown is created as singleton`() {
+		injector.verifySingletonInstance<TickerShutdown>()
 	}
 
 }