X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FDeletePostCommandTest.kt;h=15173d2f062648fb97d2367500ab3a994463e584;hp=4a236020bce53a82194da797a3489c2491e84c80;hb=d14188d87056cfd63490ef9f16f4aae0c1864864;hpb=10d9eb5fcea8440b9ea06a3732678b286090934f

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/DeletePostCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/DeletePostCommandTest.kt
index 4a23602..15173d2 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/DeletePostCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/DeletePostCommandTest.kt
@@ -1,16 +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.Post
-import net.pterodactylus.sone.freenet.fcp.FcpException
-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
-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 [DeletePostCommand].
@@ -23,7 +19,7 @@ class DeletePostCommandTest : SoneCommandTest() {
 
 	@Test
 	fun `command requires write access`() {
-		assertThat(command.requiresWriteAccess(), equalTo(true))
+		assertThat(command.requiresWriteAccess, equalTo(true))
 	}
 
 	@Test
@@ -33,25 +29,24 @@ class DeletePostCommandTest : SoneCommandTest() {
 
 	@Test
 	fun `request with invalid post parameter results in fcp exception`() {
-		parameters.putSingle("Post", "InvalidPostId")
-		expectedException.expect(FcpException::class.java)
-		command.execute(parameters, null, null)
+		parameters += "Post" to "InvalidPostId"
+		executeCommandAndExpectFcpException()
 	}
 
 	@Test
 	fun `request with post from remote sone returns error response`() {
-		parameters.putSingle("Post", "RemotePostId")
-		whenever(core.getPost("RemotePostId")).thenReturn(of(postFromRemoteSone))
-		val response = command.execute(parameters, null, null)
+		parameters += "Post" to "RemotePostId"
+		whenever(core.getPost("RemotePostId")).thenReturn(postFromRemoteSone)
+		val response = command.execute(parameters)
 		assertThat(response.replyParameters["Message"], equalTo("Error"))
 		assertThat(response.replyParameters["ErrorCode"], equalTo("401"))
 	}
 
 	@Test
 	fun `request with post from local sone deletes posts`() {
-		parameters.putSingle("Post", "LocalPostId")
-		whenever(core.getPost("LocalPostId")).thenReturn(of(postFromLocalSone))
-		val response = command.execute(parameters, null, null)
+		parameters += "Post" to "LocalPostId"
+		whenever(core.getPost("LocalPostId")).thenReturn(postFromLocalSone)
+		val response = command.execute(parameters)
 		assertThat(response.replyParameters["Message"], equalTo("PostDeleted"))
 		verify(core).deletePost(postFromLocalSone)
 	}