Use verify* methods from Verifiers.

[Sone.git] / src / test / java / net / pterodactylus / sone / fcp / GetPostCommandTest.java

diff --git a/src/test/java/net/pterodactylus/sone/fcp/GetPostCommandTest.java b/src/test/java/net/pterodactylus/sone/fcp/GetPostCommandTest.java
index d303535..b248fef 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/fcp/GetPostCommandTest.java
+++ b/src/test/java/net/pterodactylus/sone/fcp/GetPostCommandTest.java
@@ -18,12 +18,10 @@
 package net.pterodactylus.sone.fcp;
 
 import static com.google.common.base.Optional.of;
-import static java.lang.String.format;
 import static java.util.Arrays.asList;
+import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
+import static net.pterodactylus.sone.fcp.Verifiers.verifyPostWithReplies;
 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.Mockito.when;
 
 import net.pterodactylus.sone.data.Mocks;
@@ -59,8 +57,8 @@ public class GetPostCommandTest {
                                .put("Post", "PostId")
                                .get();
                Response response = getPostCommand.execute(getPostFieldSet, null, DIRECT);
-               verifyAnswer(response);
-               verifyPost(post, response);
+               verifyAnswer(response, "Post");
+               verifyPostWithReplies(response.getReplyParameters(), "Post.", post);
        }
 
        @Test
@@ -73,8 +71,8 @@ public class GetPostCommandTest {
                                .put("Post", "PostId")
                                .get();
                Response response = getPostCommand.execute(getPostFieldSet, null, DIRECT);
-               verifyAnswer(response);
-               verifyPost(post, response);
+               verifyAnswer(response, "Post");
+               verifyPostWithReplies(response.getReplyParameters(), "Post.", post);
        }
 
        @Test
@@ -92,11 +90,8 @@ public class GetPostCommandTest {
                                .put("IncludeReplies", "true")
                                .get();
                Response response = getPostCommand.execute(getPostFieldSet, null, DIRECT);
-               verifyAnswer(response);
-               verifyPost(post, response);
-               assertThat(response.getReplyParameters().getInt("Post.Replies.Count"), is(post.getReplies().size()));
-               verifyReply(response.getReplyParameters(), "Post.Replies.0.", postReply1);
-               verifyReply(response.getReplyParameters(), "Post.Replies.1.", postReply2);
+               verifyAnswer(response, "Post");
+               verifyPostWithReplies(response.getReplyParameters(), "Post.", post);
        }
 
        @Test(expected = FcpException.class)
@@ -138,25 +133,4 @@ public class GetPostCommandTest {
                return post;
        }
 
-       private void verifyAnswer(Response response) {
-               assertThat(response, notNullValue());
-               assertThat(response.getReplyParameters(), notNullValue());
-               assertThat(response.getReplyParameters().get("Message"), is("Post"));
-       }
-
-       private void verifyReply(SimpleFieldSet replyParameters, String prefix, PostReply postReply) throws FSParseException {
-               assertThat(replyParameters.get(format("%sID", prefix)), is(postReply.getId()));
-               assertThat(replyParameters.get(format("%sSone", prefix)), is(postReply.getSone().getId()));
-               assertThat(replyParameters.getLong(format("%sTime", prefix)), is(postReply.getTime()));
-               assertThat(replyParameters.get(format("%sText", prefix)), is(postReply.getText()));
-       }
-
-       private void verifyPost(Post post, Response response) throws FSParseException {
-               assertThat(response.getReplyParameters().get("Post.ID"), is(post.getId()));
-               assertThat(response.getReplyParameters().get("Post.Sone"), is(post.getSone().getId()));
-               assertThat(response.getReplyParameters().get("Post.Recipient"), is(post.getRecipientId().orNull()));
-               assertThat(response.getReplyParameters().getLong("Post.Time"), is(post.getTime()));
-               assertThat(response.getReplyParameters().get("Post.Text"), is(post.getText()));
-       }
-
 }