X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetPostCommandTest.kt;h=b7f911cac8251d7c52afb2aa6e96040269fc936e;hb=8e313509a42a8c638fcac018dd73dd975bf9cb68;hp=e830daf324932b08553f0e598ee821e67d37f433;hpb=cb42023e00a28dd58bffc7eb3b753adf3ab20f29;p=Sone.git diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/GetPostCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/GetPostCommandTest.kt index e830daf..b7f911c 100644 --- a/src/test/kotlin/net/pterodactylus/sone/fcp/GetPostCommandTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/fcp/GetPostCommandTest.kt @@ -3,9 +3,9 @@ package net.pterodactylus.sone.fcp import freenet.support.SimpleFieldSet import net.pterodactylus.sone.core.Core import net.pterodactylus.sone.data.Sone -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.hamcrest.MatcherAssert.assertThat import org.hamcrest.Matchers.containsInAnyOrder import org.hamcrest.Matchers.equalTo @@ -49,7 +49,7 @@ class GetPostCommandTest : SoneCommandTest() { @Test fun `request with invalid post parameter results in fcp exception`() { - parameters.putSingle("Post", "InvalidPostId") + parameters += "Post" to "InvalidPostId" executeCommandAndExpectFcpException() } @@ -68,7 +68,7 @@ class GetPostCommandTest : SoneCommandTest() { @Test fun `request with valid post parameter returns post response`() { - parameters.putSingle("Post", "ValidPostId") + parameters += "Post" to "ValidPostId" val replyParameters = command.execute(parameters).replyParameters verifyPostWithLikes(replyParameters) assertThat(replyParameters["Post.Recipient"], nullValue()) @@ -77,8 +77,8 @@ class GetPostCommandTest : SoneCommandTest() { @Test fun `request with valid post parameter without replies returns post response without replies`() { - parameters.putSingle("Post", "ValidPostId") - parameters.putSingle("IncludeReplies", "false") + parameters += "Post" to "ValidPostId" + parameters += "IncludeReplies" to "false" val replyParameters = command.execute(parameters).replyParameters verifyPostWithLikes(replyParameters) assertThat(replyParameters["Post.Recipient"], nullValue()) @@ -87,7 +87,7 @@ class GetPostCommandTest : SoneCommandTest() { @Test fun `request with valid post parameter returns post response with recipient`() { - parameters.putSingle("Post", "ValidPostId") + parameters += "Post" to "ValidPostId" whenever(post.recipientId).thenReturn("Sone2".asOptional()) val replyParameters = command.execute(parameters).replyParameters verifyPostWithLikes(replyParameters) @@ -97,8 +97,8 @@ class GetPostCommandTest : SoneCommandTest() { @Test fun `request with valid post parameter without replies returns post response without replies but with recipient`() { - parameters.putSingle("Post", "ValidPostId") - parameters.putSingle("IncludeReplies", "false") + parameters += "Post" to "ValidPostId" + parameters += "IncludeReplies" to "false" whenever(post.recipientId).thenReturn("Sone2".asOptional()) val replyParameters = command.execute(parameters).replyParameters verifyPostWithLikes(replyParameters)