Merge pull request square#133 from roman-mazur/roman/fix-intent-flags

Fix hasFlags method in IntentAssert
kriegfrj · Sep 25, 2014 · ee1e5d4 · ee1e5d4
2 parents 9efe9e3 + 3e95ae6
commit ee1e5d4
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/assertj-android/src/main/java/org/assertj/android/internal/IntegerUtils.java b/assertj-android/src/main/java/org/assertj/android/internal/IntegerUtils.java
@@ -1,8 +1,8 @@
 package org.assertj.android.internal;
 
 import android.util.SparseArray;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import org.assertj.core.util.Strings;
 
 public final class IntegerUtils {
@@ -21,22 +21,19 @@ public static NamedValueStringBuilder buildNamedValueString(int value) {
 
   public static final class BitMaskStringBuilder {
     private final int value;
-    private final Set<String> parts = new LinkedHashSet<>();
-    private int flags;
+    private final Map<Integer, String> parts = new LinkedHashMap<>();
 
     private BitMaskStringBuilder(int value) {
       this.value = value;
     }
 
     public BitMaskStringBuilder flag(int flag, String flagName) {
-      if ((flags & flag) != 0) {
-        throw new IllegalStateException(
-            "Duplicate flag detected: " + flagName + " with value " + Integer.toHexString(flag));
-      }
-      flags |= flag;
-
       if ((value & flag) != 0) {
-        parts.add(flagName);
+        if (parts.containsKey(flag)) {
+          parts.put(flag, parts.get(flag) + "|" + flagName);
+        } else {
+          parts.put(flag, flagName);
+        }
       }
       return this;
     }
@@ -45,7 +42,7 @@ public String get() {
       if (value == 0) {
         return "none";
       }
-      return Strings.join(parts).with(", ");
+      return Strings.join(parts.values()).with(", ");
     }
   }