X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabaseTest.java;h=6e66b18f98de62fb5f1e75f279bf4f96b988329d;hb=3b711e4ff7898c71778dd3a8695ee3e0e3542861;hp=352b3b280818d1b3b492d289e6a7d13f621e9cf9;hpb=eb32457356fac09e16ec98394c1b5d48f9dfba84;p=Sone.git

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 352b3b2..6e66b18 100644
--- a/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
+++ b/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
@@ -30,6 +30,7 @@ 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.hamcrest.Matchers.nullValue;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -183,14 +184,13 @@ public class MemoryDatabaseTest {
 		assertThat(memoryDatabase.getPost("post2").get(),
 				isPost(secondPost.getId(), 2000L, "post2", of(RECIPIENT_ID)));
 		assertThat(memoryDatabase.getPost("post3").isPresent(), is(false));
-		assertThat(memoryDatabase.getPostReply("reply1").get(),
+		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.getPostReply("reply4"), nullValue());
 		assertThat(memoryDatabase.getAlbum("album1").get(),
 				isAlbum("album1", null, "album1", "album-description1"));
 		assertThat(memoryDatabase.getAlbum("album2").get(),
@@ -198,16 +198,16 @@ public class MemoryDatabaseTest {
 		assertThat(memoryDatabase.getAlbum("album3").get(),
 				isAlbum("album3", "album1", "album3", "album-description3"));
 		assertThat(memoryDatabase.getAlbum("album4").isPresent(), is(false));
-		assertThat(memoryDatabase.getImage("image1").get(),
+		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