Optimize some imports

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/CreateReplyCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/CreateReplyCommandTest.kt
index b30b765..373e3db 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/CreateReplyCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/CreateReplyCommandTest.kt
@@ -1,14 +1,11 @@
 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.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 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.*
 
 /**
  * Unit test for [CreateReplyCommand].
@@ -21,7 +18,7 @@ class CreateReplyCommandTest : SoneCommandTest() {
 
        @Test
        fun `command requires write access`() {
-               assertThat(command.requiresWriteAccess(), equalTo(true))
+               assertThat(command.requiresWriteAccess, equalTo(true))
        }
 
        @Test
@@ -45,8 +42,8 @@ class CreateReplyCommandTest : SoneCommandTest() {
        }
 
        private fun addValidLocalSoneParameter() {
-               parameters.putSingle("Sone", "LocalSoneId")
-               whenever(core.getSone("LocalSoneId")).thenReturn(of(localSone))
+               parameters += "Sone" to "LocalSoneId"
+               whenever(core.getSone("LocalSoneId")).thenReturn(localSone)
        }
 
        @Test
@@ -58,13 +55,13 @@ class CreateReplyCommandTest : SoneCommandTest() {
        @Test
        fun `request with invalid post parameter results in fcp exception`() {
                addValidLocalSoneParameter()
-               parameters.putSingle("Post", "InvalidPostId")
+               parameters += "Post" to "InvalidPostId"
                executeCommandAndExpectFcpException()
        }
 
        private fun addValidPostParameter() {
-               parameters.putSingle("Post", "ValidPostId")
-               whenever(core.getPost("ValidPostId")).thenReturn(of(post))
+               parameters += "Post" to "ValidPostId"
+               whenever(core.getPost("ValidPostId")).thenReturn(post)
        }
 
        @Test
@@ -78,7 +75,7 @@ class CreateReplyCommandTest : SoneCommandTest() {
        fun `complete request creates reply`() {
                addValidLocalSoneParameter()
                addValidPostParameter()
-               parameters.putSingle("Text", "Test")
+               parameters += "Text" to "Test"
                val postReply = mock<PostReply>().apply { whenever(id).thenReturn("ReplyId") }
                whenever(core.createReply(localSone, post, "Test")).thenReturn(postReply)
                val response = command.execute(parameters)