summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Clayton <alex.clayton@isode.com>2016-02-03 17:01:38 (GMT)
committerAlex Clayton <alex.clayton@isode.com>2016-02-08 10:31:38 (GMT)
commit16f76289d203069036a2fb2da1b559f0e888728b (patch)
tree5ab9921ea402fe19a65862a11ed615b072be7316 /src
parente4d2feeebc40c00ec37847a71faa6da62819f9ff (diff)
downloadstroke-16f76289d203069036a2fb2da1b559f0e888728b.zip
stroke-16f76289d203069036a2fb2da1b559f0e888728b.tar.bz2
Add CombinedAvatarProviderTest
Adds the CombinedAvatarProviderTest class. When I was adding the test I noticed that testProviderUpdateWithAvatarDisappearingTriggersChange kept failing due to a bug in the CombinedAvatarProvider class and testRemoveProviderDisconnectsUpdates could not be implemented as the class was incomplete. I had to make some changes to CombinedAvatarProvider to fix these issues. Test-information: Ran unit tests they all pass. Change-Id: I0bfb68dd2b15df0f220f36c136aceadaf6545893
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/isode/stroke/avatars/CombinedAvatarProvider.java129
1 files changed, 78 insertions, 51 deletions
diff --git a/src/com/isode/stroke/avatars/CombinedAvatarProvider.java b/src/com/isode/stroke/avatars/CombinedAvatarProvider.java
index 5520736..b7639b3 100755
--- a/src/com/isode/stroke/avatars/CombinedAvatarProvider.java
+++ b/src/com/isode/stroke/avatars/CombinedAvatarProvider.java
@@ -21,60 +21,87 @@ import java.util.*;
public class CombinedAvatarProvider extends AvatarProvider {
- private final Vector<AvatarProvider> providers = new Vector<AvatarProvider>();
- private Map<JID, String> avatars = new HashMap<JID, String>();
- private final Map<AvatarProvider, SignalConnection> onAvatarChangedConnections_ = new HashMap<AvatarProvider, SignalConnection>();
- private Logger logger_ = Logger.getLogger(this.getClass().getName());
+ private final Vector<AvatarProvider> providers = new Vector<AvatarProvider>();
+ private Map<JID, String> avatars = new HashMap<JID, String>();
+ private final Map<AvatarProvider, SignalConnection> onAvatarChangedConnections_ = new HashMap<AvatarProvider, SignalConnection>();
+ private Logger logger_ = Logger.getLogger(this.getClass().getName());
- @Override
- public String getAvatarHash(JID jid) {
- return getCombinedAvatarAndCache(jid);
- }
+ @Override
+ public String getAvatarHash(JID jid) {
+ return getCombinedAvatarAndCache(jid);
+ }
- private final Slot1<JID> onAvatarChangedSlot = new Slot1<JID>() {
- @Override public void call(JID p1) {handleAvatarChanged(p1);}
- };
-
- public void addProvider(AvatarProvider provider) {
- if (!onAvatarChangedConnections_.containsKey(provider)) {
- onAvatarChangedConnections_.put(provider, provider.onAvatarChanged.connect(onAvatarChangedSlot));
- }
- providers.add(provider);
- }
+ private final Slot1<JID> onAvatarChangedSlot = new Slot1<JID>() {
+ @Override public void call(JID p1) {handleAvatarChanged(p1);}
+ };
- public void delete() {
- for (SignalConnection connection : onAvatarChangedConnections_.values()) {
- connection.disconnect();
- }
- for (AvatarProvider provider : providers) {
- provider.delete();
- }
- }
+ public void addProvider(AvatarProvider provider) {
+ if (!onAvatarChangedConnections_.containsKey(provider)) {
+ onAvatarChangedConnections_.put(provider, provider.onAvatarChanged.connect(onAvatarChangedSlot));
+ }
+ providers.add(provider);
+ }
- private void handleAvatarChanged(JID jid) {
- String oldHash = new String();
- if(avatars.containsKey(jid)) {
- oldHash = avatars.get(jid);
- }
- String newHash = getCombinedAvatarAndCache(jid);
- if (newHash != null && !newHash.equals(oldHash)) {
- logger_.fine("Avatar changed: " + jid + ": " + oldHash + " -> " + ((newHash != null) ? newHash : "NULL") + "\n");
- onAvatarChanged.emit(jid);
- }
- }
+ public void removeProvider(AvatarProvider provider) {
+ while (providers.remove(provider)) {
+ // Loop will run until no copies of provider in providers
+ }
+ SignalConnection avatarChangedConnection = onAvatarChangedConnections_.remove(provider);
+ if (avatarChangedConnection != null) {
+ avatarChangedConnection.disconnect();
+ }
+ }
- private String getCombinedAvatarAndCache(JID jid) {
- logger_.fine("JID: " + jid + "\n");
- String hash = null;
- for (int i = 0; i < providers.size() && (hash==null); ++i) {
- hash = providers.get(i).getAvatarHash(jid);
- logger_.fine("Provider " + providers.get(i) + ": " + ((hash != null) ? hash : "NULL") + "\n");
- }
- if (hash != null) {
- avatars.put(jid, hash);
- } else {
- avatars.put(jid, "");
- }
- return hash;
- }
+ public void delete() {
+ for (SignalConnection connection : onAvatarChangedConnections_.values()) {
+ connection.disconnect();
+ }
+ for (AvatarProvider provider : providers) {
+ provider.delete();
+ }
+ }
+
+ private void handleAvatarChanged(JID jid) {
+ String oldHash = new String();
+ if(avatars.containsKey(jid)) {
+ oldHash = avatars.get(jid);
+ }
+ String newHash = getCombinedAvatarAndCache(jid);
+ if (!areHashesEqual(oldHash, newHash)) {
+ logger_.fine("Avatar changed: " + jid + ": " + oldHash + " -> " + ((newHash != null) ? newHash : "NULL") + "\n");
+ onAvatarChanged.emit(jid);
+ }
+ }
+
+ /**
+ * Performs a null safe check if two hashes are equal
+ * @param hash1 A hash. Can be {@code null}.
+ * @param hash2 Another hash. Can be {@code null}
+ * @return {@code true} if the hashes are equal, {@code false}
+ * otherwise.
+ */
+ private static boolean areHashesEqual(String hash1,String hash2) {
+ if (hash1 == hash2) {
+ return true;
+ }
+ else if (hash1 == null) {
+ return false;
+ }
+ return hash1.equals(hash2);
+ }
+
+ private String getCombinedAvatarAndCache(JID jid) {
+ logger_.fine("JID: " + jid + "\n");
+ String hash = null;
+ for (int i = 0; i < providers.size() && (hash==null); ++i) {
+ hash = providers.get(i).getAvatarHash(jid);
+ logger_.fine("Provider " + providers.get(i) + ": " + ((hash != null) ? hash : "NULL") + "\n");
+ }
+ if (hash != null) {
+ avatars.put(jid, hash);
+ } else {
+ avatars.put(jid, "");
+ }
+ return hash;
+ }
} \ No newline at end of file