X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FCreatePostCommandTest.kt;h=fabdd0943cf7cd15300566033059aa5d7b20dfab;hb=HEAD;hp=5fc84f07463ac2ee194ad925749c3a99857c4463;hpb=c088dd5a2896d777cc30c5676583782bfa923729;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt
index 5fc84f0..fabdd09 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt
@@ -1,8 +1,5 @@
 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.test.mock
@@ -21,7 +18,7 @@ class CreatePostCommandTest : SoneCommandTest() {
 
 	@Test
 	fun `command requires write access`() {
-		assertThat(command.requiresWriteAccess(), equalTo(true))
+		assertThat(command.requiresWriteAccess, equalTo(true))
 	}
 
 	@Test
@@ -47,7 +44,7 @@ class CreatePostCommandTest : SoneCommandTest() {
 	@Test
 	fun `request without text results in fcp exception`() {
 		parameters += "Sone" to "LocalSoneId"
-		whenever(core.getSone("LocalSoneId")).thenReturn(Optional.of(localSone))
+		whenever(core.getSone("LocalSoneId")).thenReturn(localSone)
 		executeCommandAndExpectFcpException()
 	}
 
@@ -55,9 +52,9 @@ class CreatePostCommandTest : SoneCommandTest() {
 	fun `request with text creates post`() {
 		parameters += "Sone" to "LocalSoneId"
 		parameters += "Text" to "Test"
-		whenever(core.getSone("LocalSoneId")).thenReturn(of(localSone))
+		whenever(core.getSone("LocalSoneId")).thenReturn(localSone)
 		val post = mock<Post>().apply { whenever(id).thenReturn("PostId") }
-		whenever(core.createPost(localSone, absent(), "Test")).thenReturn(post)
+		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"))
@@ -68,7 +65,7 @@ class CreatePostCommandTest : SoneCommandTest() {
 		parameters += "Sone" to "LocalSoneId"
 		parameters += "Text" to "Test"
 		parameters += "Recipient" to "InvalidSoneId"
-		whenever(core.getSone("LocalSoneId")).thenReturn(of(localSone))
+		whenever(core.getSone("LocalSoneId")).thenReturn(localSone)
 		executeCommandAndExpectFcpException()
 	}
 
@@ -77,7 +74,7 @@ class CreatePostCommandTest : SoneCommandTest() {
 		parameters += "Sone" to "LocalSoneId"
 		parameters += "Text" to "Test"
 		parameters += "Recipient" to "LocalSoneId"
-		whenever(core.getSone("LocalSoneId")).thenReturn(of(localSone))
+		whenever(core.getSone("LocalSoneId")).thenReturn(localSone)
 		val response = command.execute(parameters)
 		assertThat(response.replyParameters["Message"], equalTo("Error"))
 		assertThat(response.replyParameters["ErrorMessage"], notNullValue())
@@ -88,10 +85,10 @@ class CreatePostCommandTest : SoneCommandTest() {
 		parameters += "Sone" to "LocalSoneId"
 		parameters += "Text" to "Test"
 		parameters += "Recipient" to "RemoteSoneId"
-		whenever(core.getSone("LocalSoneId")).thenReturn(of(localSone))
-		whenever(core.getSone("RemoteSoneId")).thenReturn(of(remoteSone))
+		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)
+		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"))