X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FCreateReplyCommandTest.java;h=bef609ab2d44d79bccb0d569767ce1f3b606c83a;hb=2d37242d19f2e726cd402b99f935a0eba282f630;hp=70f9996ad6b47015caa69e6e62283d4bf6c0cf64;hpb=844bd06ee895aa3a050192b5063b1efe1a85f80b;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/fcp/CreateReplyCommandTest.java b/src/test/java/net/pterodactylus/sone/fcp/CreateReplyCommandTest.java
index 70f9996..bef609a 100644
--- a/src/test/java/net/pterodactylus/sone/fcp/CreateReplyCommandTest.java
+++ b/src/test/java/net/pterodactylus/sone/fcp/CreateReplyCommandTest.java
@@ -18,6 +18,7 @@
 package net.pterodactylus.sone.fcp;
 
 import static java.lang.System.currentTimeMillis;
+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;
@@ -53,8 +54,8 @@ public class CreateReplyCommandTest {
 
 	@Test
 	public void verifyThatCreatingAFullySpecifiedReplyWorks() throws FcpException {
-		Sone sone = mocks.mockLocalSone("SoneId");
-		mocks.mockPost(sone, "PostId");
+		Sone sone = mocks.mockSone("SoneId").local().create();
+		mocks.mockPost(sone, "PostId").create();
 		CapturingPostReplyCreated capturingPostReplyCreated = new CapturingPostReplyCreated();
 		when(mocks.core.postReplyCreated()).thenReturn(Optional.<PostReplyCreated>of(capturingPostReplyCreated));
 		SimpleFieldSet createReplyFieldSet = new SimpleFieldSetBuilder()
@@ -64,22 +65,20 @@ public class CreateReplyCommandTest {
 				.put("Text", "Text of the reply.")
 				.get();
 		Response response = createReplyCommand.execute(createReplyFieldSet, null, DIRECT);
-		assertThat(response, notNullValue());
+		verifyAnswer(response, "ReplyCreated");
 		assertThat(capturingPostReplyCreated.postReply, notNullValue());
 		assertThat(capturingPostReplyCreated.postReply.getId(), notNullValue());
 		assertThat(capturingPostReplyCreated.postReply.getPostId(), is("PostId"));
 		assertThat(capturingPostReplyCreated.postReply.getSone(), is(sone));
 		assertThat(capturingPostReplyCreated.postReply.getTime(), allOf(greaterThanOrEqualTo(now), lessThanOrEqualTo(currentTimeMillis())));
 		assertThat(capturingPostReplyCreated.postReply.getText(), is("Text of the reply."));
-		assertThat(response.getReplyParameters(), notNullValue());
-		assertThat(response.getReplyParameters().get("Message"), is("ReplyCreated"));
 		assertThat(response.getReplyParameters().get("Reply"), is(capturingPostReplyCreated.postReply.getId()));
 	}
 
 	@Test(expected = FcpException.class)
 	public void verifyThatCreatingAReplyWithoutSoneCausesAnError() throws FcpException {
-		Sone sone = mocks.mockLocalSone("SoneId");
-		mocks.mockPost(sone, "PostId");
+		Sone sone = mocks.mockSone("SoneId").local().create();
+		mocks.mockPost(sone, "PostId").create();
 		CapturingPostReplyCreated capturingPostReplyCreated = new CapturingPostReplyCreated();
 		when(mocks.core.postReplyCreated()).thenReturn(Optional.<PostReplyCreated>of(capturingPostReplyCreated));
 		SimpleFieldSet createReplyFieldSet = new SimpleFieldSetBuilder()
@@ -92,7 +91,7 @@ public class CreateReplyCommandTest {
 
 	@Test(expected = FcpException.class)
 	public void verifyThatCreatingAReplyWithoutPostCausesAnError() throws FcpException {
-		mocks.mockLocalSone("SoneId");
+		mocks.mockSone("SoneId").local().create();
 		CapturingPostReplyCreated capturingPostReplyCreated = new CapturingPostReplyCreated();
 		when(mocks.core.postReplyCreated()).thenReturn(Optional.<PostReplyCreated>of(capturingPostReplyCreated));
 		SimpleFieldSet createReplyFieldSet = new SimpleFieldSetBuilder()
@@ -105,8 +104,8 @@ public class CreateReplyCommandTest {
 
 	@Test(expected = FcpException.class)
 	public void verifyThatCreatingAReplyWithoutTextCausesAnError() throws FcpException {
-		Sone sone = mocks.mockLocalSone("SoneId");
-		mocks.mockPost(sone, "PostId");
+		Sone sone = mocks.mockSone("SoneId").local().create();
+		mocks.mockPost(sone, "PostId").create();
 		CapturingPostReplyCreated capturingPostReplyCreated = new CapturingPostReplyCreated();
 		when(mocks.core.postReplyCreated()).thenReturn(Optional.<PostReplyCreated>of(capturingPostReplyCreated));
 		SimpleFieldSet createReplyFieldSet = new SimpleFieldSetBuilder()