X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSoneModuleTest.kt;h=9fe5dbb609abf92caab7dea822dcda1588482236;hb=043ae80d779448ceb2cf9fcff5d8942a5db7b0bf;hp=e7d843bb1e2349ed9232070d9461f1726621dd81;hpb=68926d6b9a4511492ad5d817c659818020139c7e;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 e7d843b..9fe5dbb 100644
--- a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
@@ -20,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.*
 
@@ -150,11 +151,6 @@ class SoneModuleTest {
 	}
 
 	@Test
-	fun `base l10n is bound correctly`() {
-		assertThat(injector.getInstance(), sameInstance(l10n.base))
-	}
-
-	@Test
 	fun `translation is bound correctly`() {
 		assertThat(injector.getInstance<Translation>(), notNullValue())
 	}
@@ -195,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
@@ -214,27 +208,18 @@ class SoneModuleTest {
 	}
 
 	@Test
-	fun `metrics registry can be created`() {
-		assertThat(injector.getInstance<MetricRegistry>(), notNullValue())
-	}
-
-	@Test
 	fun `metrics registry is created as singleton`() {
-		val firstMetricRegistry = injector.getInstance<MetricRegistry>()
-		val secondMetricRegistry = injector.getInstance<MetricRegistry>()
-		assertThat(firstMetricRegistry, sameInstance(secondMetricRegistry))
+		injector.verifySingletonInstance<MetricRegistry>()
 	}
 
 	@Test
-	fun `wot connector can be created`() {
-		assertThat(injector.getInstance<WebOfTrustConnector>(), notNullValue())
+	fun `wot connector is created as singleton`() {
+		injector.verifySingletonInstance<WebOfTrustConnector>()
 	}
 
 	@Test
-	fun `wot connector is created as singleton`() {
-		val firstWebOfTrustConnector = injector.getInstance<WebOfTrustConnector>()
-		val secondWebOfTrustConnector = injector.getInstance<WebOfTrustConnector>()
-		assertThat(firstWebOfTrustConnector, sameInstance(secondWebOfTrustConnector))
+	fun `notification ticker is created as singleton`() {
+		injector.verifySingletonInstance<ScheduledExecutorService>(named("notification"))
 	}
 
 }