X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabaseTest.java;h=4d884298b40526b6d76ef2bd1db9f34cb3e69689;hp=a20713206f351686f00b4e22d5b96e880f602654;hb=a6ced7a625540c5ac78568281d56afc4deb65d39;hpb=c4ae226ec5052116cefc542ae2017036a7bc6332

diff --git a/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java b/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
index a207132..4d88429 100644
--- a/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
+++ b/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
@@ -20,17 +20,18 @@ package net.pterodactylus.sone.database.memory;
 import static com.google.common.base.Optional.of;
 import static java.util.Arrays.asList;
 import static java.util.UUID.randomUUID;
-import static net.pterodactylus.sone.Matchers.isAlbum;
-import static net.pterodactylus.sone.Matchers.isImage;
-import static net.pterodactylus.sone.Matchers.isPost;
-import static net.pterodactylus.sone.Matchers.isPostReply;
+import static net.pterodactylus.sone.test.Matchers.isAlbum;
+import static net.pterodactylus.sone.test.Matchers.isImage;
+import static net.pterodactylus.sone.test.Matchers.isPost;
+import static net.pterodactylus.sone.test.Matchers.isPostReply;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.emptyIterable;
-import static org.mockito.Matchers.anyString;
+import static org.hamcrest.Matchers.nullValue;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -44,17 +45,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import net.pterodactylus.sone.TestAlbumBuilder;
-import net.pterodactylus.sone.TestImageBuilder;
-import net.pterodactylus.sone.TestPostBuilder;
-import net.pterodactylus.sone.TestPostReplyBuilder;
-import net.pterodactylus.sone.TestValue;
 import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.impl.AlbumImpl;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.impl.AlbumImpl;
+import net.pterodactylus.sone.test.TestAlbumBuilder;
+import net.pterodactylus.sone.test.TestImageBuilder;
+import net.pterodactylus.sone.test.TestPostBuilder;
+import net.pterodactylus.sone.test.TestPostReplyBuilder;
+import net.pterodactylus.sone.test.TestValue;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.Value;
 
@@ -74,7 +75,7 @@ public class MemoryDatabaseTest {
 	private static final String SONE_ID = "sone";
 	private static final String RECIPIENT_ID = "recipient";
 	private final Configuration configuration = mock(Configuration.class);
-	private final MemoryDatabase memoryDatabase = new MemoryDatabase(null, configuration);
+	private final MemoryDatabase memoryDatabase = new MemoryDatabase(configuration);
 	private final Sone sone = mock(Sone.class);
 
 	@Before
@@ -177,37 +178,36 @@ public class MemoryDatabaseTest {
 		firstAlbum.addImage(thirdImage);
 		secondAlbum.addImage(secondImage);
 		memoryDatabase.storeSone(sone);
-		assertThat(memoryDatabase.getPost("post1").get(),
+		assertThat(memoryDatabase.getPost("post1"),
 				isPost(firstPost.getId(), 1000L, "post1",
 						Optional.<String>absent()));
-		assertThat(memoryDatabase.getPost("post2").get(),
+		assertThat(memoryDatabase.getPost("post2"),
 				isPost(secondPost.getId(), 2000L, "post2", of(RECIPIENT_ID)));
-		assertThat(memoryDatabase.getPost("post3").isPresent(), is(false));
-		assertThat(memoryDatabase.getPostReply("reply1").get(),
+		assertThat(memoryDatabase.getPost("post3"), nullValue());
+		assertThat(memoryDatabase.getPostReply("reply1"),
 				isPostReply("reply1", "post1", 3000L, "reply1"));
-		assertThat(memoryDatabase.getPostReply("reply2").get(),
+		assertThat(memoryDatabase.getPostReply("reply2"),
 				isPostReply("reply2", "post2", 4000L, "reply2"));
-		assertThat(memoryDatabase.getPostReply("reply3").get(),
+		assertThat(memoryDatabase.getPostReply("reply3"),
 				isPostReply("reply3", "post1", 5000L, "reply3"));
-		assertThat(memoryDatabase.getPostReply("reply4").isPresent(),
-				is(false));
-		assertThat(memoryDatabase.getAlbum("album1").get(),
+		assertThat(memoryDatabase.getPostReply("reply4"), nullValue());
+		assertThat(memoryDatabase.getAlbum("album1"),
 				isAlbum("album1", null, "album1", "album-description1"));
-		assertThat(memoryDatabase.getAlbum("album2").get(),
+		assertThat(memoryDatabase.getAlbum("album2"),
 				isAlbum("album2", null, "album2", "album-description2"));
-		assertThat(memoryDatabase.getAlbum("album3").get(),
+		assertThat(memoryDatabase.getAlbum("album3"),
 				isAlbum("album3", "album1", "album3", "album-description3"));
-		assertThat(memoryDatabase.getAlbum("album4").isPresent(), is(false));
-		assertThat(memoryDatabase.getImage("image1").get(),
+		assertThat(memoryDatabase.getAlbum("album4"), nullValue());
+		assertThat(memoryDatabase.getImage("image1"),
 				isImage("image1", 1000L, "KSK@image1", "image1",
 						"image-description1", 16, 9));
-		assertThat(memoryDatabase.getImage("image2").get(),
+		assertThat(memoryDatabase.getImage("image2"),
 				isImage("image2", 2000L, "KSK@image2", "image2",
 						"image-description2", 32, 18));
-		assertThat(memoryDatabase.getImage("image3").get(),
+		assertThat(memoryDatabase.getImage("image3"),
 				isImage("image3", 3000L, "KSK@image3", "image3",
 						"image-description3", 48, 27));
-		assertThat(memoryDatabase.getImage("image4").isPresent(), is(false));
+		assertThat(memoryDatabase.getImage("image4"), nullValue());
 	}
 
 	@Test
@@ -266,11 +266,11 @@ public class MemoryDatabaseTest {
 	@Test
 	public void testBasicAlbumFunctionality() {
 		Album newAlbum = new AlbumImpl(mock(Sone.class));
-		assertThat(memoryDatabase.getAlbum(newAlbum.getId()), is(Optional.<Album>absent()));
+		assertThat(memoryDatabase.getAlbum(newAlbum.getId()), nullValue());
 		memoryDatabase.storeAlbum(newAlbum);
-		assertThat(memoryDatabase.getAlbum(newAlbum.getId()), is(of(newAlbum)));
+		assertThat(memoryDatabase.getAlbum(newAlbum.getId()), is(newAlbum));
 		memoryDatabase.removeAlbum(newAlbum);
-		assertThat(memoryDatabase.getAlbum(newAlbum.getId()), is(Optional.<Album>absent()));
+		assertThat(memoryDatabase.getAlbum(newAlbum.getId()), nullValue());
 	}
 
 	private void initializeFriends() {