diff --git a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java index 0e05748a9..7a80598dd 100644 --- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java +++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java @@ -121,7 +121,7 @@ import org.apache.commons.collections.AbstractTestObject; * @author Neil O'Toole * @author Stephen Colebourne */ -public abstract class AbstractTestCollection extends AbstractTestObject { +public abstract class AbstractTestCollection extends AbstractTestObject { // // NOTE: @@ -140,7 +140,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { /** * A collection instance that will be used for testing. */ - public Collection collection; + public Collection collection; /** * Confirmed collection. This is an instance of a collection that is @@ -150,7 +150,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { * collection, and then calling verify() to make sure your collection * still matches the confirmed collection. */ - public Collection confirmed; + public Collection confirmed; /** * JUnit constructor. @@ -262,7 +262,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { // copy each collection value into an array Object[] confirmedValues = new Object[confirmedSize]; - Iterator iter; + Iterator iter; iter = confirmed.iterator(); int pos = 0; @@ -340,7 +340,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { * * @return a confirmed empty collection */ - public abstract Collection makeConfirmedCollection(); + public abstract Collection makeConfirmedCollection(); /** * Returns a confirmed full collection. @@ -350,12 +350,12 @@ public abstract class AbstractTestCollection extends AbstractTestObject { * * @return a confirmed full collection */ - public abstract Collection makeConfirmedFullCollection(); + public abstract Collection makeConfirmedFullCollection(); /** * Return a new, empty {@link Collection} to be used for testing. */ - public abstract Collection makeCollection(); + public abstract Collection makeCollection(); /** * Returns a full collection to be used for testing. The collection @@ -365,8 +365,8 @@ public abstract class AbstractTestCollection extends AbstractTestObject { * the results of {@link #getFullElements()}. Override this default * if your collection doesn't support addAll. */ - public Collection makeFullCollection() { - Collection c = makeCollection(); + public Collection makeFullCollection() { + Collection c = makeCollection(); c.addAll(Arrays.asList(getFullElements())); return c; } @@ -381,10 +381,10 @@ public abstract class AbstractTestCollection extends AbstractTestObject { /** * Creates a new Map Entry that is independent of the first and the map. */ - public Map.Entry cloneMapEntry(Map.Entry entry) { - HashMap map = new HashMap(); + public Map.Entry cloneMapEntry(Map.Entry entry) { + HashMap map = new HashMap(); map.put(entry.getKey(), entry.getValue()); - return (Map.Entry) map.entrySet().iterator().next(); + return map.entrySet().iterator().next(); } //----------------------------------------------------------------------- @@ -398,14 +398,14 @@ public abstract class AbstractTestCollection extends AbstractTestObject { * override {@link #makeFullCollection()}, you must override * this method to reflect the contents of a full collection. */ - public Object[] getFullElements() { + public T[] getFullElements() { if (isNullSupported()) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); list.addAll(Arrays.asList(getFullNonNullElements())); list.add(4, null); - return list.toArray(); + return (T[]) list.toArray(); } else { - return (Object[]) getFullNonNullElements().clone(); + return getFullNonNullElements().clone(); } } @@ -418,7 +418,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { * to an empty or full collection, so if your collection restricts * certain kinds of elements, you should override this method. */ - public Object[] getOtherElements() { + public T[] getOtherElements() { return getOtherNonNullElements(); } @@ -431,8 +431,8 @@ public abstract class AbstractTestCollection extends AbstractTestObject { * the results of this method if your collection does not support * the null element. */ - public Object[] getFullNonNullElements() { - return new Object[] { + public T[] getFullNonNullElements() { + return (T[]) new Object[] { new String(""), new String("One"), new Integer(2), @@ -459,8 +459,8 @@ public abstract class AbstractTestCollection extends AbstractTestObject { * {@link #getOtherElements()}. Includes many objects * of different types. */ - public Object[] getOtherNonNullElements() { - return new Object[] { + public T[] getOtherNonNullElements() { + return (T[]) new Object[] { new Integer(0), new Float(0), new Double(0), @@ -507,7 +507,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { public void testCollectionAdd() { if (!isAddSupported()) return; - Object[] elements = getFullElements(); + T[] elements = getFullElements(); for (int i = 0; i < elements.length; i++) { resetEmpty(); boolean r = collection.add(elements[i]); @@ -539,7 +539,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { if (!isAddSupported()) return; resetEmpty(); - Object[] elements = getFullElements(); + T[] elements = getFullElements(); boolean r = collection.addAll(Arrays.asList(elements)); confirmed.addAll(Arrays.asList(elements)); verify(); @@ -587,7 +587,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { resetEmpty(); try { - collection.add(new Object()); + collection.add(getFullNonNullElements()[0]); fail("Emtpy collection should not support add."); } catch (UnsupportedOperationException e) { // expected @@ -608,7 +608,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { resetFull(); try { - collection.add(new Object()); + collection.add(getFullNonNullElements()[0]); fail("Full collection should not support add."); } catch (UnsupportedOperationException e) { // expected @@ -692,7 +692,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { */ public void testCollectionContainsAll() { resetEmpty(); - Collection col = new HashSet(); + Collection col = new HashSet(); assertTrue("Every Collection should contain all elements of an " + "empty Collection.", collection.containsAll(col)); col.addAll(Arrays.asList(getOtherElements())); @@ -723,7 +723,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { // make sure calls to "containsAll" don't change anything verify(); - col = new ArrayList(); + col = new ArrayList(); col.addAll(Arrays.asList(getFullElements())); col.addAll(Arrays.asList(getFullElements())); assertTrue("Full collection should containAll duplicate full " + @@ -756,7 +756,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { */ public void testCollectionIterator() { resetEmpty(); - Iterator it1 = collection.iterator(); + Iterator it1 = collection.iterator(); assertEquals("Iterator for empty Collection shouldn't have next.", false, it1.hasNext()); try { @@ -778,10 +778,10 @@ public abstract class AbstractTestCollection extends AbstractTestObject { } assertTrue("Iterator should be finished", !it1.hasNext()); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); it1 = collection.iterator(); for (int i = 0; i < collection.size(); i++) { - Object next = it1.next(); + T next = it1.next(); assertTrue("Collection should contain element returned by " + "its iterator", collection.contains(next)); list.add(next); @@ -814,7 +814,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { verify(); try { - Iterator iter = collection.iterator(); + Iterator iter = collection.iterator(); iter.hasNext(); iter.remove(); fail("New iterator.remove should raise IllegalState " + @@ -826,7 +826,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { resetFull(); int size = collection.size(); - Iterator iter = collection.iterator(); + Iterator iter = collection.iterator(); while (iter.hasNext()) { Object o = iter.next(); // TreeMap reuses the Map Entry, so the verify below fails @@ -931,7 +931,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { assertTrue("Emtpy collection removeAll should return false for " + "nonempty input", - !collection.removeAll(new ArrayList(collection))); + !collection.removeAll(new ArrayList(collection))); verify(); resetFull(); @@ -945,8 +945,8 @@ public abstract class AbstractTestCollection extends AbstractTestObject { verify(); assertTrue("Full collection removeAll should return true for full elements", - collection.removeAll(new HashSet(collection))); - confirmed.removeAll(new HashSet(confirmed)); + collection.removeAll(new HashSet(collection))); + confirmed.removeAll(new HashSet(confirmed)); verify(); resetFull(); @@ -954,7 +954,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { int min = (getFullElements().length < 2 ? 0 : 2); int max = (getFullElements().length == 1 ? 1 : (getFullElements().length <= 5 ? getFullElements().length - 1 : 5)); - Collection all = Arrays.asList(getFullElements()).subList(min, max); + Collection all = Arrays.asList(getFullElements()).subList(min, max); assertTrue("Full collection removeAll should work", collection.removeAll(all)); confirmed.removeAll(all); @@ -962,7 +962,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { assertTrue("Collection should shrink after removeAll", collection.size() < size); - Iterator iter = all.iterator(); + Iterator iter = all.iterator(); while (iter.hasNext()) { assertTrue("Collection shouldn't contain removed element", !collection.contains(iter.next())); @@ -977,8 +977,8 @@ public abstract class AbstractTestCollection extends AbstractTestObject { if (!isRemoveSupported()) return; resetEmpty(); - List elements = Arrays.asList(getFullElements()); - List other = Arrays.asList(getOtherElements()); + List elements = Arrays.asList(getFullElements()); + List other = Arrays.asList(getOtherElements()); assertTrue("Empty retainAll() should return false", !collection.retainAll(Collections.EMPTY_SET)); @@ -1018,7 +1018,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { confirmed.retainAll(elements.subList(min, max)); verify(); - Iterator iter = collection.iterator(); + Iterator iter = collection.iterator(); while (iter.hasNext()) { assertTrue("Collection only contains retained element", elements.subList(min, max).contains(iter.next())); @@ -1026,7 +1026,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { } resetFull(); - HashSet set = new HashSet(elements); + HashSet set = new HashSet(elements); size = collection.size(); assertTrue("Collection shouldn't change from retainAll without " + "duplicate elements", !collection.retainAll(set)); @@ -1130,13 +1130,13 @@ public abstract class AbstractTestCollection extends AbstractTestObject { // Figure out if they're all the same class // TODO: It'd be nicer to detect a common superclass - HashSet classes = new HashSet(); + HashSet> classes = new HashSet>(); for (int i = 0; i < array.length; i++) { classes.add((array[i] == null) ? null : array[i].getClass()); } if (classes.size() > 1) return; - Class cl = (Class)classes.iterator().next(); + Class cl = classes.iterator().next(); if (Map.Entry.class.isAssignableFrom(cl)) { // check needed for protective cases like Predicated/Unmod map entrySet cl = Map.Entry.class; } @@ -1207,7 +1207,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { resetFull(); try { - Iterator iterator = collection.iterator(); + Iterator iterator = collection.iterator(); iterator.next(); iterator.remove(); fail("iterator.remove should raise UnsupportedOperationException"); @@ -1228,8 +1228,8 @@ public abstract class AbstractTestCollection extends AbstractTestObject { if (isAddSupported()) { resetFull(); try { - Iterator iter = collection.iterator(); - Object o = getOtherElements()[0]; + Iterator iter = collection.iterator(); + T o = getOtherElements()[0]; collection.add(o); confirmed.add(o); iter.next(); @@ -1241,7 +1241,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { resetFull(); try { - Iterator iter = collection.iterator(); + Iterator iter = collection.iterator(); collection.addAll(Arrays.asList(getOtherElements())); confirmed.addAll(Arrays.asList(getOtherElements())); iter.next(); @@ -1256,7 +1256,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { resetFull(); try { - Iterator iter = collection.iterator(); + Iterator iter = collection.iterator(); collection.clear(); iter.next(); fail("next after clear should raise ConcurrentModification"); @@ -1268,7 +1268,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject { resetFull(); try { - Iterator iter = collection.iterator(); + Iterator iter = collection.iterator(); collection.remove(getFullElements()[0]); iter.next(); fail("next after remove should raise ConcurrentModification"); @@ -1278,8 +1278,8 @@ public abstract class AbstractTestCollection extends AbstractTestObject { resetFull(); try { - Iterator iter = collection.iterator(); - List sublist = Arrays.asList(getFullElements()).subList(2,5); + Iterator iter = collection.iterator(); + List sublist = Arrays.asList(getFullElements()).subList(2,5); collection.removeAll(sublist); iter.next(); fail("next after removeAll should raise ConcurrentModification"); @@ -1289,8 +1289,8 @@ public abstract class AbstractTestCollection extends AbstractTestObject { resetFull(); try { - Iterator iter = collection.iterator(); - List sublist = Arrays.asList(getFullElements()).subList(2,5); + Iterator iter = collection.iterator(); + List sublist = Arrays.asList(getFullElements()).subList(2,5); collection.retainAll(sublist); iter.next(); fail("next after retainAll should raise ConcurrentModification"); diff --git a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java index c7c9f6468..576f7f1a6 100644 --- a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java @@ -36,7 +36,7 @@ import org.apache.commons.collections.PredicateUtils; * * @author Phil Steitz */ -public class TestPredicatedCollection extends AbstractTestCollection { +public class TestPredicatedCollection extends AbstractTestCollection { public TestPredicatedCollection(String name) { super(name); @@ -50,54 +50,53 @@ public class TestPredicatedCollection extends AbstractTestCollection { String[] testCaseName = { TestPredicatedCollection.class.getName()}; junit.textui.TestRunner.main(testCaseName); } - + //------------------------------------------------------------------------ - - protected Predicate truePredicate = PredicateUtils.truePredicate(); - - protected Collection decorateCollection(Collection collection, - Predicate predicate) { + protected Predicate truePredicate = PredicateUtils.truePredicate(); + + protected Collection decorateCollection( + Collection collection, Predicate predicate) { return PredicatedCollection.decorate(collection, predicate); } - - public Collection makeCollection() { - return decorateCollection(new ArrayList(), truePredicate); + + public Collection makeCollection() { + return decorateCollection(new ArrayList(), truePredicate); } - - public Collection makeConfirmedCollection() { - return new ArrayList(); + + public Collection makeConfirmedCollection() { + return new ArrayList(); } - + public Object[] getFullElements() { return new Object[] {"1", "3", "5", "7", "2", "4", "6"}; } - - public Collection makeFullCollection() { - List list = new ArrayList(); + + public Collection makeFullCollection() { + List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return decorateCollection(list, truePredicate); } - - public Collection makeConfirmedFullCollection() { - List list = new ArrayList(); + + public Collection makeConfirmedFullCollection() { + List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return list; } - //----------------------------------------------------------------- - protected Predicate testPredicate = - new Predicate() { + //----------------------------------------------------------------------- + protected Predicate testPredicate = + new Predicate() { public boolean evaluate(Object o) { return o instanceof String; } }; - - public Collection makeTestCollection() { - return decorateCollection(new ArrayList(), testPredicate); + + public Collection makeTestCollection() { + return decorateCollection(new ArrayList(), testPredicate); } - + public void testIllegalAdd() { - Collection c = makeTestCollection(); + Collection c = makeTestCollection(); Integer i = new Integer(3); try { c.add(i); @@ -110,8 +109,8 @@ public class TestPredicatedCollection extends AbstractTestCollection { } public void testIllegalAddAll() { - Collection c = makeTestCollection(); - List elements = new ArrayList(); + Collection c = makeTestCollection(); + List elements = new ArrayList(); elements.add("one"); elements.add("two"); elements.add(new Integer(3)); diff --git a/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java b/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java index eb46dc734..1dbdb0068 100644 --- a/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java @@ -33,7 +33,7 @@ import junit.framework.TestSuite; * @author Phil Steitz * @author Stephen Colebourne */ -public class TestSynchronizedCollection extends AbstractTestCollection { +public class TestSynchronizedCollection extends AbstractTestCollection { public TestSynchronizedCollection(String testName) { super(testName); @@ -49,17 +49,17 @@ public class TestSynchronizedCollection extends AbstractTestCollection { } //----------------------------------------------------------------------- - public Collection makeCollection() { - return SynchronizedCollection.decorate(new ArrayList()); + public Collection makeCollection() { + return SynchronizedCollection.decorate(new ArrayList()); } - public Collection makeConfirmedCollection() { - ArrayList list = new ArrayList(); + public Collection makeConfirmedCollection() { + ArrayList list = new ArrayList(); return list; } - public Collection makeConfirmedFullCollection() { - ArrayList list = new ArrayList(); + public Collection makeConfirmedFullCollection() { + ArrayList list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return list; } diff --git a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java index 4c0257aad..3764389b5 100644 --- a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java @@ -36,16 +36,16 @@ import org.apache.commons.collections.TransformerUtils; * * @author Stephen Colebourne */ -public class TestTransformedCollection extends AbstractTestCollection { +public class TestTransformedCollection extends AbstractTestCollection { - private static class StringToInteger implements Transformer { + private static class StringToInteger implements Transformer { public Object transform(Object input) { return new Integer((String) input); } } - public static final Transformer NOOP_TRANSFORMER = TransformerUtils.nopTransformer(); - public static final Transformer STRING_TO_INTEGER_TRANSFORMER = new StringToInteger(); + public static final Transformer NOOP_TRANSFORMER = TransformerUtils.nopTransformer(); + public static final Transformer STRING_TO_INTEGER_TRANSFORMER = new StringToInteger(); public TestTransformedCollection(String testName) { super(testName); @@ -61,22 +61,22 @@ public class TestTransformedCollection extends AbstractTestCollection { } //----------------------------------------------------------------------- - public Collection makeConfirmedCollection() { - return new ArrayList(); + public Collection makeConfirmedCollection() { + return new ArrayList(); } - public Collection makeConfirmedFullCollection() { - List list = new ArrayList(); + public Collection makeConfirmedFullCollection() { + List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return list; } - public Collection makeCollection() { - return TransformedCollection.decorate(new ArrayList(), NOOP_TRANSFORMER); + public Collection makeCollection() { + return TransformedCollection.decorate(new ArrayList(), NOOP_TRANSFORMER); } - public Collection makeFullCollection() { - List list = new ArrayList(); + public Collection makeFullCollection() { + List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return TransformedCollection.decorate(list, NOOP_TRANSFORMER); } @@ -92,7 +92,7 @@ public class TestTransformedCollection extends AbstractTestCollection { //----------------------------------------------------------------------- public void testTransformedCollection() { - Collection coll = TransformedCollection.decorate(new ArrayList(), STRING_TO_INTEGER_TRANSFORMER); + Collection coll = TransformedCollection.decorate(new ArrayList(), STRING_TO_INTEGER_TRANSFORMER); assertEquals(0, coll.size()); Object[] els = getFullElements(); for (int i = 0; i < els.length; i++) { diff --git a/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java b/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java index 1ec919157..2a422da61 100644 --- a/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java @@ -34,7 +34,7 @@ import junit.framework.TestSuite; * @author Phil Steitz * @author Stephen Colebourne */ -public class TestUnmodifiableCollection extends AbstractTestCollection { +public class TestUnmodifiableCollection extends AbstractTestCollection { public TestUnmodifiableCollection(String testName) { super(testName); @@ -50,23 +50,23 @@ public class TestUnmodifiableCollection extends AbstractTestCollection { } //----------------------------------------------------------------------- - public Collection makeCollection() { - return UnmodifiableCollection.decorate(new ArrayList()); + public Collection makeCollection() { + return UnmodifiableCollection.decorate(new ArrayList()); } - public Collection makeFullCollection() { - List list = new ArrayList(); + public Collection makeFullCollection() { + List list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return UnmodifiableCollection.decorate(list); } - public Collection makeConfirmedCollection() { - ArrayList list = new ArrayList(); + public Collection makeConfirmedCollection() { + ArrayList list = new ArrayList(); return list; } - public Collection makeConfirmedFullCollection() { - ArrayList list = new ArrayList(); + public Collection makeConfirmedFullCollection() { + ArrayList list = new ArrayList(); list.addAll(Arrays.asList(getFullElements())); return list; }