X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FSoneCommandTest.kt;h=91eabf54841d8bf9ca29a83738192d1530b978a2;hp=aa38f8846134ce7ade1de7d9020c6c579ecd8aab;hb=d14188d87056cfd63490ef9f16f4aae0c1864864;hpb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
index aa38f88..91eabf5 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
@@ -1,23 +1,15 @@
 package net.pterodactylus.sone.fcp
 
-import com.google.common.base.Optional
-import com.google.common.base.Optional.absent
-import freenet.support.SimpleFieldSet
-import net.pterodactylus.sone.core.Core
-import net.pterodactylus.sone.data.Post
-import net.pterodactylus.sone.data.PostReply
-import net.pterodactylus.sone.data.Profile
-import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.freenet.fcp.FcpException
-import net.pterodactylus.sone.template.SoneAccessor
-import net.pterodactylus.sone.test.OneByOneMatcher
-import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.utils.asOptional
-import org.junit.Before
-import org.junit.Rule
-import org.junit.rules.ExpectedException
-import org.mockito.ArgumentMatchers.anyString
+import freenet.support.*
+import net.pterodactylus.sone.core.*
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.freenet.fcp.*
+import net.pterodactylus.sone.template.*
+import net.pterodactylus.sone.test.*
+import net.pterodactylus.sone.utils.*
+import org.junit.*
+import org.junit.rules.*
+import org.mockito.ArgumentMatchers.*
 
 /**
  * Base class for Sone FCP command tests.
@@ -39,9 +31,9 @@ abstract class SoneCommandTest {
 
 	@Before
 	fun setupCore() {
-		whenever(core.getSone(anyString())).thenReturn(absent())
-		whenever(core.getPost(anyString())).thenReturn(absent())
-		whenever(core.getPostReply(anyString())).thenReturn(absent())
+		whenever(core.getSone(anyString())).thenReturn(null)
+		whenever(core.getPost(anyString())).thenReturn(null)
+		whenever(core.getPostReply(anyString())).thenReturn(null)
 	}
 
 	protected fun createSone(id: String, name: String, firstName: String, lastName: String, time: Long) = mock<Sone>().apply {
@@ -92,7 +84,7 @@ abstract class SoneCommandTest {
 
 	fun requestWithValidRemoteSoneParameterResultsInFcpException() {
 		parameters += "Sone" to "RemoteSoneId"
-		whenever(core.getSone("RemoteSoneId")).thenReturn(Optional.of(remoteSone))
+		whenever(core.getSone("RemoteSoneId")).thenReturn(remoteSone)
 		executeCommandAndExpectFcpException()
 	}