Move verifiers to different package.

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

diff --git a/src/test/java/net/pterodactylus/sone/fcp/GetLocalSonesCommandTest.java b/src/test/java/net/pterodactylus/sone/fcp/GetLocalSonesCommandTest.java
index 002ca9b..65497d9 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/fcp/GetLocalSonesCommandTest.java
+++ b/src/test/java/net/pterodactylus/sone/fcp/GetLocalSonesCommandTest.java
@@ -19,10 +19,9 @@ package net.pterodactylus.sone.fcp;
 
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
+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 java.util.Collection;
 import java.util.List;
@@ -53,14 +52,16 @@ public class GetLocalSonesCommandTest {
 
        @Test
        public void verifyThatOnlyLocalSonesAreReturned() throws FSParseException {
-               Collection<Sone> localSones = asList(mocks.mockLocalSone("LSone1"), mocks.mockLocalSone("LSone2"), mocks.mockLocalSone("LSone3"));
-               mocks.mockRemoteSone("RSone1");
-               mocks.mockRemoteSone("RSone2");
+               Collection<Sone> localSones = asList(
+                               mocks.mockSone("LSone1").local().create(),
+                               mocks.mockSone("LSone2").local().create(),
+                               mocks.mockSone("LSone3").local().create()
+               );
+               mocks.mockSone("RSone1").create();
+               mocks.mockSone("RSone2").create();
                SimpleFieldSet getLocalSonesFieldSet = new SimpleFieldSetBuilder().put("Message", "GetLocalSones").get();
                Response response = getLocalSonesCommand.execute(getLocalSonesFieldSet, null, DIRECT);
-               assertThat(response, notNullValue());
-               assertThat(response.getReplyParameters(), notNullValue());
-               assertThat(response.getReplyParameters().get("Message"), is("ListLocalSones"));
+               verifyAnswer(response, "ListLocalSones");
                Collection<ParsedSone> parsedSones = parseSones(response.getReplyParameters(), "LocalSones.");
                assertThat(parsedSones, matchesSones(localSones));
        }