Merge branch 'release/0.9-rc1'

[Sone.git] / src / test / java / net / pterodactylus / sone / database / memory / MemoryDatabaseTest.java

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 f7b07a2..cc5babb 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
+++ b/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
@@ -278,11 +278,11 @@ public class MemoryDatabaseTest {
 
        private void initializeFriends() {
                when(configuration.getStringValue("Sone/" + SONE_ID + "/Friends/0/ID")).thenReturn(
-                               new TestValue<String>("Friend1"));
+                               TestValue.from("Friend1"));
                when(configuration.getStringValue("Sone/" + SONE_ID + "/Friends/1/ID")).thenReturn(
-                               new TestValue<String>("Friend2"));
+                               TestValue.from("Friend2"));
                when(configuration.getStringValue("Sone/" + SONE_ID + "/Friends/2/ID")).thenReturn(
-                               new TestValue<String>(null));
+                               TestValue.<String>from(null));
        }
 
        @Test
@@ -332,7 +332,7 @@ public class MemoryDatabaseTest {
                when(configuration.getStringValue(anyString())).thenAnswer(new Answer<Value<String>>() {
                        @Override
                        public Value<String> answer(InvocationOnMock invocation) throws Throwable {
-                               Value<String> stringValue = new TestValue(null);
+                               Value<String> stringValue = TestValue.from(null);
                                configurationValues.put((String) invocation.getArguments()[0], stringValue);
                                return stringValue;
                        }
@@ -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());
        }
 
 }