Move verifiers to different package.

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

diff --git a/src/test/java/net/pterodactylus/sone/fcp/AbstractSoneCommandTest.java b/src/test/java/net/pterodactylus/sone/fcp/AbstractSoneCommandTest.java
index dab94a4..59287e1 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/fcp/AbstractSoneCommandTest.java
+++ b/src/test/java/net/pterodactylus/sone/fcp/AbstractSoneCommandTest.java
@@ -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 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;
@@ -270,10 +270,12 @@ public class AbstractSoneCommandTest {
                assertThat(parsedSone.isPresent(), is(false));
        }
 
-       @Test(expected = FcpException.class)
-       public void testParsingAnOptionalSoneFromANonExistingFieldCausesAnError() throws FcpException {
+       @Test
+       public void testParsingAnOptionalSoneFromANonExistingField() throws FcpException {
                SimpleFieldSet soneFieldSet = new SimpleFieldSetBuilder().put("Sone", "jXH8d-eFdm14R69WyaCgQoSjaY0jl-Ut6etlXjK0e6E").get();
-               abstractSoneCommand.getOptionalSone(soneFieldSet, "RealSone");
+               Optional<Sone> sone = abstractSoneCommand.getOptionalSone(soneFieldSet, "RealSone");
+               assertThat(sone, notNullValue());
+               assertThat(sone.isPresent(), is(false));
        }
 
        @Test