Move verifiers to different package.

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

diff --git a/src/test/java/net/pterodactylus/sone/fcp/UnlockSoneCommandTest.java b/src/test/java/net/pterodactylus/sone/fcp/UnlockSoneCommandTest.java
index 05fc73c..adb6b96 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/fcp/UnlockSoneCommandTest.java
+++ b/src/test/java/net/pterodactylus/sone/fcp/UnlockSoneCommandTest.java
@@ -17,10 +17,10 @@
 
 package net.pterodactylus.sone.fcp;
 
+import static com.google.common.base.Optional.of;
+import static net.pterodactylus.sone.Verifiers.verifyAnswer;
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -47,18 +47,17 @@ public class UnlockSoneCommandTest {
        public void testUnlockingALocalSone() throws FcpException {
                Sone localSone = mock(Sone.class);
                when(localSone.getId()).thenReturn("LocalSone");
+               when(localSone.isLocal()).thenReturn(true);
                Core core = mock(Core.class);
-               when(core.getSone(eq("LocalSone"), anyBoolean())).thenReturn(localSone);
-               when(core.getLocalSone(eq("LocalSone"), anyBoolean())).thenReturn(localSone);
+               when(core.getSone(eq("LocalSone"))).thenReturn(of(localSone));
+               when(core.getLocalSone(eq("LocalSone"))).thenReturn(of(localSone));
                SimpleFieldSet fields = new SimpleFieldSetBuilder().put("Sone", "LocalSone").get();
 
                UnlockSoneCommand unlockSoneCommand = new UnlockSoneCommand(core);
                Response response = unlockSoneCommand.execute(fields, null, null);
 
                verify(core).unlockSone(eq(localSone));
-               assertThat(response, notNullValue());
-               assertThat(response.getReplyParameters(), notNullValue());
-               assertThat(response.getReplyParameters().get("Message"), is("SoneUnlocked"));
+               verifyAnswer(response, "SoneUnlocked");
                assertThat(response.getReplyParameters().get("Sone"), is("LocalSone"));
        }
 
@@ -66,7 +65,7 @@ public class UnlockSoneCommandTest {
        public void testUnlockingARemoteSone() throws FcpException {
                Sone removeSone = mock(Sone.class);
                Core core = mock(Core.class);
-               when(core.getSone(eq("RemoteSone"), anyBoolean())).thenReturn(removeSone);
+               when(core.getSone(eq("RemoteSone"))).thenReturn(of(removeSone));
                SimpleFieldSet fields = new SimpleFieldSetBuilder().put("Sone", "RemoteSone").get();
 
                UnlockSoneCommand unlockSoneCommand = new UnlockSoneCommand(core);