Optimize some imports

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.kt
index 013b1c1..ca6ec9d 100644 (file)
--- 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
@@ -39,7 +37,7 @@ class DeleteReplyCommandTest : SoneCommandTest() {
        @Test
        fun `request with remote post reply parameter results in error response`() {
            parameters += "Reply" to "RemoteReplyId"
-               whenever(core.getPostReply("RemoteReplyId")).thenReturn(of(remotePostReply))
+               whenever(core.getPostReply("RemoteReplyId")).thenReturn(remotePostReply)
                val response = command.execute(parameters)
                assertThat(response.replyParameters["Message"], equalTo("Error"))
                assertThat(response.replyParameters["ErrorCode"], equalTo("401"))
@@ -48,7 +46,7 @@ class DeleteReplyCommandTest : SoneCommandTest() {
        @Test
        fun `request with local post reply parameter deletes reply`() {
            parameters += "Reply" to "RemoteReplyId"
-               whenever(core.getPostReply("RemoteReplyId")).thenReturn(of(localPostReply))
+               whenever(core.getPostReply("RemoteReplyId")).thenReturn(localPostReply)
                val response = command.execute(parameters)
                assertThat(response.replyParameters["Message"], equalTo("ReplyDeleted"))
                verify(core).deleteReply(localPostReply)