projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1a3f2a0
)
Load friends before modifying them.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 25 Nov 2014 20:48:55 +0000
(21:48 +0100)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 25 Nov 2014 20:48:55 +0000
(21:48 +0100)
src/main/java/net/pterodactylus/sone/database/memory/MemoryFriendDatabase.java
patch
|
blob
|
history
src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/database/memory/MemoryFriendDatabase.java
b/src/main/java/net/pterodactylus/sone/database/memory/MemoryFriendDatabase.java
index
1802843
..
0be8738
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/database/memory/MemoryFriendDatabase.java
+++ b/
src/main/java/net/pterodactylus/sone/database/memory/MemoryFriendDatabase.java
@@
-43,6
+43,7
@@
class MemoryFriendDatabase {
}
void addFriend(String localSoneId, String friendSoneId) {
}
void addFriend(String localSoneId, String friendSoneId) {
+ loadFriends(localSoneId);
lock.writeLock().lock();
try {
if (soneFriends.put(localSoneId, friendSoneId)) {
lock.writeLock().lock();
try {
if (soneFriends.put(localSoneId, friendSoneId)) {
@@
-54,6
+55,7
@@
class MemoryFriendDatabase {
}
void removeFriend(String localSoneId, String friendSoneId) {
}
void removeFriend(String localSoneId, String friendSoneId) {
+ loadFriends(localSoneId);
lock.writeLock().lock();
try {
if (soneFriends.remove(localSoneId, friendSoneId)) {
lock.writeLock().lock();
try {
if (soneFriends.remove(localSoneId, friendSoneId)) {
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
..
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
@@
-363,7
+363,7
@@
public class MemoryDatabaseTest {
when(sone.isLocal()).thenReturn(true);
memoryDatabase.addFriend(sone, "Friend1");
memoryDatabase.addFriend(sone, "Friend1");
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
}
@Test
@@
-380,9
+380,10
@@
public class MemoryDatabaseTest {
@Test
public void configurationIsNotWrittenWhenANonFriendIsRemoved() {
@Test
public void configurationIsNotWrittenWhenANonFriendIsRemoved() {
+ prepareConfigurationValues();
when(sone.isLocal()).thenReturn(true);
memoryDatabase.removeFriend(sone, "Friend1");
when(sone.isLocal()).thenReturn(true);
memoryDatabase.removeFriend(sone, "Friend1");
- verify(configuration
, never()
).getStringValue(anyString());
+ verify(configuration).getStringValue(anyString());
}
}
}
}