X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FLikeReplyCommandTest.kt;h=0d0579a926212d56ab33aa78b67eb84aa5935d6d;hb=d14188d87056cfd63490ef9f16f4aae0c1864864;hp=69ace0a6fb52d81b2f5cc2a10d948ab5256c690c;hpb=5a54ea664e862c910b1766d8ba0dd5efb6ea0151;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/LikeReplyCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/LikeReplyCommandTest.kt
index 69ace0a..0d0579a 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/LikeReplyCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/LikeReplyCommandTest.kt
@@ -1,37 +1,32 @@
 package net.pterodactylus.sone.fcp
 
-import net.pterodactylus.sone.core.Core
-import net.pterodactylus.sone.data.Post
-import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.freenet.fcp.FcpException
-import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.utils.asOptional
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.equalTo
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Mockito.verify
+import net.pterodactylus.sone.core.*
+import net.pterodactylus.sone.freenet.fcp.*
+import net.pterodactylus.sone.test.*
+import org.hamcrest.MatcherAssert.*
+import org.hamcrest.Matchers.*
+import org.junit.*
+import org.mockito.Mockito.*
 
 /**
  * Unit test for [LikeReplyCommand].
  */
 class LikeReplyCommandTest : SoneCommandTest() {
 
-	private val reply = createReply("ReplyId", mock<Sone>(), mock<Post>(), 1000, "Text")
+	private val reply = createReply("ReplyId", mock(), mock(), 1000, "Text")
 
 	override fun createCommand(core: Core) = LikeReplyCommand(core)
 
 	@Before
 	fun setupRepliesAndSones() {
-		whenever(core.getPostReply("ReplyId")).thenReturn(reply.asOptional())
-		whenever(core.getSone("RemoteSoneId")).thenReturn(remoteSone.asOptional())
-		whenever(core.getSone("LocalSoneId")).thenReturn(localSone.asOptional())
+		whenever(core.getPostReply("ReplyId")).thenReturn(reply)
+		whenever(core.getSone("RemoteSoneId")).thenReturn(remoteSone)
+		whenever(core.getSone("LocalSoneId")).thenReturn(localSone)
 	}
 
 	@Test
 	fun `command requires write access`() {
-		assertThat(command.requiresWriteAccess(), equalTo(true))
+		assertThat(command.requiresWriteAccess, equalTo(true))
 	}
 
 	@Test
@@ -71,7 +66,7 @@ class LikeReplyCommandTest : SoneCommandTest() {
 
 	@Test
 	fun `request with local sone adds reply id to sone`() {
-		whenever(core.getLikes(reply)).thenReturn(setOf(mock<Sone>(), mock<Sone>(), mock<Sone>()))
+		whenever(core.getLikes(reply)).thenReturn(setOf(mock(), mock(), mock()))
 		parameters += "Reply" to "ReplyId"
 		parameters += "Sone" to "LocalSoneId"
 		val replyParameters = command.execute(parameters).replyParameters