[COLLECTIONS-891] Fix IndexedCollection contains equality

src/changes/changes.xml

@@ -52,6 +52,7 @@
     <action type="fix" dev="ggregory" due-to="Dexter.k, Gary Gregory">Re-validate entries in PredicatedMap/PredicatedCollection readObject (#682).</action>
     <action type="fix" dev="ggregory" due-to="Ruiqi Dong, Gary Gregory" issue="COLLECTIONS-889">IndexedCollection.remove(Object) removes all values for a non-unique index key.</action>
     <action type="fix" dev="ggregory" due-to="Ruiqi Dong, Gary Gregory" issue="COLLECTIONS-890">TransformIterator throws NullPointerException when its transformer is null.</action>
+    <action type="fix" dev="ggregory" due-to="Ruiqi Dong, Gary Gregory" issue="COLLECTIONS-891">IndexedCollection.contains(Object) can return true for objects that were never added.</action>
     <action type="fix" dev="ggregory" due-to="Ruiqi Dong, Gary Gregory" issue="COLLECTIONS-892">IndexedCollection.add(Object) mutates unique indexed collections before rejecting duplicate keys.</action>
     <action type="fix" dev="ggregory" due-to="Maxim Safronov, Gary Gregory" issue="COLLECTIONS-878">MapUtils.invertMap() improves HashMap construction (#652).</action>
     <action type="fix" dev="ggregory" due-to="Dexter.k, Gary Gregory">Validate order and uniqueness invariants in decorator readObject() (#684).</action>

src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java

@@ -156,7 +156,8 @@ public void clear() {
     @SuppressWarnings("unchecked")
     @Override
     public boolean contains(final Object object) {
-        return index.containsKey(keyTransformer.apply((C) object));
+        final Collection<C> values = (Collection<C>) index.get(keyTransformer.apply((C) object));
+        return values != null && values.contains(object);
     }
 
     /**

src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java

@@ -18,6 +18,7 @@
 
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -116,6 +117,22 @@ void testAddedObjectsCanBeRetrievedByKey() throws Exception {
         assertEquals("4", indexed.get(4));
     }
 
+    @Test
+    void testContainsUsesObjectEqualityNotOnlyTransformedKey() {
+        final Collection<String> coll = makeUniqueTestCollection();
+        coll.add("01");
+
+        assertFalse(coll.contains("1"));
+    }
+
+    @Test
+    void testContainsUsesObjectEqualityWithNonUniqueIndex() {
+        final Collection<String> coll = makeTestCollection();
+        coll.add("01");
+
+        assertFalse(coll.contains("1"));
+    }
+
     @Test
     void testDecoratedCollectionIsIndexedOnCreation() throws Exception {
         final Collection<String> original = makeFullCollection();