X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabaseTest.java;h=c00f25ad987efbe56817c9da9ce6c6db9c2bafcf;hb=6b65a32a69b0e3721c58b4501a6b58fa4989f162;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..c00f25a 100644
--- a/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
+++ b/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
@@ -268,7 +268,7 @@ public class MemoryDatabaseTest {
 
 	@Test
 	public void testBasicAlbumFunctionality() {
-		Album newAlbum = new AlbumImpl(mock(Sone.class));
+		Album newAlbum = new AlbumImpl(when(mock(Sone.class).getId()).thenReturn(SONE_ID).<Sone>getMock());
 		assertThat(memoryDatabase.getAlbum(newAlbum.getId()), is(Optional.<Album>absent()));
 		memoryDatabase.storeAlbum(newAlbum);
 		assertThat(memoryDatabase.getAlbum(newAlbum.getId()), is(of(newAlbum)));
@@ -363,7 +363,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 +380,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());
 	}
 
 }