X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FDeleteReplyCommandTest.java;h=873d1da01be58ffb9e5836803646086e9b8b279e;hb=2d37242d19f2e726cd402b99f935a0eba282f630;hp=4ab8cdf3dc5eaa1657a5e46924daaa6f47e54a0e;hpb=7ddc0f201f6ce4d7479bb0b18804c6f31c6832fe;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.java b/src/test/java/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.java
index 4ab8cdf..873d1da 100644
--- a/src/test/java/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.java
+++ b/src/test/java/net/pterodactylus/sone/fcp/DeleteReplyCommandTest.java
@@ -17,22 +17,16 @@
 
 package net.pterodactylus.sone.fcp;
 
-import static net.pterodactylus.sone.data.Mocks.mockCore;
-import static net.pterodactylus.sone.data.Mocks.mockDatabase;
-import static net.pterodactylus.sone.data.Mocks.mockLocalSone;
-import static net.pterodactylus.sone.data.Mocks.mockPostReply;
-import static net.pterodactylus.sone.data.Mocks.mockRemoteSone;
+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 static org.mockito.ArgumentCaptor.forClass;
 import static org.mockito.Mockito.doNothing;
 
-import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.data.Mocks;
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.database.Database;
 import net.pterodactylus.sone.freenet.SimpleFieldSetBuilder;
 import net.pterodactylus.sone.freenet.fcp.Command.Response;
 import net.pterodactylus.sone.freenet.fcp.FcpException;
@@ -49,25 +43,22 @@ import org.mockito.ArgumentCaptor;
  */
 public class DeleteReplyCommandTest {
 
-	private final Database database = mockDatabase();
-	private final Core core = mockCore(database);
-	private final DeleteReplyCommand deleteReplyCommand = new DeleteReplyCommand(core);
+	private final Mocks mocks = new Mocks();
+	private final DeleteReplyCommand deleteReplyCommand = new DeleteReplyCommand(mocks.core);
 
 	@Test
 	public void verifyThatDeletingAReplyWorks() throws FcpException {
-		Sone sone = mockLocalSone(core, "SoneId");
-		PostReply postReply = mockPostReply(core, sone, "ReplyId");
+		Sone sone = mocks.mockSone("SoneId").local().create();
+		PostReply postReply = mocks.mockPostReply(sone, "ReplyId").create();
 		ArgumentCaptor<PostReply> postReplyCaptor = forClass(PostReply.class);
-		doNothing().when(core).deleteReply(postReplyCaptor.capture());
+		doNothing().when(mocks.core).deleteReply(postReplyCaptor.capture());
 		SimpleFieldSet deleteReplyFieldSet = new SimpleFieldSetBuilder()
 				.put("Message", "DeleteReply")
 				.put("Reply", "ReplyId")
 				.get();
 		Response response = deleteReplyCommand.execute(deleteReplyFieldSet, null, DIRECT);
-		assertThat(response, notNullValue());
+		verifyAnswer(response, "ReplyDeleted");
 		assertThat(postReplyCaptor.getValue(), is(postReply));
-		assertThat(response.getReplyParameters(), notNullValue());
-		assertThat(response.getReplyParameters().get("Message"), is("ReplyDeleted"));
 	}
 
 	@Test(expected = FcpException.class)
@@ -89,16 +80,14 @@ public class DeleteReplyCommandTest {
 
 	@Test
 	public void verifyThatDeletingAReplyFromANonLocalSoneCausesAnError() throws FcpException {
-		Sone sone = mockRemoteSone(core, "SoneId");
-		mockPostReply(core, sone, "ReplyId");
+		Sone sone = mocks.mockSone("SoneId").create();
+		mocks.mockPostReply(sone, "ReplyId").create();
 		SimpleFieldSet deleteReplyFieldSet = new SimpleFieldSetBuilder()
 				.put("Message", "DeleteReply")
 				.put("Reply", "ReplyId")
 				.get();
 		Response response = deleteReplyCommand.execute(deleteReplyFieldSet, null, DIRECT);
-		assertThat(response, notNullValue());
-		assertThat(response.getReplyParameters(), notNullValue());
-		assertThat(response.getReplyParameters().get("Message"), is("Error"));
+		verifyAnswer(response, "Error");
 		assertThat(response.getReplyParameters().get("ErrorCode"), is("401"));
 	}