X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FDeletePostCommandTest.java;h=683864c20968e692d7e58d9ab151b8f6a7705790;hp=1d282ca9b799eaf52877df7e7928192390788f69;hb=2d37242d19f2e726cd402b99f935a0eba282f630;hpb=1f639c3725a4b9c54d43b549dd693fcde0a125c8

diff --git a/src/test/java/net/pterodactylus/sone/fcp/DeletePostCommandTest.java b/src/test/java/net/pterodactylus/sone/fcp/DeletePostCommandTest.java
index 1d282ca..683864c 100644
--- a/src/test/java/net/pterodactylus/sone/fcp/DeletePostCommandTest.java
+++ b/src/test/java/net/pterodactylus/sone/fcp/DeletePostCommandTest.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.mockPost;
-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.Post;
 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,39 +43,34 @@ import org.mockito.ArgumentCaptor;
  */
 public class DeletePostCommandTest {
 
-	private final Database database = mockDatabase();
-	private final Core core = mockCore(database);
-	private final DeletePostCommand deletePostCommand = new DeletePostCommand(core);
+	private final Mocks mocks = new Mocks();
+	private final DeletePostCommand deletePostCommand = new DeletePostCommand(mocks.core);
 
 	@Test
 	public void verifyThatDeletingAPostWorks() throws FcpException {
-		Sone sone = mockLocalSone(core, "Sone");
-		Post post = mockPost(core, sone, "PostId");
+		Sone sone = mocks.mockSone("Sone").local().create();
+		Post post = mocks.mockPost(sone, "PostId").create();
 		ArgumentCaptor<Post> deletedPost = forClass(Post.class);
-		doNothing().when(core).deletePost(deletedPost.capture());
+		doNothing().when(mocks.core).deletePost(deletedPost.capture());
 		SimpleFieldSet deletePostFieldSet = new SimpleFieldSetBuilder()
 				.put("Message", "DeletePost")
 				.put("Post", "PostId")
 				.get();
 		Response response = deletePostCommand.execute(deletePostFieldSet, null, DIRECT);
-		assertThat(response, notNullValue());
-		assertThat(response.getReplyParameters(), notNullValue());
-		assertThat(response.getReplyParameters().get("Message"), is("PostDeleted"));
+		verifyAnswer(response, "PostDeleted");
 		assertThat(deletedPost.getValue(), is(post));
 	}
 
 	@Test
 	public void verifyThatDeletingAPostFromANonLocalSoneCausesAnError() throws FcpException {
-		Sone sone = mockRemoteSone(core, "Sone");
-		Post post = mockPost(core, sone, "PostId");
+		Sone sone = mocks.mockSone("Sone").create();
+		Post post = mocks.mockPost(sone, "PostId").create();
 		SimpleFieldSet deletePostFieldSet = new SimpleFieldSetBuilder()
 				.put("Message", "DeletePost")
 				.put("Post", "PostId")
 				.get();
 		Response response = deletePostCommand.execute(deletePostFieldSet, 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"));
 	}
 
@@ -95,8 +84,6 @@ public class DeletePostCommandTest {
 
 	@Test(expected = FcpException.class)
 	public void verifyThatDeletingAPostWithAnInvalidPostIdCausesAnError() throws FcpException {
-		Sone sone = mockLocalSone(core, "Sone");
-		mockPost(core, sone, "PostId");
 		SimpleFieldSet deletePostFieldSet = new SimpleFieldSetBuilder()
 				.put("Message", "DeletePost")
 				.put("Post", "OtherPostId")