X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FDeleteReplyCommandTest.kt;h=ca6ec9df3fe5e6774900ccbc40ea2adbdc719c02;hb=03cec6a6772c2d836d94864adddaf544cbe9d72f;hp=0819a60b85653628acc5b33e183a888d7b553b6d;hpb=8775a0be01123cc2b3375cb1f3f61a260d29b1ad;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.kt
index 0819a60..ca6ec9d 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.kt
@@ -1,14 +1,12 @@
 package net.pterodactylus.sone.fcp
 
-import com.google.common.base.Optional.of
-import net.pterodactylus.sone.core.Core
-import net.pterodactylus.sone.data.PostReply
-import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.test.whenever
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.equalTo
-import org.junit.Test
-import org.mockito.Mockito.verify
+import net.pterodactylus.sone.core.*
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.test.*
+import org.hamcrest.MatcherAssert.*
+import org.hamcrest.Matchers.*
+import org.junit.*
+import org.mockito.Mockito.*
 
 /**
  * Unit test for [DeleteReplyCommand].
@@ -22,7 +20,7 @@ class DeleteReplyCommandTest : SoneCommandTest() {
 
 	@Test
 	fun `command requires write access`() {
-		assertThat(command.requiresWriteAccess(), equalTo(true))
+		assertThat(command.requiresWriteAccess, equalTo(true))
 	}
 
 	@Test
@@ -32,24 +30,24 @@ class DeleteReplyCommandTest : SoneCommandTest() {
 
 	@Test
 	fun `request with invalid post reply parameter results in fcp exception`() {
-		parameters.putSingle("Reply", "InvalidReplyId")
+		parameters += "Reply" to "InvalidReplyId"
 		executeCommandAndExpectFcpException()
 	}
 
 	@Test
 	fun `request with remote post reply parameter results in error response`() {
-	    parameters.putSingle("Reply", "RemoteReplyId")
-		whenever(core.getPostReply("RemoteReplyId")).thenReturn(of(remotePostReply))
-		val response = command.execute(parameters, null, null)
+	    parameters += "Reply" to "RemoteReplyId"
+		whenever(core.getPostReply("RemoteReplyId")).thenReturn(remotePostReply)
+		val response = command.execute(parameters)
 		assertThat(response.replyParameters["Message"], equalTo("Error"))
 		assertThat(response.replyParameters["ErrorCode"], equalTo("401"))
 	}
 
 	@Test
 	fun `request with local post reply parameter deletes reply`() {
-	    parameters.putSingle("Reply", "RemoteReplyId")
-		whenever(core.getPostReply("RemoteReplyId")).thenReturn(of(localPostReply))
-		val response = command.execute(parameters, null, null)
+	    parameters += "Reply" to "RemoteReplyId"
+		whenever(core.getPostReply("RemoteReplyId")).thenReturn(localPostReply)
+		val response = command.execute(parameters)
 		assertThat(response.replyParameters["Message"], equalTo("ReplyDeleted"))
 		verify(core).deleteReply(localPostReply)
 	}