projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up some imports
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
fcp
/
DeletePostCommandTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/fcp/DeletePostCommandTest.kt
b/src/test/kotlin/net/pterodactylus/sone/fcp/DeletePostCommandTest.kt
index
4a23602
..
751ad24
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/fcp/DeletePostCommandTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/fcp/DeletePostCommandTest.kt
@@
-3,13
+3,11
@@
package net.pterodactylus.sone.fcp
import com.google.common.base.Optional.of
import net.pterodactylus.sone.core.Core
import net.pterodactylus.sone.data.Post
import com.google.common.base.Optional.of
import net.pterodactylus.sone.core.Core
import net.pterodactylus.sone.data.Post
-import net.pterodactylus.sone.freenet.fcp.FcpException
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.junit.Test
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.junit.Test
-import org.mockito.Mockito
import org.mockito.Mockito.verify
/**
import org.mockito.Mockito.verify
/**
@@
-33,25
+31,24
@@
class DeletePostCommandTest : SoneCommandTest() {
@Test
fun `request with invalid post parameter results in fcp exception`() {
@Test
fun `request with invalid post parameter results in fcp exception`() {
- parameters.putSingle("Post", "InvalidPostId")
- expectedException.expect(FcpException::class.java)
- command.execute(parameters, null, null)
+ parameters += "Post" to "InvalidPostId"
+ executeCommandAndExpectFcpException()
}
@Test
fun `request with post from remote sone returns error response`() {
}
@Test
fun `request with post from remote sone returns error response`() {
- parameters
.putSingle("Post", "RemotePostId")
+ parameters
+= "Post" to "RemotePostId"
whenever(core.getPost("RemotePostId")).thenReturn(of(postFromRemoteSone))
whenever(core.getPost("RemotePostId")).thenReturn(of(postFromRemoteSone))
- val response = command.execute(parameters
, null, null
)
+ val response = command.execute(parameters)
assertThat(response.replyParameters["Message"], equalTo("Error"))
assertThat(response.replyParameters["ErrorCode"], equalTo("401"))
}
@Test
fun `request with post from local sone deletes posts`() {
assertThat(response.replyParameters["Message"], equalTo("Error"))
assertThat(response.replyParameters["ErrorCode"], equalTo("401"))
}
@Test
fun `request with post from local sone deletes posts`() {
- parameters
.putSingle("Post", "LocalPostId")
+ parameters
+= "Post" to "LocalPostId"
whenever(core.getPost("LocalPostId")).thenReturn(of(postFromLocalSone))
whenever(core.getPost("LocalPostId")).thenReturn(of(postFromLocalSone))
- val response = command.execute(parameters
, null, null
)
+ val response = command.execute(parameters)
assertThat(response.replyParameters["Message"], equalTo("PostDeleted"))
verify(core).deletePost(postFromLocalSone)
}
assertThat(response.replyParameters["Message"], equalTo("PostDeleted"))
verify(core).deletePost(postFromLocalSone)
}