This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
The following commit(s) were added to refs/heads/master by this push:
new 28c74518b Fix flaky test failure in
'AbstractCollectionTest.testCollectionToArray2'
28c74518b is described below
commit 28c74518bc13bf6ddaad6fb24911cf3deb361521
Author: Partha Protim Paul <ppartha...@gmail.com>
AuthorDate: Mon Oct 3 16:12:38 2022 +0600
Fix flaky test failure in 'AbstractCollectionTest.testCollectionToArray2'
Use the AbstractCollectionTest iteration order flag in Map and Bag tests.
These tests have inner classes that extend AbstractCollectionTest to test their
values collection. This should be robust to an unspecified iteration order.
---
.../collections4/bag/CollectionBagTest.java | 5 ++++
.../commons/collections4/bag/HashBagTest.java | 5 ++++
.../collections4/bag/PredicatedBagTest.java | 5 ++++
.../collections4/bag/TransformedBagTest.java | 5 ++++
.../collections4/bag/UnmodifiableBagTest.java | 5 ++++
.../collections4/bidimap/AbstractBidiMapTest.java | 4 +++
.../collections4/bidimap/DualHashBidiMapTest.java | 6 ++++
.../bidimap/UnmodifiableBidiMapTest.java | 6 ++++
.../collection/AbstractCollectionTest.java | 2 +-
.../commons/collections4/map/AbstractMapTest.java | 35 ++++++++++++++++++++++
.../collections4/map/PassiveExpiringMapTest.java | 6 ++++
.../multimap/AbstractMultiValuedMapTest.java | 35 ++++++++++++++++++++++
.../multimap/ArrayListValuedHashMapTest.java | 6 ++++
.../multimap/HashSetValuedHashMapTest.java | 6 ++++
.../multimap/TransformedMultiValuedMapTest.java | 6 ++++
.../multimap/UnmodifiableMultiValuedMapTest.java | 6 ++++
.../multiset/AbstractMultiSetTest.java | 5 ++++
.../collections4/multiset/HashMultiSetTest.java | 5 ++++
.../multiset/PredicatedMultiSetTest.java | 5 ++++
.../multiset/SynchronizedMultiSetTest.java | 5 ++++
.../multiset/UnmodifiableMultiSetTest.java | 5 ++++
.../commons/collections4/set/CompositeSetTest.java | 5 ++++
.../collections4/set/PredicatedSetTest.java | 5 ++++
.../collections4/set/TransformedSetTest.java | 5 ++++
.../collections4/set/UnmodifiableSetTest.java | 5 ++++
25 files changed, 187 insertions(+), 1 deletion(-)
diff --git
a/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
b/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
index 4abdc722c..7ed1b7f09 100644
--- a/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
@@ -76,6 +76,11 @@ public class CollectionBagTest<T> extends
AbstractCollectionTest<T> {
return "4";
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
// public void testCreate() throws Exception {
// resetEmpty();
// writeExternalFormToDisk((java.io.Serializable) getCollection(),
"src/test/resources/data/test/CollectionBag.emptyCollection.version4.obj");
diff --git a/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java
b/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java
index 1323ca071..b1639b83c 100644
--- a/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java
@@ -45,6 +45,11 @@ public class HashBagTest<T> extends AbstractBagTest<T> {
return "4";
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
// public void testCreate() throws Exception {
// Bag<T> bag = makeObject();
// writeExternalFormToDisk((java.io.Serializable) bag,
"src/test/resources/data/test/HashBag.emptyCollection.version4.obj");
diff --git
a/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
index 56706077c..82a165720 100644
--- a/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
@@ -61,6 +61,11 @@ public class PredicatedBagTest<T> extends AbstractBagTest<T>
{
return decorateBag(new HashBag<T>(), stringPredicate());
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
@Test
@SuppressWarnings("unchecked")
public void testlegalAddRemove() {
diff --git
a/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
b/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
index bafb1382d..cff890f58 100644
--- a/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
@@ -46,6 +46,11 @@ public class TransformedBagTest<T> extends
AbstractBagTest<T> {
(Transformer<T, T>)
TransformedCollectionTest.NOOP_TRANSFORMER);
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
@Test
@SuppressWarnings("unchecked")
public void testTransformedBag() {
diff --git
a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java
b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java
index 1a2c83436..2d8369a8b 100644
--- a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java
@@ -74,6 +74,11 @@ public class UnmodifiableBagTest<E> extends
AbstractBagTest<E> {
return false;
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
@Test
public void testUnmodifiable() {
assertTrue(makeObject() instanceof Unmodifiable);
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
index 8c69f7ec5..8a9a0b653 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
@@ -464,6 +464,10 @@ public abstract class AbstractBidiMapTest<K, V> extends
AbstractIterableMapTest<
return main.isRemoveSupported();
}
+ @Override
+ protected int getIterationBehaviour() {
+ return main.getIterationBehaviour();
+ }
}
public BulkTest bulkTestBidiMapIterator() {
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
b/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
index d9e67e4ea..219adde03 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.collections4.bidimap;
import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
/**
* JUnit tests.
@@ -47,6 +48,11 @@ public class DualHashBidiMapTest<K, V> extends
AbstractBidiMapTest<K, V> {
return new String[] {
"DualHashBidiMapTest.bulkTestInverseMap.bulkTestInverseMap" };
}
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractCollectionTest.UNORDERED;
+ }
+
// public void testCreate() throws Exception {
// resetEmpty();
// writeExternalFormToDisk((java.io.Serializable) map,
"src/test/resources/data/test/DualHashBidiMap.emptyCollection.version4.obj");
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
index 7a0f26709..8950b5a98 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.commons.collections4.BidiMap;
import org.apache.commons.collections4.BulkTest;
import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
import org.junit.jupiter.api.Test;
/**
@@ -79,6 +80,11 @@ public class UnmodifiableBidiMapTest<K, V> extends
AbstractBidiMapTest<K, V> {
return false;
}
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractCollectionTest.UNORDERED;
+ }
+
@Test
public void testUnmodifiable() {
assertTrue(makeObject() instanceof Unmodifiable);
diff --git
a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
index fa6e20122..7add04653 100644
---
a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
+++
b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
@@ -147,7 +147,7 @@ public abstract class AbstractCollectionTest<E> extends
AbstractObjectTest {
* then the behaviour is assumed to be ordered and the output order of the
iterator is matched by
* the toArray method.
*/
- protected static final int UNORDERED = 0x1;
+ public static final int UNORDERED = 0x1;
// These fields are used by reset() and verify(), and any test
// method that tests a modification.
diff --git
a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
index 21fca7c32..c96edf814 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
@@ -63,6 +63,13 @@ import org.junit.jupiter.api.Test;
* <li>{@link #getOtherValues()}
* </ul>
*
+ * <b>Indicate Map Behaviour</b>
+ * <p>
+ * Override these if your map makes specific behaviour guarantees:
+ * <ul>
+ * <li>{@link #getIterationBehaviour()}</li>
+ * </ul>
+ *
* <b>Supported Operation Methods</b>
* <p>
* Override these methods if your map doesn't support certain operations:
@@ -524,6 +531,18 @@ public abstract class AbstractMapTest<K, V> extends
AbstractObjectTest {
}
}
+ /**
+ * Return a flag specifying the iteration behaviour of the collection.
+ * This is used to change the assertions used by specific tests.
+ * The default implementation returns 0 which indicates ordered iteration
behaviour.
+ *
+ * @return the iteration behaviour
+ * @see AbstractCollectionTest#UNORDERED
+ */
+ protected int getIterationBehaviour(){
+ return 0;
+ }
+
// tests begin here. Each test adds a little bit of tested functionality.
// Many methods assume previous methods passed. That is, they do not
// exhaustively recheck things that have already been checked in a previous
@@ -1619,6 +1638,11 @@ public abstract class AbstractMapTest<K, V> extends
AbstractObjectTest {
TestMapEntrySet.this.setConfirmed(AbstractMapTest.this.getConfirmed().entrySet());
}
+ @Override
+ protected int getIterationBehaviour(){
+ return AbstractMapTest.this.getIterationBehaviour();
+ }
+
@Test
public void testMapEntrySetIteratorEntry() {
resetFull();
@@ -1801,6 +1825,12 @@ public abstract class AbstractMapTest<K, V> extends
AbstractObjectTest {
super.verify();
AbstractMapTest.this.verify();
}
+
+ @Override
+ protected int getIterationBehaviour(){
+ return AbstractMapTest.this.getIterationBehaviour();
+ }
+
}
/**
@@ -1900,6 +1930,11 @@ public abstract class AbstractMapTest<K, V> extends
AbstractObjectTest {
AbstractMapTest.this.verify();
}
+ @Override
+ protected int getIterationBehaviour(){
+ return AbstractMapTest.this.getIterationBehaviour();
+ }
+
// TODO: should test that a remove on the values collection view
// removes the proper mapping and not just any mapping that may have
// the value equal to the value returned from the values iterator.
diff --git
a/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
b/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
index f190e764a..62e98fc89 100644
---
a/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
import org.apache.commons.collections4.map.PassiveExpiringMap.ExpirationPolicy;
import org.junit.jupiter.api.Test;
@@ -91,6 +92,11 @@ public class PassiveExpiringMapTest<K, V> extends
AbstractMapTest<K, V> {
return new PassiveExpiringMap<>();
}
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractCollectionTest.UNORDERED;
+ }
+
private Map<Integer, String> makeTestMap() {
final Map<Integer, String> m =
new PassiveExpiringMap<>(new TestExpirationPolicy());
diff --git
a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
index a3723faa4..e4b7e69b0 100644
---
a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
@@ -60,6 +60,7 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
/** MultiValuedHashMap created by reset(). */
protected MultiValuedMap<K, V> confirmed;
+
public AbstractMultiValuedMapTest(final String testName) {
super(testName);
}
@@ -211,6 +212,18 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
}
}
+ /**
+ * Return a flag specifying the iteration behaviour of the map.
+ * This is used to change the assertions used by specific tests.
+ * The default implementation returns 0 which indicates ordered iteration
behaviour.
+ *
+ * @return the iteration behaviour
+ * @see AbstractCollectionTest#UNORDERED
+ */
+ protected int getIterationBehaviour() {
+ return 0;
+ }
+
@Test
@SuppressWarnings("unchecked")
public void testNoMappingReturnsEmptyCol() {
@@ -954,6 +967,11 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
return null;
}
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractMultiValuedMapTest.this.getIterationBehaviour();
+ }
+
}
/**
@@ -1009,6 +1027,10 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
return false;
}
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractMultiValuedMapTest.this.getIterationBehaviour();
+ }
}
/**
@@ -1090,6 +1112,10 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
return null;
}
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractMultiValuedMapTest.this.getIterationBehaviour();
+ }
}
/**
@@ -1160,6 +1186,10 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
TestMultiValuedMapKeys.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().keys());
}
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractMultiValuedMapTest.this.getIterationBehaviour();
+ }
}
public BulkTest bulkTestAsMap() {
@@ -1257,6 +1287,11 @@ public abstract class AbstractMultiValuedMapTest<K, V>
extends AbstractObjectTes
public boolean isTestSerialization() {
return false;
}
+
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractMultiValuedMapTest.this.getIterationBehaviour();
+ }
}
}
diff --git
a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
index aac4a26b4..83853ff5f 100644
---
a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
import org.apache.commons.collections4.BulkTest;
import org.apache.commons.collections4.ListValuedMap;
import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
import org.junit.jupiter.api.Test;
/**
@@ -48,6 +49,11 @@ public class ArrayListValuedHashMapTest<K, V> extends
AbstractMultiValuedMapTest
return new ArrayListValuedHashMap<>();
}
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractCollectionTest.UNORDERED;
+ }
+
@Test
@SuppressWarnings("unchecked")
public void testListValuedMapAdd() {
diff --git
a/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
b/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
index fc9da211a..0c4f3d9c1 100644
---
a/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
@@ -24,6 +24,7 @@ import java.util.Set;
import org.apache.commons.collections4.BulkTest;
import org.apache.commons.collections4.MultiValuedMap;
import org.apache.commons.collections4.SetValuedMap;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
import org.junit.jupiter.api.Test;
/**
@@ -56,6 +57,11 @@ public class HashSetValuedHashMapTest<K, V> extends
AbstractMultiValuedMapTest<K
return true;
}
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractCollectionTest.UNORDERED;
+ }
+
@Test
@SuppressWarnings("unchecked")
public void testSetValuedMapAdd() {
diff --git
a/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java
b/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java
index 37b276d33..7995bd6e0 100644
---
a/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java
@@ -22,6 +22,7 @@ import org.apache.commons.collections4.BulkTest;
import org.apache.commons.collections4.MultiValuedMap;
import org.apache.commons.collections4.Transformer;
import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
import org.apache.commons.collections4.collection.TransformedCollectionTest;
import org.junit.jupiter.api.Test;
@@ -46,6 +47,11 @@ public class TransformedMultiValuedMapTest<K, V> extends
AbstractMultiValuedMapT
TransformerUtils.<K>nopTransformer(),
TransformerUtils.<V>nopTransformer());
}
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractCollectionTest.UNORDERED;
+ }
+
@Test
@SuppressWarnings("unchecked")
public void testKeyTransformedMap() {
diff --git
a/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
b/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
index dbae6e937..603835063 100644
---
a/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
@@ -31,6 +31,7 @@ import org.apache.commons.collections4.MapIterator;
import org.apache.commons.collections4.MultiSet;
import org.apache.commons.collections4.MultiValuedMap;
import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
import org.junit.jupiter.api.Test;
/**
@@ -82,6 +83,11 @@ public class UnmodifiableMultiValuedMapTest<K, V> extends
AbstractMultiValuedMap
return UnmodifiableMultiValuedMap.<K,
V>unmodifiableMultiValuedMap(map);
}
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractCollectionTest.UNORDERED;
+ }
+
@Test
public void testUnmodifiable() {
assertTrue(makeObject() instanceof Unmodifiable);
diff --git
a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
index 1b9cfb7f0..1f41f14a2 100644
---
a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
@@ -687,6 +687,11 @@ public abstract class AbstractMultiSetTest<T> extends
AbstractCollectionTest<T>
public void verify() {
super.verify();
}
+
+ @Override
+ protected int getIterationBehaviour() {
+ return AbstractMultiSetTest.this.getIterationBehaviour();
+ }
}
diff --git
a/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java
b/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java
index f7556d576..65c09246e 100644
---
a/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java
@@ -46,6 +46,11 @@ public class HashMultiSetTest<T> extends
AbstractMultiSetTest<T> {
return "4.1";
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
// public void testCreate() throws Exception {
// MultiSet<T> multiset = makeObject();
// writeExternalFormToDisk((java.io.Serializable) multiset,
"src/test/resources/data/test/HashMultiSet.emptyCollection.version4.1.obj");
diff --git
a/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java
b/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java
index 853c52096..c2aa7aa8e 100644
---
a/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java
@@ -61,6 +61,11 @@ public class PredicatedMultiSetTest<T> extends
AbstractMultiSetTest<T> {
return decorateMultiSet(new HashMultiSet<T>(), stringPredicate());
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
@Test
@SuppressWarnings("unchecked")
public void testLegalAddRemove() {
diff --git
a/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java
b/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java
index dec0bed61..605251780 100644
---
a/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java
@@ -46,6 +46,11 @@ public class SynchronizedMultiSetTest<T> extends
AbstractMultiSetTest<T> {
return "4.1";
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
// public void testCreate() throws Exception {
// MultiSet<T> multiset = makeObject();
// writeExternalFormToDisk((java.io.Serializable) multiset,
"src/test/resources/data/test/SynchronizedMultiSet.emptyCollection.version4.1.obj");
diff --git
a/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
b/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
index a89658c96..45029f583 100644
---
a/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
+++
b/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
@@ -73,6 +73,11 @@ public class UnmodifiableMultiSetTest<E> extends
AbstractMultiSetTest<E> {
return false;
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
@Test
public void testUnmodifiable() {
assertTrue(makeObject() instanceof Unmodifiable);
diff --git
a/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
b/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
index f7b9d4c98..669ebea7c 100644
--- a/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
@@ -191,6 +191,11 @@ public class CompositeSetTest<E> extends
AbstractSetTest<E> {
return "4";
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
// public void testCreate() throws Exception {
// resetEmpty();
// writeExternalFormToDisk((java.io.Serializable) getCollection(),
"src/test/resources/data/test/CompositeSet.emptyCollection.version4.obj");
diff --git
a/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
b/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
index d3c4e38c6..9edaf2ed8 100644
--- a/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
@@ -99,6 +99,11 @@ public class PredicatedSetTest<E> extends AbstractSetTest<E>
{
return "4";
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
// public void testCreate() throws Exception {
// resetEmpty();
// writeExternalFormToDisk((java.io.Serializable) getCollection(),
"src/test/resources/data/test/PredicatedSet.emptyCollection.version4.obj");
diff --git
a/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
b/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
index 605d9f27c..80b432a51 100644
--- a/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
@@ -102,6 +102,11 @@ public class TransformedSetTest<E> extends
AbstractSetTest<E> {
return "4";
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
// public void testCreate() throws Exception {
// resetEmpty();
// writeExternalFormToDisk((java.io.Serializable) getCollection(),
"src/test/resources/data/test/TransformedSet.emptyCollection.version4.obj");
diff --git
a/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
index a1e12eb11..e37f993f5 100644
--- a/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
@@ -82,6 +82,11 @@ public class UnmodifiableSetTest<E> extends
AbstractSetTest<E> {
return "4";
}
+ @Override
+ protected int getIterationBehaviour() {
+ return UNORDERED;
+ }
+
// public void testCreate() throws Exception {
// resetEmpty();
// writeExternalFormToDisk((java.io.Serializable) getCollection(),
"src/test/resources/data/test/UnmodifiableSet.emptyCollection.version4.obj");
