X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FSoneCommandTest.kt;h=53976833e8aded5cf67b3fe4b99c5df32b679105;hp=ddaecee68bace977d4e3a3e238f216a073ce6a0f;hb=fafe0029dcbef27ce918fdf7007e78c8705ca20f;hpb=284a781c6d0539232763ea572854d44a62241863

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
index ddaecee..5397683 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
@@ -1,9 +1,7 @@
 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.OneByOneMatcher
 import net.pterodactylus.sone.core.Core
 import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.PostReply
@@ -11,9 +9,10 @@ import net.pterodactylus.sone.data.Profile
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.freenet.fcp.FcpException
 import net.pterodactylus.sone.template.SoneAccessor
-import net.pterodactylus.sone.test.asOptional
+import net.pterodactylus.sone.test.OneByOneMatcher
 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,21 +91,20 @@ abstract class SoneCommandTest {
 
 	fun requestWithValidRemoteSoneParameterResultsInFcpException() {
 		parameters += "Sone" to "RemoteSoneId"
-		whenever(core.getSone("RemoteSoneId")).thenReturn(Optional.of(remoteSone))
+		whenever(core.getSone("RemoteSoneId")).thenReturn(remoteSone)
 		executeCommandAndExpectFcpException()
 	}
 
 	protected operator fun SimpleFieldSet.plusAssign(keyValue: Pair<String, String?>) = putSingle(keyValue.first, keyValue.second)
 	protected fun SimpleFieldSet.parsePost(prefix: String) = parseFromSimpleFieldSet(prefix, "ID", "Sone", "Recipient", "Time", "Text")
 	protected fun SimpleFieldSet.parseReply(prefix: String) = parseFromSimpleFieldSet(prefix, "ID", "Sone", "Time", "Text")
-	protected fun SimpleFieldSet.parseSone(prefix: String) = parseFromSimpleFieldSet(prefix, "Name", "NiceName", "LastUpdated", "Followed") +
+	protected fun SimpleFieldSet.parseSone(prefix: String) = parseFromSimpleFieldSet(prefix, "ID", "Name", "NiceName", "LastUpdated", "Followed") +
 			(0 until this["${prefix}Field.Count"].toInt()).map {
 				("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"] }
@@ -124,6 +122,7 @@ abstract class SoneCommandTest {
 	}
 
 	protected fun matchesSone(sone: Sone) = OneByOneMatcher<Map<String, String?>>().apply {
+		expect("ID", sone.id) { it["ID"] }
 		expect("name", sone.name) { it["Name"] }
 		expect("last updated", sone.time.toString()) { it["LastUpdated"] }
 		expect("nice name", SoneAccessor.getNiceName(sone)) { it["NiceName"] }