X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftest%2FGuice.kt;h=e6c0fdb15869f4c75a77d64033bdf2a883380e0a;hb=feb4aeda86e2c3d7deff163eda53191d6baa5650;hp=a4ae1d5eab29f9cddad0ac524d4eb0c61730c1dc;hpb=a782ae867f056f7678ccc4665f3516901481aafc;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt b/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt
index a4ae1d5..e6c0fdb 100644
--- a/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt
@@ -1,28 +1,35 @@
 package net.pterodactylus.sone.test
 
-import com.google.inject.*
-import com.google.inject.name.*
-import org.hamcrest.MatcherAssert.*
-import org.hamcrest.Matchers.*
-import org.mockito.*
+import com.google.inject.Injector
+import com.google.inject.Key
+import com.google.inject.Module
+import com.google.inject.TypeLiteral
+import com.google.inject.name.Names
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.sameInstance
+import org.mockito.Mockito
 import javax.inject.Provider
-import kotlin.reflect.*
+import kotlin.reflect.KClass
 
 fun <T : Any> KClass<T>.isProvidedBy(instance: T) = Module { it.bind(this.java).toProvider(Provider<T> { instance }) }
 fun <T : Any> KClass<T>.withNameIsProvidedBy(instance: T, name: String) = Module { it.bind(this.java).annotatedWith(Names.named(name)).toProvider(Provider<T> { instance }) }
 fun <T : Any> KClass<T>.isProvidedBy(provider: com.google.inject.Provider<T>) = Module { it.bind(this.java).toProvider(provider) }
 fun <T : Any> KClass<T>.isProvidedBy(provider: KClass<out Provider<T>>) = Module { it.bind(this.java).toProvider(provider.java) }
+fun <T : Any> Key<T>.isProvidedBy(instance: T) = Module { it.bind(this).toProvider(Provider<T> { instance }) }
 inline fun <reified T : Any> KClass<T>.isProvidedByMock() = Module { it.bind(this.java).toProvider(Provider<T> { mock() }) }
 inline fun <reified T : Any> KClass<T>.isProvidedByDeepMock() = Module { it.bind(this.java).toProvider(Provider<T> { deepMock() }) }
 
+inline fun <reified T> key(): Key<T> = Key.get(object : TypeLiteral<T>() {})
+inline fun <reified T> key(annotation: Annotation): Key<T> = Key.get(object : TypeLiteral<T>() {}, annotation)
+
 inline fun <reified T : Any> Injector.getInstance(annotation: Annotation? = null): T = annotation
 		?.let { getInstance(Key.get(object : TypeLiteral<T>() {}, it)) }
 		?: getInstance(Key.get(object : TypeLiteral<T>() {}))
 
 
-inline fun <reified T : Any> Injector.verifySingletonInstance() {
-	val firstInstance = getInstance<T>()
-	val secondInstance = getInstance<T>()
+inline fun <reified T : Any> Injector.verifySingletonInstance(annotation: Annotation? = null) {
+	val firstInstance = getInstance<T>(annotation)
+	val secondInstance = getInstance<T>(annotation)
 	assertThat(firstInstance, sameInstance(secondInstance))
 }