X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FSoneCommandTest.kt;h=aa38f8846134ce7ade1de7d9020c6c579ecd8aab;hb=fecc40a37c481ea7c8d0aa5d13331834d165de6a;hp=f3994c83ef179235ba7789c06b49c5be2b3a834a;hpb=eb32457356fac09e16ec98394c1b5d48f9dfba84;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 f3994c8..aa38f88 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
@@ -11,9 +11,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
@@ -104,9 +104,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"] }