Optimize some imports

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / fcp / DeletePostCommandTest.kt

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/DeletePostCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/DeletePostCommandTest.kt
index a2b4198..15173d2 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/DeletePostCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/DeletePostCommandTest.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.Post
-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 [DeletePostCommand].
@@ -21,7 +19,7 @@ class DeletePostCommandTest : SoneCommandTest() {
 
        @Test
        fun `command requires write access`() {
-               assertThat(command.requiresWriteAccess(), equalTo(true))
+               assertThat(command.requiresWriteAccess, equalTo(true))
        }
 
        @Test
@@ -31,14 +29,14 @@ class DeletePostCommandTest : SoneCommandTest() {
 
        @Test
        fun `request with invalid post parameter results in fcp exception`() {
-               parameters.putSingle("Post", "InvalidPostId")
+               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))
+               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"))
@@ -46,8 +44,8 @@ class DeletePostCommandTest : SoneCommandTest() {
 
        @Test
        fun `request with post from local sone deletes posts`() {
-               parameters.putSingle("Post", "LocalPostId")
-               whenever(core.getPost("LocalPostId")).thenReturn(of(postFromLocalSone))
+               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)