projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move verifiers to different package.
[Sone.git]
/
src
/
test
/
java
/
net
/
pterodactylus
/
sone
/
fcp
/
DeleteReplyCommandTest.java
diff --git
a/src/test/java/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.java
b/src/test/java/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.java
index
8b7cadd
..
873d1da
100644
(file)
--- a/
src/test/java/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.java
+++ b/
src/test/java/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.java
@@
-17,10
+17,10
@@
package net.pterodactylus.sone.fcp;
package net.pterodactylus.sone.fcp;
+import static net.pterodactylus.sone.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;
@@
-57,10
+57,8
@@
public class DeleteReplyCommandTest {
.put("Reply", "ReplyId")
.get();
Response response = deleteReplyCommand.execute(deleteReplyFieldSet, null, DIRECT);
.put("Reply", "ReplyId")
.get();
Response response = deleteReplyCommand.execute(deleteReplyFieldSet, null, DIRECT);
-
assertThat(response, notNullValue()
);
+
verifyAnswer(response, "ReplyDeleted"
);
assertThat(postReplyCaptor.getValue(), is(postReply));
assertThat(postReplyCaptor.getValue(), is(postReply));
- assertThat(response.getReplyParameters(), notNullValue());
- assertThat(response.getReplyParameters().get("Message"), is("ReplyDeleted"));
}
@Test(expected = FcpException.class)
}
@Test(expected = FcpException.class)
@@
-89,9
+87,7
@@
public class DeleteReplyCommandTest {
.put("Reply", "ReplyId")
.get();
Response response = deleteReplyCommand.execute(deleteReplyFieldSet, null, DIRECT);
.put("Reply", "ReplyId")
.get();
Response response = deleteReplyCommand.execute(deleteReplyFieldSet, 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"));
}