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.
@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 {
fun requestWithValidRemoteSoneParameterResultsInFcpException() {
parameters += "Sone" to "RemoteSoneId"
- whenever(core.getSone("RemoteSoneId")).thenReturn(Optional.of(remoteSone))
+ whenever(core.getSone("RemoteSoneId")).thenReturn(remoteSone)
executeCommandAndExpectFcpException()
}