X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FParserFilterTest.kt;h=5864a6ad7fb97d2322213e7d4e8f8ad443f92b3c;hp=ac2886a0e4b9abc48a9ede13d318e1309bf21e87;hb=faf66247a34f64946990a985d2ea3003465969cb;hpb=a8b58a357bcd4b12a0f2bd676458e96227986d24

diff --git a/src/test/kotlin/net/pterodactylus/sone/template/ParserFilterTest.kt b/src/test/kotlin/net/pterodactylus/sone/template/ParserFilterTest.kt
index ac2886a..5864a6a 100644
--- a/src/test/kotlin/net/pterodactylus/sone/template/ParserFilterTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/template/ParserFilterTest.kt
@@ -1,23 +1,19 @@
 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.test.*
 import net.pterodactylus.sone.text.SoneTextParser
 import net.pterodactylus.sone.text.SoneTextParserContext
 import net.pterodactylus.util.template.TemplateContext
 import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.`is`
+import org.hamcrest.Matchers.equalTo
 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`
 import org.mockito.Mockito.eq
 import org.mockito.Mockito.verify
 
@@ -39,8 +35,8 @@ class ParserFilterTest {
 
 	private fun setupSone(identity: String): Sone {
 		val sone = mock<Sone>()
-		`when`(sone.id).thenReturn(identity)
-		`when`(core.getSone(identity)).thenReturn(of(sone))
+		whenever(sone.id).thenReturn(identity)
+		whenever(core.getSone(identity)).thenReturn(sone)
 		return sone
 	}
 
@@ -63,8 +59,8 @@ class ParserFilterTest {
 		parameters.put("sone", soneOrSoneId)
 		filter.format(templateContext, "text", parameters)
 		val context = forClass(SoneTextParserContext::class.java)
-		verify(soneTextParser).parse(eq<String>("text"), context.capture())
-		assertThat(context.value.postingSone, `is`(sone))
+		verify(soneTextParser).parse(eq<String>("text") ?: "", context.capture())
+		assertThat(context.value.postingSone, equalTo(sone))
 	}
 
 	@Test