🎨 Use singleton verifier

diff --git a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
index e95955c..7f6b8d0 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
@@ -190,9 +190,7 @@ class SoneModuleTest {
 
        @Test
        fun `core is created as singleton`() {
 
        @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
        }
 
        @Test


@@ -209,27 +207,13 @@ class SoneModuleTest {
        }
 
        @Test
        }
 
        @Test

-       fun `metrics registry can be created`() {
-               assertThat(injector.getInstance<MetricRegistry>(), notNullValue())
-       }
-
-       @Test

        fun `metrics registry is created as singleton`() {
        fun `metrics registry is created as singleton`() {

-               val firstMetricRegistry = injector.getInstance<MetricRegistry>()
-               val secondMetricRegistry = injector.getInstance<MetricRegistry>()
-               assertThat(firstMetricRegistry, sameInstance(secondMetricRegistry))
-       }
-
-       @Test
-       fun `wot connector can be created`() {
-               assertThat(injector.getInstance<WebOfTrustConnector>(), notNullValue())
+               injector.verifySingletonInstance<MetricRegistry>()

        }
 
        @Test
        fun `wot connector is created as singleton`() {
        }
 
        @Test
        fun `wot connector is created as singleton`() {

-               val firstWebOfTrustConnector = injector.getInstance<WebOfTrustConnector>()
-               val secondWebOfTrustConnector = injector.getInstance<WebOfTrustConnector>()
-               assertThat(firstWebOfTrustConnector, sameInstance(secondWebOfTrustConnector))
+               injector.verifySingletonInstance<WebOfTrustConnector>()

        }
 
 }
        }
 
 }