Return a nullable PostReply instead of an Optional

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / fcp / SoneCommandTest.kt

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
index f3994c8..5397683 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
@@ -1,6 +1,5 @@
 package net.pterodactylus.sone.fcp
 
-import com.google.common.base.Optional
 import com.google.common.base.Optional.absent
 import freenet.support.SimpleFieldSet
 import net.pterodactylus.sone.core.Core
@@ -11,9 +10,9 @@ import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.freenet.fcp.FcpException
 import net.pterodactylus.sone.template.SoneAccessor
 import net.pterodactylus.sone.test.OneByOneMatcher
-import net.pterodactylus.sone.test.asOptional
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
+import net.pterodactylus.sone.utils.asOptional
 import org.junit.Before
 import org.junit.Rule
 import org.junit.rules.ExpectedException
@@ -39,9 +38,9 @@ abstract class SoneCommandTest {
 
        @Before
        fun setupCore() {
-               whenever(core.getSone(anyString())).thenReturn(absent())
+               whenever(core.getSone(anyString())).thenReturn(null)
                whenever(core.getPost(anyString())).thenReturn(absent())
-               whenever(core.getPostReply(anyString())).thenReturn(absent())
+               whenever(core.getPostReply(anyString())).thenReturn(null)
        }
 
        protected fun createSone(id: String, name: String, firstName: String, lastName: String, time: Long) = mock<Sone>().apply {
@@ -92,7 +91,7 @@ abstract class SoneCommandTest {
 
        fun requestWithValidRemoteSoneParameterResultsInFcpException() {
                parameters += "Sone" to "RemoteSoneId"
-               whenever(core.getSone("RemoteSoneId")).thenReturn(Optional.of(remoteSone))
+               whenever(core.getSone("RemoteSoneId")).thenReturn(remoteSone)
                executeCommandAndExpectFcpException()
        }
 
@@ -104,9 +103,8 @@ abstract class SoneCommandTest {
                                ("Field." + this["${prefix}Field.$it.Name"]) to this["${prefix}Field.$it.Value"]
                        }
 
-       private fun SimpleFieldSet.parseFromSimpleFieldSet(prefix: String, vararg fields: String) = listOf(*fields)
-                       .map { it to (get(prefix + it) as String?) }
-                       .toMap()
+       private fun SimpleFieldSet.parseFromSimpleFieldSet(prefix: String, vararg fields: String): Map<String, String?> = fields
+                       .associate { it to get(prefix + it) }
 
        protected fun matchesPost(post: Post) = OneByOneMatcher<Map<String, String?>>().apply {
                expect("ID", post.id) { it["ID"] }