X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabaseTest.java;h=d305031dce0532bff7498713566b65658c554d06;hb=d338aacec01efa636f96c5f8aab11b2345147691;hp=ac23a81a2038e587d238333ba5947a9fb64202e9;hpb=1a3f2a00bb5180470db1515e646615dff2744e39;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 ac23a81..d305031 100644
--- a/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
+++ b/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Sone - MemoryDatabaseTest.java - Copyright © 2013 David Roden
+ * Sone - MemoryDatabaseTest.java - Copyright © 2013–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +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.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -131,7 +131,7 @@ public class MemoryDatabaseTest {
 				.update();
 		Album secondAlbum = new TestAlbumBuilder().withId("album2").by(
 				sone).build().modify().setTitle("album2").setDescription(
-				"album-description2").setAlbumImage("image1").update();
+				"album-description2").update();
 		Album thirdAlbum = new TestAlbumBuilder().withId("album3").by(
 				sone).build().modify().setTitle("album3").setDescription(
 				"album-description3").update();
@@ -192,14 +192,11 @@ public class MemoryDatabaseTest {
 		assertThat(memoryDatabase.getPostReply("reply4").isPresent(),
 				is(false));
 		assertThat(memoryDatabase.getAlbum("album1").get(),
-				isAlbum("album1", null, "album1", "album-description1",
-						null));
+				isAlbum("album1", null, "album1", "album-description1"));
 		assertThat(memoryDatabase.getAlbum("album2").get(),
-				isAlbum("album2", null, "album2", "album-description2",
-						"image1"));
+				isAlbum("album2", null, "album2", "album-description2"));
 		assertThat(memoryDatabase.getAlbum("album3").get(),
-				isAlbum("album3", "album1", "album3", "album-description3",
-						null));
+				isAlbum("album3", "album1", "album3", "album-description3"));
 		assertThat(memoryDatabase.getAlbum("album4").isPresent(), is(false));
 		assertThat(memoryDatabase.getImage("image1").get(),
 				isImage("image1", 1000L, "KSK@image1", "image1",
@@ -363,7 +360,7 @@ public class MemoryDatabaseTest {
 		when(sone.isLocal()).thenReturn(true);
 		memoryDatabase.addFriend(sone, "Friend1");
 		memoryDatabase.addFriend(sone, "Friend1");
-		verify(configuration, times(2)).getStringValue(anyString());
+		verify(configuration, times(3)).getStringValue(anyString());
 	}
 
 	@Test
@@ -380,9 +377,10 @@ public class MemoryDatabaseTest {
 
 	@Test
 	public void configurationIsNotWrittenWhenANonFriendIsRemoved() {
+		prepareConfigurationValues();
 		when(sone.isLocal()).thenReturn(true);
 		memoryDatabase.removeFriend(sone, "Friend1");
-		verify(configuration, never()).getStringValue(anyString());
+		verify(configuration).getStringValue(anyString());
 	}
 
 }