X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetPostFeedCommandTest.kt;h=d8ab2439d4a899d35d9d4c511fcc1aa840b4532a;hp=c2f0a7ab836cd3f9bd9bc63026132f6725c98e74;hb=8e313509a42a8c638fcac018dd73dd975bf9cb68;hpb=e79b0829db2fbfd9f50ad4526c638055b6304429

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/GetPostFeedCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/GetPostFeedCommandTest.kt
index c2f0a7a..d8ab243 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/GetPostFeedCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/GetPostFeedCommandTest.kt
@@ -2,7 +2,6 @@ package net.pterodactylus.sone.fcp
 
 import freenet.support.SimpleFieldSet
 import net.pterodactylus.sone.core.Core
-import net.pterodactylus.sone.test.asOptional
 import net.pterodactylus.sone.test.whenever
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.containsInAnyOrder
@@ -56,10 +55,10 @@ class GetPostFeedCommandTest : SoneCommandTest() {
 	}
 
 	private fun setupAllPostsAndReplies() {
-		parameters.putSingle("Sone", "ValidSoneId")
+		parameters += "Sone" to "ValidSoneId"
 		whenever(localSone.id).thenReturn("ValidSoneId")
-		whenever(core.getSone("ValidSoneId")).thenReturn(localSone.asOptional())
-		whenever(core.getSone("Friend1")).thenReturn(friend1.asOptional())
+		whenever(core.getSone("ValidSoneId")).thenReturn(localSone)
+		whenever(core.getSone("Friend1")).thenReturn(friend1)
 		whenever(core.getLikes(post1)).thenReturn(setOf(sone3, sone4))
 		whenever(core.getLikes(post1Reply1)).thenReturn(setOf(sone2, sone3))
 		whenever(core.getLikes(post1Reply2)).thenReturn(setOf(sone3))
@@ -133,7 +132,7 @@ class GetPostFeedCommandTest : SoneCommandTest() {
 	@Test
 	fun `request with larger start than number of posts returns empty feed`() {
 		setupAllPostsAndReplies()
-		parameters.putSingle("StartPost", "20")
+		parameters += "StartPost" to "20"
 		val replyParameters = command.execute(parameters).replyParameters
 		assertThat(replyParameters["Message"], equalTo("PostFeed"))
 		assertThat(replyParameters["Posts.Count"], equalTo("0"))
@@ -142,7 +141,7 @@ class GetPostFeedCommandTest : SoneCommandTest() {
 	@Test
 	fun `request with max posts of 2 returns the first two posts`() {
 		setupAllPostsAndReplies()
-		parameters.putSingle("MaxPosts", "2")
+		parameters += "MaxPosts" to "2"
 		val replyParameters = command.execute(parameters).replyParameters
 		assertThat(replyParameters["Message"], equalTo("PostFeed"))
 		assertThat(replyParameters["Posts.Count"], equalTo("2"))
@@ -154,8 +153,8 @@ class GetPostFeedCommandTest : SoneCommandTest() {
 	@Test
 	fun `request with max posts of 2 and start post of 1 returns the center two posts`() {
 		setupAllPostsAndReplies()
-		parameters.putSingle("StartPost", "1")
-		parameters.putSingle("MaxPosts", "2")
+		parameters += "StartPost" to "1"
+		parameters += "MaxPosts" to "2"
 		val replyParameters = command.execute(parameters).replyParameters
 		assertThat(replyParameters["Message"], equalTo("PostFeed"))
 		assertThat(replyParameters["Posts.Count"], equalTo("2"))
@@ -167,8 +166,8 @@ class GetPostFeedCommandTest : SoneCommandTest() {
 	@Test
 	fun `request with max posts of 2 and start post of 3 returns the last post`() {
 		setupAllPostsAndReplies()
-		parameters.putSingle("StartPost", "3")
-		parameters.putSingle("MaxPosts", "2")
+		parameters += "StartPost" to "3"
+		parameters += "MaxPosts" to "2"
 		val replyParameters = command.execute(parameters).replyParameters
 		assertThat(replyParameters["Message"], equalTo("PostFeed"))
 		assertThat(replyParameters["Posts.Count"], equalTo("1"))