X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePluginTest.kt;h=23c679bf0eabfb2a50df2630743429ef768b4911;hp=eef312f6d40580dac0b318e651a9772731e7ad1c;hb=a71b38bad4c9acd35902161e2579b6738408abc2;hpb=a97cd8b63c632cf2dc21cc51fa37454baf062a99

diff --git a/src/test/kotlin/net/pterodactylus/sone/main/SonePluginTest.kt b/src/test/kotlin/net/pterodactylus/sone/main/SonePluginTest.kt
index eef312f..23c679b 100644
--- a/src/test/kotlin/net/pterodactylus/sone/main/SonePluginTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/main/SonePluginTest.kt
@@ -22,7 +22,6 @@ import kotlin.test.*
 @Dirty
 class SonePluginTest {
 
-	private var injector = mockInjector()
 	private val sonePlugin by lazy { SonePlugin { injector } }
 	private val pluginRespirator = deepMock<PluginRespirator>()
 	private val node = deepMock<Node>()
@@ -91,27 +90,31 @@ class SonePluginTest {
 	}
 
 	@Test
-	fun `notification handler is being started`() {
+	fun `notification handler is being requested`() {
 		sonePlugin.runPlugin(pluginRespirator)
-		val notificationHandler = injector.getInstance<NotificationHandler>()
-		verify(notificationHandler).start()
+		assertThat(getInjected(NotificationHandler::class.java), notNullValue())
 	}
 
-}
+	private fun <T> getInjected(clazz: Class<T>, annotation: Annotation? = null): T? =
+			injected[TypeLiteral.get(clazz) to annotation] as? T
+
+	private val injected =
+			mutableMapOf<Pair<TypeLiteral<*>, Annotation?>, Any>()
 
-private fun mockInjector() = mock<Injector>().apply {
-	val injected = mutableMapOf<Pair<TypeLiteral<*>, Annotation?>, Any>()
-	fun mockValue(clazz: Class<*>) = false.takeIf { clazz.name == java.lang.Boolean::class.java.name } ?: mock(clazz)
-	whenever(getInstance(any<Key<*>>())).then {
-		injected.getOrPut((it.getArgument(0) as Key<*>).let { it.typeLiteral to it.annotation }) {
-			it.getArgument<Key<*>>(0).typeLiteral.type.typeName.toClass().let(::mockValue)
+	private val injector = mock<Injector>().apply {
+		fun mockValue(clazz: Class<*>) = false.takeIf { clazz.name == java.lang.Boolean::class.java.name } ?: mock(clazz)
+		whenever(getInstance(any<Key<*>>())).then {
+			injected.getOrPut((it.getArgument(0) as Key<*>).let { it.typeLiteral to it.annotation }) {
+				it.getArgument<Key<*>>(0).typeLiteral.type.typeName.toClass().let(::mockValue)
+			}
 		}
-	}
-	whenever(getInstance(any<Class<*>>())).then {
-		injected.getOrPut(TypeLiteral.get(it.getArgument(0) as Class<*>) to null) {
-			it.getArgument<Class<*>>(0).let(::mockValue)
+		whenever(getInstance(any<Class<*>>())).then {
+			injected.getOrPut(TypeLiteral.get(it.getArgument(0) as Class<*>) to null) {
+				it.getArgument<Class<*>>(0).let(::mockValue)
+			}
 		}
 	}
+
 }
 
 private fun String.toClass(): Class<*> = SonePlugin::class.java.classLoader.loadClass(this)