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

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
index ddaecee..dfed710 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
@@ -3,7 +3,6 @@ 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 +10,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
@@ -99,7 +99,7 @@ abstract class SoneCommandTest {
 	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"]
 			}
@@ -124,6 +124,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"] }