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 422a470..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;
 
+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 org.hamcrest.Matchers.notNullValue;
 import static org.mockito.ArgumentCaptor.forClass;
 import static org.mockito.Mockito.doNothing;
 
@@ -48,8 +48,8 @@ public class DeleteReplyCommandTest {
 
        @Test
        public void verifyThatDeletingAReplyWorks() throws FcpException {
-               Sone sone = mocks.mockLocalSone("SoneId");
-               PostReply postReply = mocks.mockPostReply(sone, "ReplyId");
+               Sone sone = mocks.mockSone("SoneId").local().create();
+               PostReply postReply = mocks.mockPostReply(sone, "ReplyId").create();
                ArgumentCaptor<PostReply> postReplyCaptor = forClass(PostReply.class);
                doNothing().when(mocks.core).deleteReply(postReplyCaptor.capture());
                SimpleFieldSet deleteReplyFieldSet = new SimpleFieldSetBuilder()
@@ -57,10 +57,8 @@ public class DeleteReplyCommandTest {
                                .put("Reply", "ReplyId")
                                .get();
                Response response = deleteReplyCommand.execute(deleteReplyFieldSet, null, DIRECT);
-               assertThat(response, notNullValue());
+               verifyAnswer(response, "ReplyDeleted");
                assertThat(postReplyCaptor.getValue(), is(postReply));
-               assertThat(response.getReplyParameters(), notNullValue());
-               assertThat(response.getReplyParameters().get("Message"), is("ReplyDeleted"));
        }
 
        @Test(expected = FcpException.class)
@@ -82,16 +80,14 @@ public class DeleteReplyCommandTest {
 
        @Test
        public void verifyThatDeletingAReplyFromANonLocalSoneCausesAnError() throws FcpException {
-               Sone sone = mocks.mockRemoteSone("SoneId");
-               mocks.mockPostReply(sone, "ReplyId");
+               Sone sone = mocks.mockSone("SoneId").create();
+               mocks.mockPostReply(sone, "ReplyId").create();
                SimpleFieldSet deleteReplyFieldSet = new SimpleFieldSetBuilder()
                                .put("Message", "DeleteReply")
                                .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"));
        }