X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetLocalSonesCommandTest.java;h=85b1bb79ccae323896b0fd19206cc10f30317012;hb=953c41bc82b474680d84266fd7227ce08480883c;hp=002ca9b8f0568b95cdabe8e7aa6477250e64c144;hpb=470e70e97b902548002e579d7fff4a851960c8ed;p=Sone.git diff --git a/src/test/java/net/pterodactylus/sone/fcp/GetLocalSonesCommandTest.java b/src/test/java/net/pterodactylus/sone/fcp/GetLocalSonesCommandTest.java index 002ca9b..85b1bb7 100644 --- 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.fcp.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 localSones = asList(mocks.mockLocalSone("LSone1"), mocks.mockLocalSone("LSone2"), mocks.mockLocalSone("LSone3")); - mocks.mockRemoteSone("RSone1"); - mocks.mockRemoteSone("RSone2"); + Collection 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 parsedSones = parseSones(response.getReplyParameters(), "LocalSones."); assertThat(parsedSones, matchesSones(localSones)); }