Move verifiers to different package.
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 18 Dec 2013 23:38:04 +0000 (00:38 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 28 Feb 2014 21:26:08 +0000 (22:26 +0100)
18 files changed:
src/test/java/net/pterodactylus/sone/Verifiers.java [new file with mode: 0644]
src/test/java/net/pterodactylus/sone/fcp/AbstractSoneCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/CreatePostCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/CreateReplyCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/DeletePostCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/GetLocalSonesCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/GetPostCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/GetPostFeedCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/GetPostsCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/GetSoneCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/GetSonesCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/LikePostCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/LikeReplyCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/LockSoneCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/UnlockSoneCommandTest.java
src/test/java/net/pterodactylus/sone/fcp/Verifiers.java [deleted file]
src/test/java/net/pterodactylus/sone/fcp/VersionCommandTest.java

diff --git a/src/test/java/net/pterodactylus/sone/Verifiers.java b/src/test/java/net/pterodactylus/sone/Verifiers.java
new file mode 100644 (file)
index 0000000..32a359f
--- /dev/null
@@ -0,0 +1,132 @@
+/*
+ * Sone - Verifiers.java - Copyright © 2013 David Roden
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.pterodactylus.sone;
+
+import static com.google.common.collect.FluentIterable.from;
+import static java.lang.String.format;
+import static net.pterodactylus.sone.data.Reply.FUTURE_REPLY_FILTER;
+import static net.pterodactylus.sone.template.SoneAccessor.getNiceName;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
+import java.util.List;
+
+import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
+import net.pterodactylus.sone.data.Profile.Field;
+import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.freenet.fcp.Command.Response;
+
+import freenet.node.FSParseException;
+import freenet.support.SimpleFieldSet;
+
+import org.hamcrest.CoreMatchers;
+
+/**
+ * Verifiers used throughout the {@link net.pterodactylus.sone.fcp} package.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class Verifiers {
+
+       public static void verifyAnswer(Response response, String messageName) {
+               assertThat(response, notNullValue());
+               assertThat(response.getReplyParameters(), notNullValue());
+               assertThat(response.getReplyParameters().get("Message"), is(messageName));
+       }
+
+       public static void verifyPost(SimpleFieldSet replyParameters, String prefix, Post post) throws FSParseException {
+               assertThat(replyParameters.get(format("%sID", prefix)), is(post.getId()));
+               assertThat(replyParameters.get(format("%sSone", prefix)), is(post.getSone().getId()));
+               assertThat(replyParameters.get(format("%sRecipient", prefix)), is(post.getRecipientId().orNull()));
+               assertThat(replyParameters.getLong(format("%sTime", prefix)), is(post.getTime()));
+               assertThat(replyParameters.get(format("%sText", prefix)), is(post.getText()));
+       }
+
+       public static void verifyPosts(SimpleFieldSet postFieldSet, String prefix, List<Post> posts) throws FSParseException {
+               assertThat(postFieldSet.getInt(prefix + "Count"), CoreMatchers.is(posts.size()));
+               int postIndex = 0;
+               for (Post post : posts) {
+                       verifyPost(postFieldSet, prefix + postIndex + ".", post);
+                       postIndex++;
+               }
+       }
+
+       public static void verifyPostReply(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()));
+       }
+
+       public static void verifyPostReplies(SimpleFieldSet postFieldSet, String prefix, List<PostReply> postReplies) throws FSParseException {
+               assertThat(postFieldSet.getInt(prefix + "Count"), CoreMatchers.is(from(postReplies).filter(FUTURE_REPLY_FILTER).size()));
+               int postReplyIndex = 0;
+               for (PostReply postReply : from(postReplies).filter(FUTURE_REPLY_FILTER)) {
+                       verifyPostReply(postFieldSet, prefix + postReplyIndex + ".", postReply);
+                       postReplyIndex++;
+               }
+       }
+
+       public static void verifyPostsWithReplies(SimpleFieldSet postFieldSet, String prefix, List<Post> posts) throws FSParseException {
+               assertThat(postFieldSet.getInt(prefix + "Count"), CoreMatchers.is(posts.size()));
+               int postIndex = 0;
+               for (Post post : posts) {
+                       verifyPost(postFieldSet, prefix + postIndex + ".", post);
+                       verifyPostReplies(postFieldSet, prefix + postIndex + ".Replies.", post.getReplies());
+                       postIndex++;
+               }
+       }
+
+       public static void verifyPostWithReplies(SimpleFieldSet postFieldSet, String prefix, Post post) throws FSParseException {
+               verifyPost(postFieldSet, prefix, post);
+               verifyPostReplies(postFieldSet, prefix + "Replies.", post.getReplies());
+       }
+
+       public static void verifyFollowedSone(SimpleFieldSet simpleFieldSet, String prefix, Sone sone) throws FSParseException {
+               verifyNotFollowedSone(simpleFieldSet, prefix, sone);
+               assertThat(simpleFieldSet.getBoolean(prefix + "Followed"), is(true));
+       }
+
+       public static void verifyNotFollowedSone(SimpleFieldSet simpleFieldSet, String prefix, Sone sone) throws FSParseException {
+               assertThat(simpleFieldSet.get(prefix + "Name"), is(sone.getName()));
+               assertThat(simpleFieldSet.get(prefix + "NiceName"), is(getNiceName(sone)));
+               assertThat(simpleFieldSet.getLong(prefix + "LastUpdated"), is(sone.getTime()));
+               assertThat(simpleFieldSet.getInt(prefix + "Field.Count"), is(sone.getProfile().getFields().size()));
+               int fieldIndex = 0;
+               for (Field field : sone.getProfile().getFields()) {
+                       assertThat(simpleFieldSet.get(prefix + "Field." + fieldIndex + ".Name"), is(field.getName()));
+                       assertThat(simpleFieldSet.get(prefix + "Field." + fieldIndex + ".Value"), is(field.getValue()));
+                       fieldIndex++;
+               }
+       }
+
+       public static void verifySones(SimpleFieldSet simpleFieldSet, String prefix, List<Sone> sones) throws FSParseException {
+               assertThat(simpleFieldSet.getInt(prefix + "Count"), is(sones.size()));
+               int soneIndex = 0;
+               for (Sone sone : sones) {
+                       assertThat(simpleFieldSet.get(prefix + soneIndex + ".ID"), is(sone.getId()));
+                       assertThat(simpleFieldSet.get(prefix + soneIndex + ".Name"), is(sone.getName()));
+                       assertThat(simpleFieldSet.get(prefix + soneIndex + ".NiceName"), is(getNiceName(sone)));
+                       assertThat(simpleFieldSet.getLong(prefix + soneIndex + ".Time"), is(sone.getTime()));
+                       soneIndex++;
+               }
+       }
+
+}
index d510ab6..59287e1 100644 (file)
@@ -24,9 +24,9 @@ import static java.util.UUID.randomUUID;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static net.pterodactylus.sone.fcp.AbstractSoneCommand.encodeSone;
 import static net.pterodactylus.sone.fcp.AbstractSoneCommand.encodeString;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static net.pterodactylus.sone.fcp.AbstractSoneCommand.encodeSone;
 import static net.pterodactylus.sone.fcp.AbstractSoneCommand.encodeString;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyPostWithReplies;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyPosts;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyPostsWithReplies;
+import static net.pterodactylus.sone.Verifiers.verifyPostWithReplies;
+import static net.pterodactylus.sone.Verifiers.verifyPosts;
+import static net.pterodactylus.sone.Verifiers.verifyPostsWithReplies;
 import static net.pterodactylus.sone.template.SoneAccessor.getNiceName;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static net.pterodactylus.sone.template.SoneAccessor.getNiceName;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
index a424079..05aedaa 100644 (file)
@@ -20,7 +20,7 @@ package net.pterodactylus.sone.fcp;
 import static com.google.common.base.Optional.of;
 import static java.lang.System.currentTimeMillis;
 import static net.pterodactylus.sone.database.PostBuilder.PostCreated;
 import static com.google.common.base.Optional.of;
 import static java.lang.System.currentTimeMillis;
 import static net.pterodactylus.sone.database.PostBuilder.PostCreated;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
+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.allOf;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
index 36f99a8..bef609a 100644 (file)
@@ -18,7 +18,7 @@
 package net.pterodactylus.sone.fcp;
 
 import static java.lang.System.currentTimeMillis;
 package net.pterodactylus.sone.fcp;
 
 import static java.lang.System.currentTimeMillis;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
+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.greaterThanOrEqualTo;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
index 1e2ce7c..683864c 100644 (file)
@@ -17,7 +17,7 @@
 
 package net.pterodactylus.sone.fcp;
 
 
 package net.pterodactylus.sone.fcp;
 
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
+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;
index 7a30808..873d1da 100644 (file)
@@ -17,7 +17,7 @@
 
 package net.pterodactylus.sone.fcp;
 
 
 package net.pterodactylus.sone.fcp;
 
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
+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;
index 85b1bb7..65497d9 100644 (file)
@@ -19,7 +19,7 @@ package net.pterodactylus.sone.fcp;
 
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
 
 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.Verifiers.verifyAnswer;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 import static org.hamcrest.MatcherAssert.assertThat;
 
index 93f55e6..a6a6fea 100644 (file)
@@ -18,8 +18,8 @@
 package net.pterodactylus.sone.fcp;
 
 import static java.util.Arrays.asList;
 package net.pterodactylus.sone.fcp;
 
 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.Verifiers.verifyAnswer;
+import static net.pterodactylus.sone.Verifiers.verifyPostWithReplies;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 import static org.mockito.Mockito.when;
 
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 import static org.mockito.Mockito.when;
 
index e272148..46f21f3 100644 (file)
@@ -20,8 +20,8 @@ package net.pterodactylus.sone.fcp;
 import static java.lang.System.currentTimeMillis;
 import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static java.lang.System.currentTimeMillis;
 import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.DAYS;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyPostsWithReplies;
+import static net.pterodactylus.sone.Verifiers.verifyAnswer;
+import static net.pterodactylus.sone.Verifiers.verifyPostsWithReplies;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 
 import java.util.Collections;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 
 import java.util.Collections;
index bb2eafa..d4c02cb 100644 (file)
@@ -18,8 +18,8 @@
 package net.pterodactylus.sone.fcp;
 
 import static java.util.Arrays.asList;
 package net.pterodactylus.sone.fcp;
 
 import static java.util.Arrays.asList;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyPostsWithReplies;
+import static net.pterodactylus.sone.Verifiers.verifyAnswer;
+import static net.pterodactylus.sone.Verifiers.verifyPostsWithReplies;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 
 import java.util.Collections;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 
 import java.util.Collections;
index 4b51388..24f6737 100644 (file)
@@ -18,9 +18,9 @@
 package net.pterodactylus.sone.fcp;
 
 import static java.util.Arrays.asList;
 package net.pterodactylus.sone.fcp;
 
 import static java.util.Arrays.asList;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyFollowedSone;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyNotFollowedSone;
+import static net.pterodactylus.sone.Verifiers.verifyAnswer;
+import static net.pterodactylus.sone.Verifiers.verifyFollowedSone;
+import static net.pterodactylus.sone.Verifiers.verifyNotFollowedSone;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 
 import java.util.Arrays;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 
 import java.util.Arrays;
index 6650a1a..f7d2469 100644 (file)
@@ -18,8 +18,8 @@
 package net.pterodactylus.sone.fcp;
 
 import static java.util.Arrays.asList;
 package net.pterodactylus.sone.fcp;
 
 import static java.util.Arrays.asList;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
-import static net.pterodactylus.sone.fcp.Verifiers.verifySones;
+import static net.pterodactylus.sone.Verifiers.verifyAnswer;
+import static net.pterodactylus.sone.Verifiers.verifySones;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 
 import java.util.Collections;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 
 import java.util.Collections;
index dd3f63f..f17a6b7 100644 (file)
@@ -17,7 +17,7 @@
 
 package net.pterodactylus.sone.fcp;
 
 
 package net.pterodactylus.sone.fcp;
 
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
+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;
index 610ed6c..a921953 100644 (file)
@@ -17,7 +17,7 @@
 
 package net.pterodactylus.sone.fcp;
 
 
 package net.pterodactylus.sone.fcp;
 
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
+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;
index 5ed051e..e4bbeec 100644 (file)
@@ -18,7 +18,7 @@
 package net.pterodactylus.sone.fcp;
 
 import static com.google.common.base.Optional.of;
 package net.pterodactylus.sone.fcp;
 
 import static com.google.common.base.Optional.of;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
+import static net.pterodactylus.sone.Verifiers.verifyAnswer;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.eq;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.eq;
index d73b6e3..adb6b96 100644 (file)
@@ -18,7 +18,7 @@
 package net.pterodactylus.sone.fcp;
 
 import static com.google.common.base.Optional.of;
 package net.pterodactylus.sone.fcp;
 
 import static com.google.common.base.Optional.of;
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
+import static net.pterodactylus.sone.Verifiers.verifyAnswer;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.eq;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.eq;
diff --git a/src/test/java/net/pterodactylus/sone/fcp/Verifiers.java b/src/test/java/net/pterodactylus/sone/fcp/Verifiers.java
deleted file mode 100644 (file)
index ed1a0f3..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Sone - Verifiers.java - Copyright © 2013 David Roden
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.sone.fcp;
-
-import static com.google.common.collect.FluentIterable.from;
-import static java.lang.String.format;
-import static net.pterodactylus.sone.data.Reply.FUTURE_REPLY_FILTER;
-import static net.pterodactylus.sone.template.SoneAccessor.getNiceName;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-
-import java.util.List;
-
-import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.data.Profile.Field;
-import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.freenet.fcp.Command.Response;
-
-import freenet.node.FSParseException;
-import freenet.support.SimpleFieldSet;
-
-import org.hamcrest.CoreMatchers;
-
-/**
- * Verifiers used throughout the {@link net.pterodactylus.sone.fcp} package.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class Verifiers {
-
-       static void verifyAnswer(Response response, String messageName) {
-               assertThat(response, notNullValue());
-               assertThat(response.getReplyParameters(), notNullValue());
-               assertThat(response.getReplyParameters().get("Message"), is(messageName));
-       }
-
-       static void verifyPost(SimpleFieldSet replyParameters, String prefix, Post post) throws FSParseException {
-               assertThat(replyParameters.get(format("%sID", prefix)), is(post.getId()));
-               assertThat(replyParameters.get(format("%sSone", prefix)), is(post.getSone().getId()));
-               assertThat(replyParameters.get(format("%sRecipient", prefix)), is(post.getRecipientId().orNull()));
-               assertThat(replyParameters.getLong(format("%sTime", prefix)), is(post.getTime()));
-               assertThat(replyParameters.get(format("%sText", prefix)), is(post.getText()));
-       }
-
-       static void verifyPosts(SimpleFieldSet postFieldSet, String prefix, List<Post> posts) throws FSParseException {
-               assertThat(postFieldSet.getInt(prefix + "Count"), CoreMatchers.is(posts.size()));
-               int postIndex = 0;
-               for (Post post : posts) {
-                       verifyPost(postFieldSet, prefix + postIndex + ".", post);
-                       postIndex++;
-               }
-       }
-
-       static void verifyPostReply(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()));
-       }
-
-       static void verifyPostReplies(SimpleFieldSet postFieldSet, String prefix, List<PostReply> postReplies) throws FSParseException {
-               assertThat(postFieldSet.getInt(prefix + "Count"), CoreMatchers.is(from(postReplies).filter(FUTURE_REPLY_FILTER).size()));
-               int postReplyIndex = 0;
-               for (PostReply postReply : from(postReplies).filter(FUTURE_REPLY_FILTER)) {
-                       verifyPostReply(postFieldSet, prefix + postReplyIndex + ".", postReply);
-                       postReplyIndex++;
-               }
-       }
-
-       static void verifyPostsWithReplies(SimpleFieldSet postFieldSet, String prefix, List<Post> posts) throws FSParseException {
-               assertThat(postFieldSet.getInt(prefix + "Count"), CoreMatchers.is(posts.size()));
-               int postIndex = 0;
-               for (Post post : posts) {
-                       verifyPost(postFieldSet, prefix + postIndex + ".", post);
-                       verifyPostReplies(postFieldSet, prefix + postIndex + ".Replies.", post.getReplies());
-                       postIndex++;
-               }
-       }
-
-       static void verifyPostWithReplies(SimpleFieldSet postFieldSet, String prefix, Post post) throws FSParseException {
-               verifyPost(postFieldSet, prefix, post);
-               verifyPostReplies(postFieldSet, prefix + "Replies.", post.getReplies());
-       }
-
-       static void verifyFollowedSone(SimpleFieldSet simpleFieldSet, String prefix, Sone sone) throws FSParseException {
-               verifyNotFollowedSone(simpleFieldSet, prefix, sone);
-               assertThat(simpleFieldSet.getBoolean(prefix + "Followed"), is(true));
-       }
-
-       static void verifyNotFollowedSone(SimpleFieldSet simpleFieldSet, String prefix, Sone sone) throws FSParseException {
-               assertThat(simpleFieldSet.get(prefix + "Name"), is(sone.getName()));
-               assertThat(simpleFieldSet.get(prefix + "NiceName"), is(getNiceName(sone)));
-               assertThat(simpleFieldSet.getLong(prefix + "LastUpdated"), is(sone.getTime()));
-               assertThat(simpleFieldSet.getInt(prefix + "Field.Count"), is(sone.getProfile().getFields().size()));
-               int fieldIndex = 0;
-               for (Field field : sone.getProfile().getFields()) {
-                       assertThat(simpleFieldSet.get(prefix + "Field." + fieldIndex + ".Name"), is(field.getName()));
-                       assertThat(simpleFieldSet.get(prefix + "Field." + fieldIndex + ".Value"), is(field.getValue()));
-                       fieldIndex++;
-               }
-       }
-
-       static void verifySones(SimpleFieldSet simpleFieldSet, String prefix, List<Sone> sones) throws FSParseException {
-               assertThat(simpleFieldSet.getInt(prefix + "Count"), is(sones.size()));
-               int soneIndex = 0;
-               for (Sone sone : sones) {
-                       assertThat(simpleFieldSet.get(prefix + soneIndex + ".ID"), is(sone.getId()));
-                       assertThat(simpleFieldSet.get(prefix + soneIndex + ".Name"), is(sone.getName()));
-                       assertThat(simpleFieldSet.get(prefix + soneIndex + ".NiceName"), is(getNiceName(sone)));
-                       assertThat(simpleFieldSet.getLong(prefix + soneIndex + ".Time"), is(sone.getTime()));
-                       soneIndex++;
-               }
-       }
-
-}
index bdfd31e..123b296 100644 (file)
@@ -17,7 +17,7 @@
 
 package net.pterodactylus.sone.fcp;
 
 
 package net.pterodactylus.sone.fcp;
 
-import static net.pterodactylus.sone.fcp.Verifiers.verifyAnswer;
+import static net.pterodactylus.sone.Verifiers.verifyAnswer;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 import static net.pterodactylus.sone.main.SonePlugin.VERSION;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.DIRECT;
 import static net.pterodactylus.sone.main.SonePlugin.VERSION;
 import static org.hamcrest.MatcherAssert.assertThat;