Fix containsAnyOf that only worked with comparable elements

Fixes #1154
assertj · Jan 14, 2018 · 277bae8 · 277bae8
1 parent 43c3c6b
commit 277bae8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/org/assertj/core/internal/Iterables.java b/src/main/java/org/assertj/core/internal/Iterables.java
@@ -1125,7 +1125,7 @@ public void assertContainsAnyOf(AssertionInfo info, Iterable<?> actual, Object[]
     if (commonCheckThatIterableAssertionSucceeds(info, actual, values))
       return;
 
-    Set<Object> valuesToSearchFor = newTreeSet(values);
+    Iterable<Object> valuesToSearchFor = newArrayList(values);
     for (Object element : actual) {
       if (iterableContains(valuesToSearchFor, element)) return;
     }

diff --git a/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsAnyOf_Test.java b/src/test/java/org/assertj/core/internal/iterables/Iterables_assertContainsAnyOf_Test.java
@@ -12,8 +12,10 @@
  */
 package org.assertj.core.internal.iterables;
 
+import static java.util.Arrays.asList;
 import static org.assertj.core.error.ShouldContainAnyOf.shouldContainAnyOf;
 import static org.assertj.core.internal.ErrorMessages.valuesToLookForIsNull;
+import static org.assertj.core.test.Name.name;
 import static org.assertj.core.test.ObjectArrays.emptyArray;
 import static org.assertj.core.test.TestData.someInfo;
 import static org.assertj.core.test.TestFailures.failBecauseExpectedAssertionErrorWasNotThrown;
@@ -25,6 +27,7 @@
 import org.assertj.core.api.AssertionInfo;
 import org.assertj.core.internal.Iterables;
 import org.assertj.core.internal.IterablesBaseTest;
+import org.assertj.core.test.Name;
 import org.junit.Test;
 
 /**
@@ -39,6 +42,14 @@ public void should_pass_if_actual_contains_given_values() {
     iterables.assertContainsAnyOf(someInfo(), actual, array("Luke"));
   }
 
+  @Test
+  public void should_pass_with_non_comparable_values() {
+    // GIVEN
+    Iterable<Name> names = asList(name("John", "Doe"));
+    // THEN
+    iterables.assertContainsAnyOf(someInfo(), names, array(name("John", "Doe"), name("Jane", "Doe")));
+  }
+
   @Test
   public void should_pass_if_actual_contains_given_values_in_different_order() {
     iterables.assertContainsAnyOf(someInfo(), actual, array("Leia", "Yoda"));

diff --git a/src/test/java/org/assertj/core/test/Name.java b/src/test/java/org/assertj/core/test/Name.java
@@ -36,6 +36,10 @@ public Name(String first, String last) {
     setLast(last);
   }
 
+  public static Name name(String first, String last) {
+    return new Name(first, last);
+  }
+
   public String getFirst() {
     return first;
   }