X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabaseTest.java;h=d4c0954b2f7636a76f313a963e4a9d21d4fb71a8;hb=e666a5187afee8bdb40b5e4c82a0cdddbe713719;hp=6e66b18f98de62fb5f1e75f279bf4f96b988329d;hpb=4e8279b445fb3087582fe715a30df2a7633b63b4;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 6e66b18..d4c0954 100644
--- a/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
+++ b/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
@@ -191,13 +191,13 @@ public class MemoryDatabaseTest {
 		assertThat(memoryDatabase.getPostReply("reply3"),
 				isPostReply("reply3", "post1", 5000L, "reply3"));
 		assertThat(memoryDatabase.getPostReply("reply4"), nullValue());
-		assertThat(memoryDatabase.getAlbum("album1").get(),
+		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.getAlbum("album4"), nullValue());
 		assertThat(memoryDatabase.getImage("image1"),
 				isImage("image1", 1000L, "KSK@image1", "image1",
 						"image-description1", 16, 9));
@@ -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() {