✅ Don’t run some tests in parallel

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / main / SoneModuleTest.kt

diff --git a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
index e7d843b..c628334 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt
@@ -6,7 +6,6 @@ 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.*
@@ -18,13 +17,16 @@ 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(".")
@@ -150,11 +152,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 +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
@@ -214,27 +209,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>()
        }
 
 }