X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FLikeReplyCommandTest.kt;h=e0df020f81e5235f18da58c36cf6790996915a6e;hp=d222c27bccb93af46cb57750d8d0e932f500578c;hb=03c29a3838e23ed0b9731ca4d84cf58038c30dfe;hpb=ae078c3b54fce575270aae9ec645a286641aea71

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/LikeReplyCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/LikeReplyCommandTest.kt
index d222c27..e0df020 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/LikeReplyCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/LikeReplyCommandTest.kt
@@ -4,9 +4,9 @@ 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.asOptional
 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
@@ -18,20 +18,20 @@ import org.mockito.Mockito.verify
  */
 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 +71,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