From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 26 Jan 2017 21:13:29 +0000 (+0100)
Subject: Make parser filter injectable
X-Git-Tag: 0.9.7^2~313
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=a8b58a357bcd4b12a0f2bd676458e96227986d24

Make parser filter injectable
---

diff --git a/src/main/kotlin/net/pterodactylus/sone/template/ParserFilter.kt b/src/main/kotlin/net/pterodactylus/sone/template/ParserFilter.kt
index e389652..cec5d56 100644
--- a/src/main/kotlin/net/pterodactylus/sone/template/ParserFilter.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/template/ParserFilter.kt
@@ -7,11 +7,14 @@ import net.pterodactylus.sone.text.SoneTextParser
 import net.pterodactylus.sone.text.SoneTextParserContext
 import net.pterodactylus.util.template.Filter
 import net.pterodactylus.util.template.TemplateContext
+import javax.inject.Inject
+import javax.inject.Singleton
 
 /**
  * Parses a [String] into a number of [Part]s.
  */
-class ParserFilter(private val core: Core, private val soneTextParser: SoneTextParser) : Filter {
+@Singleton
+class ParserFilter @Inject constructor(private val core: Core, private val soneTextParser: SoneTextParser) : Filter {
 
 	override fun format(templateContext: TemplateContext?, data: Any?, parameters: MutableMap<String, Any?>?): Any? {
 		val text = data?.toString() ?: return listOf<Part>()
diff --git a/src/test/kotlin/net/pterodactylus/sone/template/ParserFilterTest.kt b/src/test/kotlin/net/pterodactylus/sone/template/ParserFilterTest.kt
index 3c735c2..ac2886a 100644
--- a/src/test/kotlin/net/pterodactylus/sone/template/ParserFilterTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/template/ParserFilterTest.kt
@@ -1,8 +1,11 @@
 package net.pterodactylus.sone.template
 
 import com.google.common.base.Optional.of
+import com.google.inject.Guice
 import net.pterodactylus.sone.core.Core
 import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.test.getInstance
+import net.pterodactylus.sone.test.isProvidedByMock
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.text.SoneTextParser
 import net.pterodactylus.sone.text.SoneTextParserContext
@@ -10,6 +13,8 @@ import net.pterodactylus.util.template.TemplateContext
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.emptyIterable
+import org.hamcrest.Matchers.notNullValue
+import org.hamcrest.Matchers.sameInstance
 import org.junit.Test
 import org.mockito.ArgumentCaptor.forClass
 import org.mockito.Mockito.`when`
@@ -62,4 +67,25 @@ class ParserFilterTest {
 		assertThat(context.value.postingSone, `is`(sone))
 	}
 
+	@Test
+	fun `parser filter can be created by guice`() {
+	    val injector = Guice.createInjector(
+			    Core::class.isProvidedByMock(),
+			    SoneTextParser::class.isProvidedByMock()
+	    )
+		assertThat(injector.getInstance<ParserFilter>(), notNullValue())
+	}
+
+	@Test
+	fun `parser filter is created as singleton`() {
+		val injector = Guice.createInjector(
+				Core::class.isProvidedByMock(),
+				SoneTextParser::class.isProvidedByMock()
+		)
+		val firstInstance = injector.getInstance<ParserFilter>()
+		val secondInstance = injector.getInstance<ParserFilter>()
+		assertThat(firstInstance, sameInstance(secondInstance))
+
+	}
+
 }
diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt b/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt
index a5df14e..d8a2d32 100644
--- a/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt
@@ -1,5 +1,6 @@
 package net.pterodactylus.sone.test
 
+import com.google.inject.Injector
 import com.google.inject.Module
 import javax.inject.Provider
 import kotlin.reflect.KClass
@@ -8,6 +9,9 @@ fun <T : Any> KClass<T>.isInstance(instance: T) = Module { it.bind(this.java).to
 fun <T : Any> KClass<T>.isProvidedBy(instance: T) = Module { it.bind(this.java).toProvider { 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) }
+inline fun <reified T : Any> KClass<T>.isProvidedByMock() = Module { it.bind(this.java).toProvider { mock<T>() } }
+
+inline fun <reified T : Any> Injector.getInstance() = getInstance(T::class.java)!!
 
 fun <T : Any> supply(javaClass: Class<T>): Source<T> = object : Source<T> {
 	override fun fromInstance(instance: T) = Module { it.bind(javaClass).toInstance(instance) }