X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FCreatePostCommandTest.kt;h=cfbda94f94cec47a520a98a1922ee22e1e37bf47;hp=75e238e9e1d1d155a56e8153bad8cce07cae1fb7;hb=04709e23f38e9d447337682ba27201da5dc19bd9;hpb=00c0f66598af0a462cb367fbf1ad67512878cf5e

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt
index 75e238e..cfbda94 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt
@@ -1,11 +1,9 @@
 package net.pterodactylus.sone.fcp
 
-import com.google.common.base.Optional
 import com.google.common.base.Optional.absent
 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
@@ -22,7 +20,7 @@ class CreatePostCommandTest : SoneCommandTest() {
 
 	@Test
 	fun `command requires write access`() {
-		assertThat(command.requiresWriteAccess(), equalTo(true))
+		assertThat(command.requiresWriteAccess, equalTo(true))
 	}
 
 	@Test
@@ -47,55 +45,53 @@ class CreatePostCommandTest : SoneCommandTest() {
 
 	@Test
 	fun `request without text results in fcp exception`() {
-		parameters.putSingle("Sone", "LocalSoneId")
-		whenever(core.getSone("LocalSoneId")).thenReturn(Optional.of(localSone))
-		expectedException.expect(FcpException::class.java)
-		command.execute(parameters, null, null)
+		parameters += "Sone" to "LocalSoneId"
+		whenever(core.getSone("LocalSoneId")).thenReturn(localSone)
+		executeCommandAndExpectFcpException()
 	}
 
 	@Test
 	fun `request with text creates post`() {
-		parameters.putSingle("Sone", "LocalSoneId")
-		parameters.putSingle("Text", "Test")
-		whenever(core.getSone("LocalSoneId")).thenReturn(of(localSone))
+		parameters += "Sone" to "LocalSoneId"
+		parameters += "Text" to "Test"
+		whenever(core.getSone("LocalSoneId")).thenReturn(localSone)
 		val post = mock<Post>().apply { whenever(id).thenReturn("PostId") }
-		whenever(core.createPost(localSone, absent(), "Test")).thenReturn(post)
-		val response = command.execute(parameters, null, null)
+		whenever(core.createPost(localSone, null, "Test")).thenReturn(post)
+		val response = command.execute(parameters)
 		assertThat(response.replyParameters.get("Message"), equalTo("PostCreated"))
 		assertThat(response.replyParameters.get("Post"), equalTo("PostId"))
 	}
 
 	@Test
 	fun `request with invalid recipient results in fcp exception`() {
-		parameters.putSingle("Sone", "LocalSoneId")
-		parameters.putSingle("Text", "Test")
-		parameters.putSingle("Recipient", "InvalidSoneId")
-		whenever(core.getSone("LocalSoneId")).thenReturn(of(localSone))
-		expectedException.expect(FcpException::class.java)
-		command.execute(parameters, null, null)
+		parameters += "Sone" to "LocalSoneId"
+		parameters += "Text" to "Test"
+		parameters += "Recipient" to "InvalidSoneId"
+		whenever(core.getSone("LocalSoneId")).thenReturn(localSone)
+		executeCommandAndExpectFcpException()
 	}
 
 	@Test
 	fun `request with recipient the same as the sender returns an error response`() {
-		parameters.putSingle("Sone", "LocalSoneId")
-		parameters.putSingle("Text", "Test")
-		parameters.putSingle("Recipient", "LocalSoneId")
-		whenever(core.getSone("LocalSoneId")).thenReturn(of(localSone))
-		val response = command.execute(parameters, null, null)
+		parameters += "Sone" to "LocalSoneId"
+		parameters += "Text" to "Test"
+		parameters += "Recipient" to "LocalSoneId"
+		whenever(core.getSone("LocalSoneId")).thenReturn(localSone)
+		val response = command.execute(parameters)
 		assertThat(response.replyParameters["Message"], equalTo("Error"))
 		assertThat(response.replyParameters["ErrorMessage"], notNullValue())
 	}
 
 	@Test
 	fun `request with text and recipient creates post`() {
-		parameters.putSingle("Sone", "LocalSoneId")
-		parameters.putSingle("Text", "Test")
-		parameters.putSingle("Recipient", "RemoteSoneId")
-		whenever(core.getSone("LocalSoneId")).thenReturn(of(localSone))
-		whenever(core.getSone("RemoteSoneId")).thenReturn(of(remoteSone))
+		parameters += "Sone" to "LocalSoneId"
+		parameters += "Text" to "Test"
+		parameters += "Recipient" to "RemoteSoneId"
+		whenever(core.getSone("LocalSoneId")).thenReturn(localSone)
+		whenever(core.getSone("RemoteSoneId")).thenReturn(remoteSone)
 		val post = mock<Post>().apply { whenever(id).thenReturn("PostId") }
-		whenever(core.createPost(localSone, of(remoteSone), "Test")).thenReturn(post)
-		val response = command.execute(parameters, null, null)
+		whenever(core.createPost(localSone, remoteSone, "Test")).thenReturn(post)
+		val response = command.execute(parameters)
 		assertThat(response.replyParameters.get("Message"), equalTo("PostCreated"))
 		assertThat(response.replyParameters.get("Post"), equalTo("PostId"))
 	}