projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add unit test for IdentityAccessor.
[Sone.git]
/
src
/
test
/
java
/
net
/
pterodactylus
/
sone
/
fcp
/
DeletePostCommandTest.java
diff --git
a/src/test/java/net/pterodactylus/sone/fcp/DeletePostCommandTest.java
b/src/test/java/net/pterodactylus/sone/fcp/DeletePostCommandTest.java
index
2dc0382
..
1e2ce7c
100644
(file)
--- a/
src/test/java/net/pterodactylus/sone/fcp/DeletePostCommandTest.java
+++ b/
src/test/java/net/pterodactylus/sone/fcp/DeletePostCommandTest.java
@@
-17,10
+17,10
@@
package net.pterodactylus.sone.fcp;
package net.pterodactylus.sone.fcp;
+import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
import static org.mockito.ArgumentCaptor.forClass;
import static org.mockito.Mockito.doNothing;
import static org.mockito.ArgumentCaptor.forClass;
import static org.mockito.Mockito.doNothing;
@@
-49,7
+49,7
@@
public class DeletePostCommandTest {
@Test
public void verifyThatDeletingAPostWorks() throws FcpException {
Sone sone = mocks.mockSone("Sone").local().create();
@Test
public void verifyThatDeletingAPostWorks() throws FcpException {
Sone sone = mocks.mockSone("Sone").local().create();
- Post post = mocks.mockPost(sone, "PostId");
+ Post post = mocks.mockPost(sone, "PostId")
.create()
;
ArgumentCaptor<Post> deletedPost = forClass(Post.class);
doNothing().when(mocks.core).deletePost(deletedPost.capture());
SimpleFieldSet deletePostFieldSet = new SimpleFieldSetBuilder()
ArgumentCaptor<Post> deletedPost = forClass(Post.class);
doNothing().when(mocks.core).deletePost(deletedPost.capture());
SimpleFieldSet deletePostFieldSet = new SimpleFieldSetBuilder()
@@
-57,24
+57,20
@@
public class DeletePostCommandTest {
.put("Post", "PostId")
.get();
Response response = deletePostCommand.execute(deletePostFieldSet, null, DIRECT);
.put("Post", "PostId")
.get();
Response response = deletePostCommand.execute(deletePostFieldSet, null, DIRECT);
- assertThat(response, notNullValue());
- assertThat(response.getReplyParameters(), notNullValue());
- assertThat(response.getReplyParameters().get("Message"), is("PostDeleted"));
+ verifyAnswer(response, "PostDeleted");
assertThat(deletedPost.getValue(), is(post));
}
@Test
public void verifyThatDeletingAPostFromANonLocalSoneCausesAnError() throws FcpException {
Sone sone = mocks.mockSone("Sone").create();
assertThat(deletedPost.getValue(), is(post));
}
@Test
public void verifyThatDeletingAPostFromANonLocalSoneCausesAnError() throws FcpException {
Sone sone = mocks.mockSone("Sone").create();
- Post post = mocks.mockPost(sone, "PostId");
+ Post post = mocks.mockPost(sone, "PostId")
.create()
;
SimpleFieldSet deletePostFieldSet = new SimpleFieldSetBuilder()
.put("Message", "DeletePost")
.put("Post", "PostId")
.get();
Response response = deletePostCommand.execute(deletePostFieldSet, null, DIRECT);
SimpleFieldSet deletePostFieldSet = new SimpleFieldSetBuilder()
.put("Message", "DeletePost")
.put("Post", "PostId")
.get();
Response response = deletePostCommand.execute(deletePostFieldSet, null, DIRECT);
- assertThat(response, notNullValue());
- assertThat(response.getReplyParameters(), notNullValue());
- assertThat(response.getReplyParameters().get("Message"), is("Error"));
+ verifyAnswer(response, "Error");
assertThat(response.getReplyParameters().get("ErrorCode"), is("401"));
}
assertThat(response.getReplyParameters().get("ErrorCode"), is("401"));
}
@@
-88,8
+84,6
@@
public class DeletePostCommandTest {
@Test(expected = FcpException.class)
public void verifyThatDeletingAPostWithAnInvalidPostIdCausesAnError() throws FcpException {
@Test(expected = FcpException.class)
public void verifyThatDeletingAPostWithAnInvalidPostIdCausesAnError() throws FcpException {
- Sone sone = mocks.mockSone("Sone").local().create();
- mocks.mockPost(sone, "PostId");
SimpleFieldSet deletePostFieldSet = new SimpleFieldSetBuilder()
.put("Message", "DeletePost")
.put("Post", "OtherPostId")
SimpleFieldSet deletePostFieldSet = new SimpleFieldSetBuilder()
.put("Message", "DeletePost")
.put("Post", "OtherPostId")