X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FSoneCommandTest.kt;h=f34b19cd66057c7f018daef0e62b954c994552ac;hb=914d5522692e7714ba5bdefb002fedc8e293f5fc;hp=2f2de5c3d8529b8e1985e4ae653b4fb2c5a71ee3;hpb=92adeef899fe2798c0952a6585463448cbf56c94;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
index 2f2de5c..f34b19c 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/SoneCommandTest.kt
@@ -5,19 +5,16 @@ import com.google.common.base.Optional.absent
 import freenet.support.SimpleFieldSet
 import net.pterodactylus.sone.core.Core
 import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.freenet.fcp.Command
 import net.pterodactylus.sone.freenet.fcp.FcpException
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
 import org.junit.Before
 import org.junit.Rule
-import org.junit.Test
 import org.junit.rules.ExpectedException
-import org.mockito.ArgumentMatchers
 import org.mockito.ArgumentMatchers.anyString
 
 /**
- * TODO
+ * Base class for Sone FCP command tests.
  */
 abstract class SoneCommandTest {
 
@@ -38,30 +35,33 @@ abstract class SoneCommandTest {
 	fun setupCore() {
 		whenever(core.getSone(anyString())).thenReturn(absent())
 		whenever(core.getPost(anyString())).thenReturn(absent())
+		whenever(core.getPostReply(anyString())).thenReturn(absent())
+	}
+
+	protected fun executeCommandAndExpectFcpException() {
+		expectedException.expect(FcpException::class.java)
+		command.execute(parameters)
 	}
 
 	protected fun requestWithoutAnyParameterResultsInFcpException() {
 		expectedException.expect(FcpException::class.java)
-		command.execute(parameters, null, null)
+		command.execute(parameters)
 	}
 
 	protected fun requestWithEmptySoneParameterResultsInFcpException() {
 		parameters.putSingle("Sone", null)
-		expectedException.expect(FcpException::class.java)
-		command.execute(parameters, null, null)
+		executeCommandAndExpectFcpException()
 	}
 
 	protected fun requestWithInvalidSoneParameterResultsInFcpException() {
 		parameters.putSingle("Sone", "InvalidSoneId")
-		expectedException.expect(FcpException::class.java)
-		command.execute(parameters, null, null)
+		executeCommandAndExpectFcpException()
 	}
 
 	fun requestWithValidRemoteSoneParameterResultsInFcpException() {
 		parameters.putSingle("Sone", "RemoteSoneId")
 		whenever(core.getSone("RemoteSoneId")).thenReturn(Optional.of(remoteSone))
-		expectedException.expect(FcpException::class.java)
-		command.execute(parameters, null, null)
+		executeCommandAndExpectFcpException()
 	}
 
 }