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

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
index 086bbb3..ddaecee 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
@@ -10,6 +10,7 @@ import net.pterodactylus.sone.data.PostReply
 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.mock
 import net.pterodactylus.sone.test.whenever
@@ -98,6 +99,10 @@ 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") +
+			(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?) }
@@ -118,4 +123,13 @@ abstract class SoneCommandTest {
 		expect("text", reply.text.replace("\\", "\\\\").replace("\r", "\\r").replace("\n", "\\n")) { it["Text"] }
 	}
 
+	protected fun matchesSone(sone: Sone) = OneByOneMatcher<Map<String, String?>>().apply {
+		expect("name", sone.name) { it["Name"] }
+		expect("last updated", sone.time.toString()) { it["LastUpdated"] }
+		expect("nice name", SoneAccessor.getNiceName(sone)) { it["NiceName"] }
+		sone.profile.fields.forEach { field ->
+			expect("field: ${field.name}", field.value) { it["Field.${field.name}"] }
+		}
+	}
+
 }