From a3155911c27ec3c4268aee6369dfa15c4acc4708 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Thu, 2 Oct 2003 22:14:35 +0000 Subject: [PATCH] Rename TestObject to AbstractTestObject Rename TestCollection to AbstractTestCollection Rename TestList to AbstractTestList Javadoc and tidy git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131219 13f79535-47bb-0310-9956-ffa450edef68 --- ...ction.java => AbstractTestCollection.java} | 82 ++++--- .../{TestList.java => AbstractTestList.java} | 221 +++++++++--------- ...estObject.java => AbstractTestObject.java} | 193 ++++++++------- .../apache/commons/collections/BulkTest.java | 134 +++++++---- .../commons/collections/TestArrayList.java | 10 +- .../apache/commons/collections/TestBag.java | 10 +- .../commons/collections/TestBinaryHeap.java | 10 +- .../collections/TestBoundedFifoBuffer.java | 4 +- .../commons/collections/TestBufferUtils.java | 8 +- .../collections/TestCircularFifoBuffer.java | 6 +- .../collections/TestCollectionUtils.java | 10 +- .../collections/TestCursorableLinkedList.java | 10 +- .../commons/collections/TestLinkedList.java | 10 +- .../commons/collections/TestListUtils.java | 8 +- .../apache/commons/collections/TestMap.java | 12 +- .../apache/commons/collections/TestSet.java | 10 +- .../collections/TestUnboundedFifoBuffer.java | 8 +- .../comparators/AbstractTestComparator.java | 6 +- .../decorators/TestBlockingBuffer.java | 8 +- .../decorators/TestFixedSizeList.java | 8 +- .../decorators/TestPredicatedCollection.java | 6 +- .../decorators/TestPredicatedList.java | 8 +- .../decorators/TestTransformedCollection.java | 8 +- .../decorators/TestTransformedList.java | 8 +- .../iterators/AbstractTestIterator.java | 8 +- .../observed/TestObservableBuffer.java | 8 +- .../observed/TestObservableCollection.java | 8 +- .../observed/TestObservableList.java | 8 +- .../primitives/TestAbstractLongArrayList.java | 8 +- .../collections/primitives/TestByteList.java | 8 +- .../collections/primitives/TestCharList.java | 8 +- .../primitives/TestDoubleList.java | 8 +- .../collections/primitives/TestFloatList.java | 8 +- .../collections/primitives/TestIntList.java | 8 +- .../collections/primitives/TestLongList.java | 8 +- .../collections/primitives/TestShortList.java | 8 +- .../TestByteCollectionCollection.java | 8 +- .../primitives/adapters/TestByteListList.java | 8 +- .../TestCharCollectionCollection.java | 8 +- .../primitives/adapters/TestCharListList.java | 8 +- .../TestCollectionByteCollection.java | 8 +- .../TestCollectionCharCollection.java | 8 +- .../TestCollectionDoubleCollection.java | 8 +- .../TestCollectionFloatCollection.java | 8 +- .../adapters/TestCollectionIntCollection.java | 8 +- .../TestCollectionLongCollection.java | 8 +- .../TestCollectionShortCollection.java | 8 +- .../TestDoubleCollectionCollection.java | 8 +- .../adapters/TestDoubleListList.java | 8 +- .../TestFloatCollectionCollection.java | 8 +- .../adapters/TestFloatListList.java | 8 +- .../adapters/TestIntCollectionCollection.java | 8 +- .../primitives/adapters/TestIntListList.java | 8 +- .../TestLongCollectionCollection.java | 8 +- .../primitives/adapters/TestLongListList.java | 8 +- .../TestShortCollectionCollection.java | 8 +- .../adapters/TestShortListList.java | 8 +- 57 files changed, 541 insertions(+), 521 deletions(-) rename src/test/org/apache/commons/collections/{TestCollection.java => AbstractTestCollection.java} (96%) rename src/test/org/apache/commons/collections/{TestList.java => AbstractTestList.java} (87%) rename src/test/org/apache/commons/collections/{TestObject.java => AbstractTestObject.java} (71%) diff --git a/src/test/org/apache/commons/collections/TestCollection.java b/src/test/org/apache/commons/collections/AbstractTestCollection.java similarity index 96% rename from src/test/org/apache/commons/collections/TestCollection.java rename to src/test/org/apache/commons/collections/AbstractTestCollection.java index d8f722601..7ff93ff03 100644 --- a/src/test/org/apache/commons/collections/TestCollection.java +++ b/src/test/org/apache/commons/collections/AbstractTestCollection.java @@ -1,13 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestCollection.java,v 1.15 2003/08/31 17:28:43 scolebourne Exp $ - * $Revision: 1.15 $ - * $Date: 2003/08/31 17:28:43 $ - * + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/AbstractTestCollection.java,v 1.1 2003/10/02 22:14:29 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999-2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,7 +33,7 @@ * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. + * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -73,45 +70,45 @@ import java.util.Map; import java.util.NoSuchElementException; /** - * Tests base {@link java.util.Collection} methods and contracts. + * Abstract test class for the {@link java.util.Collection} methods and contracts. *

* You should create a concrete subclass of this class to test any custom * {@link Collection} implementation. At minimum, you'll have to * implement the {@link #makeCollection()} method. You might want to * override some of the additional protected methods as well: *

- * Element Population Methods + * Element Population Methods *

* Override these if your collection restricts what kind of elements are - * allowed (for instance, if null is not permitted): - *

+ * allowed (for instance, if null is not permitted): + * *

- * Supported Operation Methods + * Supported Operation Methods *

* Override these if your collection doesn't support certain operations: - *

*

- * Fixture Methods + * Fixture Methods *

* Fixtures are used to verify that the the operation results in correct state * for the collection. Basically, the operation is performed against your * collection implementation, and an identical operation is performed against a - * confirmed collection implementation. A confirmed collection - * implementation is something like java.util.ArrayList, which is + * confirmed collection implementation. A confirmed collection + * implementation is something like java.util.ArrayList, which is * known to conform exactly to its collection interface's contract. After the * operation takes place on both your collection implementation and the * confirmed collection implementation, the two collections are compared to see * if their state is identical. The comparison is usually much more involved - * than a simple equals test. This verification is used to ensure + * than a simple equals test. This verification is used to ensure * proper modifications are made along with ensuring that the collection does * not change when read-only modifications are made. *

@@ -130,10 +127,10 @@ import java.util.NoSuchElementException; *

* If you're extending this class directly, you will have to provide * implementations for the following: - *

+ * *

* Those methods should provide a confirmed collection implementation * that's compatible with your collection implementation. @@ -143,20 +140,21 @@ import java.util.NoSuchElementException; * above methods, because those three classes already override the methods * to provide standard JDK confirmed collections.

*

- * Other notes + * Other notes *

* If your {@link Collection} fails one of these tests by design, * you may still use this base set of cases. Simply override the * test case (method) your {@link Collection} fails. * + * @version $Revision: 1.1 $ $Date: 2003/10/02 22:14:29 $ + * * @author Rodney Waldhoff * @author Paul Jack - * @author Michael A. Smith + * @author Michael A. Smith * @author Neil O'Toole * @author Stephen Colebourne - * @version $Id: TestCollection.java,v 1.15 2003/08/31 17:28:43 scolebourne Exp $ */ -public abstract class TestCollection extends TestObject { +public abstract class AbstractTestCollection extends AbstractTestObject { // // NOTE: @@ -188,11 +186,11 @@ public abstract class TestCollection extends TestObject { protected Collection confirmed; /** - * Constructor. + * JUnit constructor. * - * @param testName the test name + * @param testName the test class name */ - public TestCollection(String testName) { + public AbstractTestCollection(String testName) { super(testName); } @@ -226,7 +224,7 @@ public abstract class TestCollection extends TestObject { /** * Returns true if the collections produced by * {@link #makeCollection()} and {@link #makeFullCollection()} - * support the add and addAll + * support the add and addAll * operations.

* Default implementation returns true. Override if your collection * class does not support add or addAll. @@ -238,9 +236,9 @@ public abstract class TestCollection extends TestObject { /** * Returns true if the collections produced by * {@link #makeCollection()} and {@link #makeFullCollection()} - * support the remove, removeAll, - * retainAll, clear and - * iterator().remove() methods. + * support the remove, removeAll, + * retainAll, clear and + * iterator().remove() methods. * Default implementation returns true. Override if your collection * class does not support removal operations. */ @@ -387,7 +385,7 @@ public abstract class TestCollection extends TestObject { * Returns a full collection to be used for testing. The collection * returned by this method should contain every element returned by * {@link #getFullElements()}. The default implementation, in fact, - * simply invokes addAll on an empty collection with + * simply invokes addAll on an empty collection with * the results of {@link #getFullElements()}. Override this default * if your collection doesn't support addAll. */ @@ -598,7 +596,7 @@ public abstract class TestCollection extends TestObject { /** * If {@link #isAddSupported()} returns false, tests that add operations - * raise UnsupportedOperationException. + * raise UnsupportedOperationException. */ public void testUnsupportedAdd() { if (isAddSupported()) return; @@ -1158,7 +1156,7 @@ public abstract class TestCollection extends TestObject { /** - * Tests toString on a collection. + * Tests toString on a collection. */ public void testCollectionToString() { resetEmpty(); diff --git a/src/test/org/apache/commons/collections/TestList.java b/src/test/org/apache/commons/collections/AbstractTestList.java similarity index 87% rename from src/test/org/apache/commons/collections/TestList.java rename to src/test/org/apache/commons/collections/AbstractTestList.java index 32bddef08..f0d6688bf 100644 --- a/src/test/org/apache/commons/collections/TestList.java +++ b/src/test/org/apache/commons/collections/AbstractTestList.java @@ -1,10 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestList.java,v 1.20 2003/09/20 17:00:32 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/AbstractTestList.java,v 1.1 2003/10/02 22:14:29 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -73,29 +73,31 @@ import java.util.ListIterator; import java.util.NoSuchElementException; /** - * Tests base {@link java.util.List} methods and contracts. + * Abstract test class for {@link java.util.List} methods and contracts. *

* To use, simply extend this class, and implement * the {@link #makeList} method. *

* If your {@link List} fails one of these tests by design, * you may still use this base set of cases. Simply override the - * test case (method) your {@link List} fails. + * test case (method) your {@link List} fails or override one of the + * protected methods from AbstractTestCollection. * - * @version $Revision: 1.20 $ $Date: 2003/09/20 17:00:32 $ + * @version $Revision: 1.1 $ $Date: 2003/10/02 22:14:29 $ * * @author Rodney Waldhoff * @author Paul Jack * @author Stephen Colebourne * @author Neil O'Toole */ -public abstract class TestList extends TestCollection { +public abstract class AbstractTestList extends AbstractTestCollection { /** - * Constructor. - * @param testName + * JUnit constructor. + * + * @param testName the test class name */ - public TestList(String testName) { + public AbstractTestList(String testName) { super(testName); } @@ -103,7 +105,7 @@ public abstract class TestList extends TestCollection { /** * Returns true if the collections produced by * {@link #makeCollection()} and {@link #makeFullCollection()} - * support the set operation.

+ * support the set operation.

* Default implementation returns true. Override if your collection * class does not support set. */ @@ -125,8 +127,7 @@ public abstract class TestList extends TestCollection { assertEquals("List should equal confirmed", list1, list2); assertEquals("Confirmed should equal list", list2, list1); - assertEquals("Hash codes should be equal", - list1.hashCode(), list2.hashCode()); + assertEquals("Hash codes should be equal", list1.hashCode(), list2.hashCode()); int i = 0; Iterator iterator1 = list1.iterator(); @@ -147,7 +148,7 @@ public abstract class TestList extends TestCollection { //----------------------------------------------------------------------- /** - * Returns an empty {@link ArrayList}. + * Returns an empty {@link ArrayList}. */ protected Collection makeConfirmedCollection() { ArrayList list = new ArrayList(); @@ -155,7 +156,7 @@ public abstract class TestList extends TestCollection { } /** - * Returns a full {@link ArrayList}. + * Returns a full {@link ArrayList}. */ protected Collection makeConfirmedFullCollection() { ArrayList list = new ArrayList(); @@ -164,16 +165,16 @@ public abstract class TestList extends TestCollection { } /** - * Return a new, empty {@link List} to be used for testing. + * Return a new, empty {@link List} to be used for testing. * - * @return an empty list for testing. + * @return an empty list for testing. */ protected abstract List makeEmptyList(); /** - * Return a new, full {@link List} to be used for testing. + * Return a new, full {@link List} to be used for testing. * - * @return a full list for testing + * @return a full list for testing */ protected List makeFullList() { // only works if list supports optional "addAll(Collection)" @@ -183,40 +184,40 @@ public abstract class TestList extends TestCollection { } /** - * Returns {@link makeEmptyList()}. + * Returns {@link makeEmptyList()}. * - * @return an empty list to be used for testing + * @return an empty list to be used for testing */ - final protected Collection makeCollection() { + protected final Collection makeCollection() { return makeEmptyList(); } /** - * Returns {@link makeFullList()}. + * Returns {@link makeFullList()}. * - * @return a full list to be used for testing + * @return a full list to be used for testing */ - final protected Collection makeFullCollection() { + protected final Collection makeFullCollection() { return makeFullList(); } //----------------------------------------------------------------------- /** - * Returns the {@link collection} field cast to a {@link List}. + * Returns the {@link collection} field cast to a {@link List}. * - * @return the collection field as a List + * @return the collection field as a List */ protected List getList() { - return (List)collection; - } + return (List) collection; + } /** - * Returns the {@link confirmed} field cast to a {@link List}. + * Returns the {@link confirmed} field cast to a {@link List}. * - * @return the confirmed field as a List + * @return the confirmed field as a List */ protected List getConfirmedList() { - return (List)confirmed; + return (List) confirmed; } //----------------------------------------------------------------------- @@ -225,7 +226,9 @@ public abstract class TestList extends TestCollection { * empty list. */ public void testListAddByIndexBoundsChecking() { - if (!isAddSupported()) return; + if (!isAddSupported()) { + return; + } List list; Object element = getOtherElements()[0]; @@ -233,9 +236,8 @@ public abstract class TestList extends TestCollection { try { list = makeEmptyList(); list.add(Integer.MIN_VALUE, element); - fail("List.add should throw IndexOutOfBoundsException " + - "[Integer.MIN_VALUE]"); - } catch(IndexOutOfBoundsException e) { + fail("List.add should throw IndexOutOfBoundsException [Integer.MIN_VALUE]"); + } catch (IndexOutOfBoundsException e) { // expected } @@ -243,7 +245,7 @@ public abstract class TestList extends TestCollection { list = makeEmptyList(); list.add(-1, element); fail("List.add should throw IndexOutOfBoundsException [-1]"); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // expected } @@ -251,27 +253,27 @@ public abstract class TestList extends TestCollection { list = makeEmptyList(); list.add(1, element); fail("List.add should throw IndexOutOfBoundsException [1]"); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // expected } try { list = makeEmptyList(); list.add(Integer.MAX_VALUE, element); - fail("List.add should throw IndexOutOfBoundsException " + - "[Integer.MAX_VALUE]"); - } catch(IndexOutOfBoundsException e) { + fail("List.add should throw IndexOutOfBoundsException [Integer.MAX_VALUE]"); + } catch (IndexOutOfBoundsException e) { // expected } } - /** * Tests bounds checking for {@link List#add(int, Object)} on a * full list. */ public void testListAddByIndexBoundsChecking2() { - if (!isAddSupported()) return; + if (!isAddSupported()) { + return; + } List list; Object element = getOtherElements()[0]; @@ -279,9 +281,8 @@ public abstract class TestList extends TestCollection { try { list = makeFullList(); list.add(Integer.MIN_VALUE, element); - fail("List.add should throw IndexOutOfBoundsException " + - "[Integer.MIN_VALUE]"); - } catch(IndexOutOfBoundsException e) { + fail("List.add should throw IndexOutOfBoundsException [Integer.MIN_VALUE]"); + } catch (IndexOutOfBoundsException e) { // expected } @@ -289,7 +290,7 @@ public abstract class TestList extends TestCollection { list = makeFullList(); list.add(-1, element); fail("List.add should throw IndexOutOfBoundsException [-1]"); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // expected } @@ -297,81 +298,80 @@ public abstract class TestList extends TestCollection { list = makeFullList(); list.add(list.size() + 1, element); fail("List.add should throw IndexOutOfBoundsException [size + 1]"); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // expected } try { list = makeFullList(); list.add(Integer.MAX_VALUE, element); - fail("List.add should throw IndexOutOfBoundsException " + - "[Integer.MAX_VALUE]"); - } catch(IndexOutOfBoundsException e) { + fail("List.add should throw IndexOutOfBoundsException [Integer.MAX_VALUE]"); + } catch (IndexOutOfBoundsException e) { // expected } - } - /** * Tests {@link List#add(int,Object)}. */ public void testListAddByIndex() { - if (!isAddSupported()) return; + if (!isAddSupported()) { + return; + } Object element = getOtherElements()[0]; int max = getFullElements().length; for (int i = 0; i <= max; i++) { resetFull(); - ((List)collection).add(i, element); - ((List)confirmed).add(i, element); + ((List) collection).add(i, element); + ((List) confirmed).add(i, element); verify(); } } - /** * Tests {@link List#equals(Object)}. */ public void testListEquals() { resetEmpty(); List list = getList(); - assertTrue("Empty lists should be equal", list.equals(confirmed)); + assertEquals("Empty lists should be equal", true, list.equals(confirmed)); verify(); - assertTrue("Empty list should equal self", list.equals(list)); + assertEquals("Empty list should equal self", true, list.equals(list)); verify(); List list2 = Arrays.asList(getFullElements()); - assertTrue("Empty list shouldn't equal full", !list.equals(list2)); + assertEquals("Empty list shouldn't equal full", false, list.equals(list2)); verify(); list2 = Arrays.asList(getOtherElements()); - assertTrue("Empty list shouldn't equal other", !list.equals(list2)); + assertEquals("Empty list shouldn't equal other", false, list.equals(list2)); verify(); resetFull(); list = getList(); - assertTrue("Full lists should be equal", list.equals(confirmed)); + assertEquals("Full lists should be equal", true, list.equals(confirmed)); verify(); - assertTrue("Full list should equal self", list.equals(list)); + assertEquals("Full list should equal self", true, list.equals(list)); verify(); list2 = makeEmptyList(); - assertTrue("Full list shouldn't equal empty", !list.equals(list2)); + assertEquals("Full list shouldn't equal empty", false, list.equals(list2)); verify(); list2 = Arrays.asList(getOtherElements()); - assertTrue("Full list shouldn't equal other", !list.equals(list2)); + assertEquals("Full list shouldn't equal other", false, list.equals(list2)); verify(); list2 = Arrays.asList(getFullElements()); Collections.reverse(list2); - assertTrue("Full list shouldn't equal full list with same elements" + - " but different order", !list.equals(list2)); + assertEquals( + "Full list shouldn't equal full list with same elements but different order", + false, list.equals(list2)); verify(); - assertTrue("List shouldn't equal String", !list.equals("")); + assertEquals("List shouldn't equal String", false, list.equals("")); verify(); final List listForC = Arrays.asList(getFullElements()); @@ -385,12 +385,10 @@ public abstract class TestList extends TestCollection { } }; - assertTrue("List shouldn't equal nonlist with same elements " + - " in same order", !list.equals(c)); + assertEquals("List shouldn't equal nonlist with same elements in same order", false, list.equals(c)); verify(); } - /** * Tests {@link List#hashCode()}. */ @@ -408,7 +406,6 @@ public abstract class TestList extends TestCollection { verify(); } - /** * Tests {@link List#get(int)}. */ @@ -417,13 +414,11 @@ public abstract class TestList extends TestCollection { List list = getList(); Object[] elements = getFullElements(); for (int i = 0; i < elements.length; i++) { - assertEquals("List should contain correct elements", - elements[i], list.get(i)); + assertEquals("List should contain correct elements", elements[i], list.get(i)); verify(); } } - /** * Tests bounds checking for {@link List#get(int)} on an * empty list. @@ -433,43 +428,40 @@ public abstract class TestList extends TestCollection { try { list.get(Integer.MIN_VALUE); - fail("List.get should throw IndexOutOfBoundsException " + - "[Integer.MIN_VALUE]"); - } catch(IndexOutOfBoundsException e) { + fail("List.get should throw IndexOutOfBoundsException [Integer.MIN_VALUE]"); + } catch (IndexOutOfBoundsException e) { // expected } try { list.get(-1); fail("List.get should throw IndexOutOfBoundsException [-1]"); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // expected } try { list.get(0); fail("List.get should throw IndexOutOfBoundsException [0]"); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // expected } try { list.get(1); fail("List.get should throw IndexOutOfBoundsException [1]"); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // expected } try { list.get(Integer.MAX_VALUE); - fail("List.get should throw IndexOutOfBoundsException " + - "[Integer.MAX_VALUE]"); - } catch(IndexOutOfBoundsException e) { + fail("List.get should throw IndexOutOfBoundsException [Integer.MAX_VALUE]"); + } catch (IndexOutOfBoundsException e) { // expected } } - /** * Tests bounds checking for {@link List#get(int)} on a * full list. @@ -479,36 +471,33 @@ public abstract class TestList extends TestCollection { try { list.get(Integer.MIN_VALUE); - fail("List.get should throw IndexOutOfBoundsException " + - "[Integer.MIN_VALUE]"); - } catch(IndexOutOfBoundsException e) { + fail("List.get should throw IndexOutOfBoundsException [Integer.MIN_VALUE]"); + } catch (IndexOutOfBoundsException e) { // expected } try { list.get(-1); fail("List.get should throw IndexOutOfBoundsException [-1]"); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // expected } try { list.get(getFullElements().length); fail("List.get should throw IndexOutOfBoundsException [size]"); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // expected } try { list.get(Integer.MAX_VALUE); - fail("List.get should throw IndexOutOfBoundsException " + - "[Integer.MAX_VALUE]"); - } catch(IndexOutOfBoundsException e) { + fail("List.get should throw IndexOutOfBoundsException [Integer.MAX_VALUE]"); + } catch (IndexOutOfBoundsException e) { // expected } } - /** * Tests {@link List#indexOf()}. */ @@ -520,20 +509,19 @@ public abstract class TestList extends TestCollection { Iterator iterator = list2.iterator(); while (iterator.hasNext()) { Object element = iterator.next(); - assertEquals("indexOf should return correct result", - list1.indexOf(element), list2.indexOf(element)); + assertEquals("indexOf should return correct result", + list1.indexOf(element), list2.indexOf(element)); verify(); } Object[] other = getOtherElements(); for (int i = 0; i < other.length; i++) { assertEquals("indexOf should return -1 for nonexistent element", - list1.indexOf(other[i]), -1); + list1.indexOf(other[i]), -1); verify(); } } - /** * Tests {@link List#lastIndexOf()}. */ @@ -558,51 +546,50 @@ public abstract class TestList extends TestCollection { } } - /** * Tests bounds checking for {@link List#set(int,Object)} on an * empty list. */ public void testListSetByIndexBoundsChecking() { - if (!isSetSupported()) return; + if (!isSetSupported()) { + return; + } List list = makeEmptyList(); Object element = getOtherElements()[0]; try { list.set(Integer.MIN_VALUE, element); - fail("List.set should throw IndexOutOfBoundsException " + - "[Integer.MIN_VALUE]"); - } catch(IndexOutOfBoundsException e) { + fail("List.set should throw IndexOutOfBoundsException [Integer.MIN_VALUE]"); + } catch (IndexOutOfBoundsException e) { // expected - } + } try { list.set(-1, element); fail("List.set should throw IndexOutOfBoundsException [-1]"); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // expected - } + } try { list.set(0, element); fail("List.set should throw IndexOutOfBoundsException [0]"); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // expected - } + } try { list.set(1, element); fail("List.set should throw IndexOutOfBoundsException [1]"); - } catch(IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException e) { // expected - } + } try { list.set(Integer.MAX_VALUE, element); - fail("List.set should throw IndexOutOfBoundsException " + - "[Integer.MAX_VALUE]"); - } catch(IndexOutOfBoundsException e) { + fail("List.set should throw IndexOutOfBoundsException [Integer.MAX_VALUE]"); + } catch (IndexOutOfBoundsException e) { // expected } } @@ -1013,8 +1000,8 @@ public abstract class TestList extends TestCollection { //----------------------------------------------------------------------- /** * Returns a {@link BulkTest} for testing {@link List#subList(int,int)}. - * The returned bulk test will run through every TestList - * method, including another bulkTestSubList. + * The returned bulk test will run through every TestList + * method, including another bulkTestSubList. * Sublists are tested until the size of the sublist is less than 10. * Each sublist is 6 elements smaller than its parent list. * (By default this means that two rounds of sublists will be tested). @@ -1027,12 +1014,12 @@ public abstract class TestList extends TestCollection { } - static class BulkTestSubList extends TestList { + static class BulkTestSubList extends AbstractTestList { - private TestList outer; + private AbstractTestList outer; - BulkTestSubList(TestList outer) { + BulkTestSubList(AbstractTestList outer) { super(""); this.outer = outer; } diff --git a/src/test/org/apache/commons/collections/TestObject.java b/src/test/org/apache/commons/collections/AbstractTestObject.java similarity index 71% rename from src/test/org/apache/commons/collections/TestObject.java rename to src/test/org/apache/commons/collections/AbstractTestObject.java index 8bfd8b25a..e721be0bb 100644 --- a/src/test/org/apache/commons/collections/TestObject.java +++ b/src/test/org/apache/commons/collections/AbstractTestObject.java @@ -1,10 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestObject.java,v 1.22 2003/08/31 17:28:43 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/AbstractTestObject.java,v 1.1 2003/10/02 22:14:29 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,7 +33,7 @@ * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. + * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -55,7 +55,6 @@ * . * */ - package org.apache.commons.collections; import java.io.ByteArrayInputStream; @@ -71,7 +70,7 @@ import java.io.OutputStream; import java.io.Serializable; /** - * Tests base {@link java.lang.Object} methods and contracts. + * Abstract test class for {@link java.lang.Object} methods and contracts. *

* To use, simply extend this class, and implement * the {@link #makeObject()} method. @@ -80,70 +79,102 @@ import java.io.Serializable; * you may still use this base set of cases. Simply override the * test case (method) your {@link Object} fails. * - * @author Rodney Waldhoff - * @author Anonymous + * @version $Revision: 1.1 $ $Date: 2003/10/02 22:14:29 $ * - * @version $Revision: 1.22 $ $Date: 2003/08/31 17:28:43 $ + * @author Rodney Waldhoff + * @author Stephen Colebourne + * @author Anonymous */ -public abstract class TestObject extends BulkTest { +public abstract class AbstractTestObject extends BulkTest { - // constructor - // ------------------------------------------------------------------------ + /** Current major release for Collections */ + public static final int COLLECTIONS_MAJOR_VERSION = 3; - public TestObject(String testName) { + /** + * JUnit constructor. + * + * @param testName the test class name + */ + public AbstractTestObject(String testName) { super(testName); } - // abstract - // ------------------------------------------------------------------------ - + //----------------------------------------------------------------------- /** - * Return a new, empty {@link Object} to used for testing. + * Implement this method to return the object to test. + * + * @return the object to test */ protected abstract Object makeObject(); - // tests - // ------------------------------------------------------------------------ - + /** + * Override this method if a subclass is testing an object + * that cannot serialize an "empty" Collection. + * (e.g. Comparators have no contents) + * + * @return true + */ + protected boolean supportsEmptyCollections() { + return true; + } + + /** + * Override this method if a subclass is testing an object + * that cannot serialize a "full" Collection. + * (e.g. Comparators have no contents) + * + * @return true + */ + protected boolean supportsFullCollections() { + return true; + } + + //----------------------------------------------------------------------- public void testObjectEqualsSelf() { Object obj = makeObject(); - assertEquals("A Object should equal itself",obj,obj); + assertEquals("A Object should equal itself", obj, obj); } public void testEqualsNull() { Object obj = makeObject(); - assertTrue(! obj.equals(null) ); // make sure this doesn't throw NPE either + assertEquals(false, obj.equals(null)); // make sure this doesn't throw NPE either } public void testObjectHashCodeEqualsSelfHashCode() { Object obj = makeObject(); - assertEquals("hashCode should be repeatable",obj.hashCode(),obj.hashCode()); + assertEquals("hashCode should be repeatable", obj.hashCode(), obj.hashCode()); } public void testObjectHashCodeEqualsContract() { Object obj1 = makeObject(); - if(obj1.equals(obj1)) { - assertEquals("[1] When two objects are equal, their hashCodes should be also.",obj1.hashCode(),obj1.hashCode()); + if (obj1.equals(obj1)) { + assertEquals( + "[1] When two objects are equal, their hashCodes should be also.", + obj1.hashCode(), obj1.hashCode()); } Object obj2 = makeObject(); - if(obj1.equals(obj2)) { - assertEquals("[2] When two objects are equal, their hashCodes should be also.",obj1.hashCode(),obj2.hashCode()); - assertTrue("When obj1.equals(obj2) is true, then obj2.equals(obj1) should also be true", obj2.equals(obj1)); + if (obj1.equals(obj2)) { + assertEquals( + "[2] When two objects are equal, their hashCodes should be also.", + obj1.hashCode(), obj2.hashCode()); + assertTrue( + "When obj1.equals(obj2) is true, then obj2.equals(obj1) should also be true", + obj2.equals(obj1)); } } public void testSerializeDeserializeThenCompare() throws Exception { Object obj = makeObject(); - if(obj instanceof Serializable) { + if (obj instanceof Serializable) { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); ObjectOutputStream out = new ObjectOutputStream(buffer); out.writeObject(obj); out.close(); - + ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(buffer.toByteArray())); Object dest = in.readObject(); in.close(); - assertEquals("obj != deserialize(serialize(obj))",obj,dest); + assertEquals("obj != deserialize(serialize(obj))", obj, dest); } } @@ -152,8 +183,8 @@ public abstract class TestObject extends BulkTest { * class can be serialized and de-serialized in memory, * using the handy makeObject() method * - * @exception IOException - * @exception ClassNotFoundException + * @throws IOException + * @throws ClassNotFoundException */ public void testSimpleSerialization() throws IOException, ClassNotFoundException { Object o = makeObject(); @@ -164,40 +195,39 @@ public abstract class TestObject extends BulkTest { } /** - * If the test object is serializable, confirm that - * a canonical form exists in CVS - * + * Tests serialization by comparing against a previously stored version in CVS. + * If the test object is serializable, confirm that a canonical form exists. */ public void testCanonicalEmptyCollectionExists() { - if(supportsEmptyCollections()) { + if (supportsEmptyCollections()) { Object object = makeObject(); - if(object instanceof Serializable) { + if (object instanceof Serializable) { String name = getCanonicalEmptyCollectionName(object); - assertTrue("Canonical empty collection (" + name + ") is not in CVS", - new File(name).exists()); + assertTrue( + "Canonical empty collection (" + name + ") is not in CVS", + new File(name).exists()); } } } /** - * If the test object is serializable, confirm that - * a canonical form exists in CVS - * + * Tests serialization by comparing against a previously stored version in CVS. + * If the test object is serializable, confirm that a canonical form exists. */ public void testCanonicalFullCollectionExists() { - if(supportsFullCollections()) { + if (supportsFullCollections()) { Object object = makeObject(); - if(object instanceof Serializable) { + if (object instanceof Serializable) { String name = getCanonicalFullCollectionName(object); - assertTrue("Canonical full collection (" + name + ") is not in CVS", - new File(name).exists()); + assertTrue( + "Canonical full collection (" + name + ") is not in CVS", + new File(name).exists()); } } } - // protected - // ------------------------------------------------------------------------ - + // protected implementation + //----------------------------------------------------------------------- /** * Get the version of Collections that this object tries to * maintain serialization compatibility with. Defaults to 1, the @@ -218,33 +248,11 @@ public abstract class TestObject extends BulkTest { return "1"; } - /** - * Override this method if a subclass is testing a - * Collections that cannot serialize an "empty" Collection - * (e.g. Comparators have no contents) - * - * @return true - */ - protected boolean supportsEmptyCollections() { - return true; - } - - /** - * Override this method if a subclass is testing a - * Collections that cannot serialize a "full" Collection - * (e.g. Comparators have no contents) - * - * @return true - */ - protected boolean supportsFullCollections() { - return true; - } - protected String getCanonicalEmptyCollectionName(Object object) { StringBuffer retval = new StringBuffer(); retval.append("data/test/"); String colName = object.getClass().getName(); - colName = colName.substring(colName.lastIndexOf(".")+1,colName.length()); + colName = colName.substring(colName.lastIndexOf(".") + 1, colName.length()); retval.append(colName); retval.append(".emptyCollection.version"); retval.append(getCompatibilityVersion()); @@ -256,7 +264,7 @@ public abstract class TestObject extends BulkTest { StringBuffer retval = new StringBuffer(); retval.append("data/test/"); String colName = object.getClass().getName(); - colName = colName.substring(colName.lastIndexOf(".")+1,colName.length()); + colName = colName.substring(colName.lastIndexOf(".") + 1, colName.length()); retval.append(colName); retval.append(".fullCollection.version"); retval.append(getCompatibilityVersion()); @@ -276,10 +284,9 @@ public abstract class TestObject extends BulkTest { * @param path path to write the serialized Object * @exception IOException */ - protected void writeExternalFormToDisk(Serializable o, String path) - throws IOException { + protected void writeExternalFormToDisk(Serializable o, String path) throws IOException { FileOutputStream fileStream = new FileOutputStream(path); - writeExternalFormToStream(o,fileStream); + writeExternalFormToStream(o, fileStream); } /** @@ -290,19 +297,12 @@ public abstract class TestObject extends BulkTest { * @return serialized form of the Object * @exception IOException */ - protected byte[] writeExternalFormToBytes(Serializable o) - throws IOException { + protected byte[] writeExternalFormToBytes(Serializable o) throws IOException { ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); - writeExternalFormToStream(o,byteStream); + writeExternalFormToStream(o, byteStream); return byteStream.toByteArray(); } - private Object readExternalFormFromStream(InputStream stream) - throws IOException, ClassNotFoundException { - ObjectInputStream oStream = new ObjectInputStream(stream); - return oStream.readObject(); - } - /** * Reads a Serialized or Externalized Object from disk. * Useful for creating compatibility tests between @@ -313,8 +313,7 @@ public abstract class TestObject extends BulkTest { * @exception IOException * @exception ClassNotFoundException */ - protected Object readExternalFormFromDisk(String path) - throws IOException, ClassNotFoundException { + protected Object readExternalFormFromDisk(String path) throws IOException, ClassNotFoundException { FileInputStream stream = new FileInputStream(path); return readExternalFormFromStream(stream); } @@ -328,8 +327,7 @@ public abstract class TestObject extends BulkTest { * @exception IOException * @exception ClassNotFoundException */ - protected Object readExternalFormFromBytes(byte[] b) - throws IOException, ClassNotFoundException { + protected Object readExternalFormFromBytes(byte[] b) throws IOException, ClassNotFoundException { ByteArrayInputStream stream = new ByteArrayInputStream(b); return readExternalFormFromStream(stream); } @@ -338,19 +336,16 @@ public abstract class TestObject extends BulkTest { return Boolean.getBoolean("org.apache.commons.collections:with-clover"); } - // private - // ------------------------------------------------------------------------ + // private implementation + //----------------------------------------------------------------------- + private Object readExternalFormFromStream(InputStream stream) throws IOException, ClassNotFoundException { + ObjectInputStream oStream = new ObjectInputStream(stream); + return oStream.readObject(); + } - private void writeExternalFormToStream(Serializable o, OutputStream stream) - throws IOException { + private void writeExternalFormToStream(Serializable o, OutputStream stream) throws IOException { ObjectOutputStream oStream = new ObjectOutputStream(stream); oStream.writeObject(o); } - // attributes - // ------------------------------------------------------------------------ - - // current major release for Collections - public static final int COLLECTIONS_MAJOR_VERSION = 2; - } diff --git a/src/test/org/apache/commons/collections/BulkTest.java b/src/test/org/apache/commons/collections/BulkTest.java index b3b2ccb89..ae78fce78 100644 --- a/src/test/org/apache/commons/collections/BulkTest.java +++ b/src/test/org/apache/commons/collections/BulkTest.java @@ -1,6 +1,62 @@ +/* + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/BulkTest.java,v 1.5 2003/10/02 22:14:29 scolebourne Exp $ + * ==================================================================== + * + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowledgement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgement may appear in the software itself, + * if and wherever such third-party acknowledgements normally appear. + * + * 4. The names "The Jakarta Project", "Commons", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ package org.apache.commons.collections; - import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -12,24 +68,23 @@ import java.util.List; import junit.framework.TestCase; import junit.framework.TestSuite; - /** - * A {@link TestCase} that can define both simple and bulk test methods.

+ * A {@link TestCase} that can define both simple and bulk test methods. + *

+ * A simple test method is the type of test traditionally + * supplied by by {@link TestCase}. To define a simple test, create a public + * no-argument method whose name starts with "test". You can specify the + * the name of simple test in the constructor of BulkTest; + * a subsequent call to {@link TestCase#run} will run that simple test. + *

+ * A bulk test method, on the other hand, returns a new instance + * of BulkTest, which can itself define new simple and bulk + * test methods. By using the {@link #makeSuite} method, you can + * automatically create a hierarchal suite of tests and child bulk tests. + *

+ * For instance, consider the following two classes: * - * A simple test method is the type of test traditionally - * supplied by by {@link TestCase}. To define a simple test, create a public - * no-argument method whose name starts with "test". You can specify the - * the name of simple test in the constructor of BulkTest; - * a subsequent call to {@link TestCase#run} will run that simple test.

- * - * A bulk test method, on the other hand, returns a new instance - * of BulkTest, which can itself define new simple and bulk - * test methods. By using the {@link #makeSuite} method, you can - * automatically create a hierarchal suite of tests and child bulk tests.

- * - * For instance, consider the following two classes: - * - * 

+ * 
  *  public class TestSet extends BulkTest {
  *
  *      private Set set;
@@ -75,10 +130,10 @@ import junit.framework.TestSuite;
  *  }
  *  

  *
- *  In the above examples, TestSet defines two
- *  simple test methods and no bulk test methods; TestHashMap
+ *  In the above examples, TestSet defines two
+ *  simple test methods and no bulk test methods; TestHashMap
  *  defines one simple test method and two bulk test methods.  When
- *  makeSuite(TestHashMap.class).run is executed, 
+ *  makeSuite(TestHashMap.class).run is executed, 
  *  five simple test methods will be run, in this order:

  *
  *  
    
@@ -110,17 +165,17 @@ import junit.framework.TestSuite;
  *  
  *
  *  A subclass can override a superclass's bulk test by
- *  returning null from the bulk test method.  If you only
+ *  returning null from the bulk test method.  If you only
  *  want to override specific simple tests within a bulk test, use the
  *  {@link #ignoredSimpleTests} method.
    
  *
  *  Note that if you want to use the bulk test methods, you must
- *  define your suite() method to use {@link #makeSuite}.
+ *  define your suite() method to use {@link #makeSuite}.
  *  The ordinary {@link TestSuite} constructor doesn't know how to 
  *  interpret bulk test methods.
  *
  *  @author Paul Jack
- *  @version $Id: BulkTest.java,v 1.4 2003/08/31 13:09:53 scolebourne Exp $
+ *  @version $Id: BulkTest.java,v 1.5 2003/10/02 22:14:29 scolebourne Exp $
  */
 public class BulkTest extends TestCase implements Cloneable {
 
@@ -144,7 +199,7 @@ public class BulkTest extends TestCase implements Cloneable {
 
 
     /**
-     *  Constructs a new BulkTest instance that will run the
+     *  Constructs a new BulkTest instance that will run the
      *  specified simple test.
      *
      *  @param name  the name of the simple test method to run
@@ -156,9 +211,9 @@ public class BulkTest extends TestCase implements Cloneable {
 
 
     /**
-     *  Creates a clone of this BulkTest.
    
+     *  Creates a clone of this BulkTest.
    
      *
-     *  @return  a clone of this BulkTest
+     *  @return  a clone of this BulkTest
      */
     public Object clone() {
         try {
@@ -172,12 +227,12 @@ public class BulkTest extends TestCase implements Cloneable {
     /**
      *  Returns an array of simple test names to ignore.
    
      *
-     *  If a simple test that's defined by this BulkTest or
+     *  If a simple test that's defined by this BulkTest or
      *  by one of its bulk test methods has a name that's in the returned
      *  array, then that simple test will not be executed.
    
      *
      *  A simple test's name is formed by taking the class name of the
-     *  root BulkTest, eliminating the package name, then
+     *  root BulkTest, eliminating the package name, then
      *  appending the names of any bulk test methods that were invoked
      *  to get to the simple test, and then appending the simple test
      *  method name.  The method names are delimited by periods:
@@ -187,7 +242,7 @@ public class BulkTest extends TestCase implements Cloneable {
      *
* * is the name of one of the simple tests defined in the sample classes - * described above. If the sample TestHashMap class + * described above. If the sample TestHashMap class * included this method: * * 
@@ -208,9 +263,9 @@ public class BulkTest extends TestCase implements Cloneable {
 
 
     /**
-     *  Returns the display name of this BulkTest.
+     *  Returns the display name of this BulkTest.
      *
-     *  @return the display name of this BulkTest
+     *  @return the display name of this BulkTest
      */
     public String toString() {
         return getName() + "(" + verboseName + ") ";
@@ -225,7 +280,7 @@ public class BulkTest extends TestCase implements Cloneable {
      *  bulk tests are also examined recursively; and the results are stored
      *  in a hierarchal {@link TestSuite}.

      *
-     *  The given class must be a subclass of BulkTest and must
+     *  The given class must be a subclass of BulkTest and must
      *  not be abstract.

      *
      *  @param c  the class to examine for simple and bulk tests
@@ -250,26 +305,21 @@ public class BulkTest extends TestCase implements Cloneable {
 // it easier to handle the recursion.
 class BulkTestSuiteMaker {
 
-
     /** The class that defines simple and bulk tests methods. */
     private Class startingClass;
 
-
     /** List of ignored simple test names. */
     private List ignored;
-
    
     /** The TestSuite we're currently populating.  Can change over time. */
     private TestSuite result;
 
-
     /** 
      *  The prefix for simple test methods.  Used to check if a test is in 
      *  the ignored list.
      */ 
     private String prefix;
 
-
     /** 
      *  Constructor.
      *
@@ -279,7 +329,6 @@ class BulkTestSuiteMaker {
         this.startingClass = startingClass;
     }
 
-
     /**
      *  Makes a hierarchal TestSuite based on the starting class.
      *
@@ -300,7 +349,6 @@ class BulkTestSuiteMaker {
          return result;
     }
 
-
     /**
      *  Appends all the simple tests and bulk tests defined by the given
      *  instance's class to the current TestSuite.
@@ -317,7 +365,6 @@ class BulkTestSuiteMaker {
         }
     }
 
-
     /**
      *  Adds the simple test defined by the given method to the TestSuite.
      *
@@ -334,7 +381,6 @@ class BulkTestSuiteMaker {
         result.addTest(bulk2);
     }
 
-
     /**
      *  Adds a whole new suite of tests that are defined by the result of
      *  the given bulk test method.  In other words, the given bulk test
@@ -372,7 +418,6 @@ class BulkTestSuiteMaker {
         result = oldResult;
     }
 
-
     /**
      *  Returns the base name of the given class.
      *
@@ -401,7 +446,6 @@ class BulkTestSuiteMaker {
         }
     }
 
-
     private static BulkTest makeTestCase(Class c, Method m) {
         Constructor con = getTestCaseConstructor(c);
         try {
@@ -416,7 +460,6 @@ class BulkTestSuiteMaker {
         }
     }
 
-
     private static BulkTest makeFirstTestCase(Class c) {
         Method[] all = c.getMethods();
         for (int i = 0; i < all.length; i++) {
@@ -426,7 +469,6 @@ class BulkTestSuiteMaker {
           + " at least one test method.");
     }
 
-
     /**
      *  Returns true if the given method is a simple test method.
      */
@@ -440,7 +482,6 @@ class BulkTestSuiteMaker {
         return true;
     }
 
-
     /**
      *  Returns true if the given method is a bulk test method.
      */
@@ -454,5 +495,4 @@ class BulkTestSuiteMaker {
         return true;
     }
 
-
 }
diff --git a/src/test/org/apache/commons/collections/TestArrayList.java b/src/test/org/apache/commons/collections/TestArrayList.java
index 2072745e3..fb85d9f13 100644
--- a/src/test/org/apache/commons/collections/TestArrayList.java
+++ b/src/test/org/apache/commons/collections/TestArrayList.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestArrayList.java,v 1.7 2003/08/31 17:28:43 scolebourne Exp $
- * $Revision: 1.7 $
- * $Date: 2003/08/31 17:28:43 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestArrayList.java,v 1.8 2003/10/02 22:14:29 scolebourne Exp $
+ * $Revision: 1.8 $
+ * $Date: 2003/10/02 22:14:29 $
  *
  * ====================================================================
  *
@@ -68,9 +68,9 @@ import junit.framework.TestSuite;
 
 /**
  * @author Jason van Zyl
- * @version $Id: TestArrayList.java,v 1.7 2003/08/31 17:28:43 scolebourne Exp $
+ * @version $Id: TestArrayList.java,v 1.8 2003/10/02 22:14:29 scolebourne Exp $
  */
-public abstract class TestArrayList extends TestList
+public abstract class TestArrayList extends AbstractTestList
 {
     public TestArrayList(String testName)
     {
diff --git a/src/test/org/apache/commons/collections/TestBag.java b/src/test/org/apache/commons/collections/TestBag.java
index 8add15432..ac705402f 100644
--- a/src/test/org/apache/commons/collections/TestBag.java
+++ b/src/test/org/apache/commons/collections/TestBag.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestBag.java,v 1.6 2003/08/31 17:28:43 scolebourne Exp $
- * $Revision: 1.6 $
- * $Date: 2003/08/31 17:28:43 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestBag.java,v 1.7 2003/10/02 22:14:29 scolebourne Exp $
+ * $Revision: 1.7 $
+ * $Date: 2003/10/02 22:14:29 $
  *
  * ====================================================================
  *
@@ -77,13 +77,13 @@ import java.util.List;
  * test case (method) your {@link Bag} fails.
  *
  * @author Chuck Burdick
- * @version $Id: TestBag.java,v 1.6 2003/08/31 17:28:43 scolebourne Exp $
+ * @version $Id: TestBag.java,v 1.7 2003/10/02 22:14:29 scolebourne Exp $
  */
 // TODO: this class should really extend from TestCollection, but the bag
 // implementations currently do not conform to the Collection interface.  Once
 // those are fixed or at least a strategy is made for resolving the issue, this
 // can be changed back to extend TestCollection instead.
-public abstract class TestBag extends TestObject {
+public abstract class TestBag extends AbstractTestObject {
     public TestBag(String testName) {
         super(testName);
     }
diff --git a/src/test/org/apache/commons/collections/TestBinaryHeap.java b/src/test/org/apache/commons/collections/TestBinaryHeap.java
index bb6659e41..e3e32c14d 100644
--- a/src/test/org/apache/commons/collections/TestBinaryHeap.java
+++ b/src/test/org/apache/commons/collections/TestBinaryHeap.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBinaryHeap.java,v 1.9 2003/08/31 17:28:43 scolebourne Exp $
- * $Revision: 1.9 $
- * $Date: 2003/08/31 17:28:43 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBinaryHeap.java,v 1.10 2003/10/02 22:14:29 scolebourne Exp $
+ * $Revision: 1.10 $
+ * $Date: 2003/10/02 22:14:29 $
  *
  * ====================================================================
  *
@@ -76,9 +76,9 @@ import org.apache.commons.collections.comparators.ReverseComparator;
  * Tests the BinaryHeap.
  * 
  * @author Michael A. Smith
- * @version $Id: TestBinaryHeap.java,v 1.9 2003/08/31 17:28:43 scolebourne Exp $
+ * @version $Id: TestBinaryHeap.java,v 1.10 2003/10/02 22:14:29 scolebourne Exp $
  */
-public class TestBinaryHeap extends TestCollection {
+public class TestBinaryHeap extends AbstractTestCollection {
 
     public static Test suite() {
         return new TestSuite(TestBinaryHeap.class);
diff --git a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java
index 824937dee..97415e521 100644
--- a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java,v 1.7 2003/08/31 17:28:43 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java,v 1.8 2003/10/02 22:14:29 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -68,7 +68,7 @@ import junit.framework.Test;
  * 
  * @author Paul Jack
  */
-public class TestBoundedFifoBuffer extends TestCollection {
+public class TestBoundedFifoBuffer extends AbstractTestCollection {
 
     public TestBoundedFifoBuffer(String n) {
         super(n);
diff --git a/src/test/org/apache/commons/collections/TestBufferUtils.java b/src/test/org/apache/commons/collections/TestBufferUtils.java
index ef79d9179..4d4876fe3 100644
--- a/src/test/org/apache/commons/collections/TestBufferUtils.java
+++ b/src/test/org/apache/commons/collections/TestBufferUtils.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBufferUtils.java,v 1.6 2003/09/20 17:02:03 scolebourne Exp $
- * $Revision: 1.6 $
- * $Date: 2003/09/20 17:02:03 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBufferUtils.java,v 1.7 2003/10/02 22:14:28 scolebourne Exp $
+ * $Revision: 1.7 $
+ * $Date: 2003/10/02 22:14:28 $
  *
  * ====================================================================
  *
@@ -109,7 +109,7 @@ public class TestBufferUtils extends BulkTest {
 
 
     public BulkTest bulkTestUnmodifiableBuffer() {
-        return new TestCollection("") {
+        return new AbstractTestCollection("") {
             public boolean isAddSupported() {
                 return false;
             }
diff --git a/src/test/org/apache/commons/collections/TestCircularFifoBuffer.java b/src/test/org/apache/commons/collections/TestCircularFifoBuffer.java
index 40674042b..f16fe26c1 100644
--- a/src/test/org/apache/commons/collections/TestCircularFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/TestCircularFifoBuffer.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestCircularFifoBuffer.java,v 1.3 2003/08/31 17:28:43 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestCircularFifoBuffer.java,v 1.4 2003/10/02 22:14:29 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -67,11 +67,11 @@ import junit.framework.Test;
 /**
  * Test cases for CircularFifoBuffer.
  * 
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:43 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:29 $
  * 
  * @author Stephen Colebourne
  */
-public class TestCircularFifoBuffer extends TestCollection {
+public class TestCircularFifoBuffer extends AbstractTestCollection {
 
     public TestCircularFifoBuffer(String n) {
         super(n);
diff --git a/src/test/org/apache/commons/collections/TestCollectionUtils.java b/src/test/org/apache/commons/collections/TestCollectionUtils.java
index 134b1cf35..a0f9f2cb6 100644
--- a/src/test/org/apache/commons/collections/TestCollectionUtils.java
+++ b/src/test/org/apache/commons/collections/TestCollectionUtils.java
@@ -1,7 +1,7 @@
 /*
- * $Id: TestCollectionUtils.java,v 1.22 2003/09/25 07:19:42 psteitz Exp $
- * $Revision: 1.22 $
- * $Date: 2003/09/25 07:19:42 $
+ * $Id: TestCollectionUtils.java,v 1.23 2003/10/02 22:14:29 scolebourne Exp $
+ * $Revision: 1.23 $
+ * $Date: 2003/10/02 22:14:29 $
  *
  * ====================================================================
  *
@@ -93,7 +93,7 @@ import org.apache.commons.collections.decorators.UnmodifiableCollection;
  * @author Stephen Colebourne
  * @author Phil Steitz
  * 
- * @version $Revision: 1.22 $ $Date: 2003/09/25 07:19:42 $
+ * @version $Revision: 1.23 $ $Date: 2003/10/02 22:14:29 $
  */
 public class TestCollectionUtils extends TestCase {
     public TestCollectionUtils(String testName) {
@@ -797,7 +797,7 @@ public class TestCollectionUtils extends TestCase {
             }
  
             public BulkTest bulkTestAll() {
-                return new TestCollection("") {
+                return new AbstractTestCollection("") {
                     public Collection makeCollection() {
                         return typedCollection();
                     }
diff --git a/src/test/org/apache/commons/collections/TestCursorableLinkedList.java b/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
index fab58b1ea..4cbd52682 100644
--- a/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
+++ b/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v 1.11 2003/09/27 10:07:14 scolebourne Exp $
- * $Revision: 1.11 $
- * $Date: 2003/09/27 10:07:14 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v 1.12 2003/10/02 22:14:29 scolebourne Exp $
+ * $Revision: 1.12 $
+ * $Date: 2003/10/02 22:14:29 $
  *
  * ====================================================================
  *
@@ -74,9 +74,9 @@ import junit.framework.Test;
  * 
  * @author Rodney Waldhoff
  * @author Simon Kitching
- * @version $Id: TestCursorableLinkedList.java,v 1.11 2003/09/27 10:07:14 scolebourne Exp $
+ * @version $Id: TestCursorableLinkedList.java,v 1.12 2003/10/02 22:14:29 scolebourne Exp $
  */
-public class TestCursorableLinkedList extends TestList {
+public class TestCursorableLinkedList extends AbstractTestList {
     public TestCursorableLinkedList(String testName) {
         super(testName);
     }
diff --git a/src/test/org/apache/commons/collections/TestLinkedList.java b/src/test/org/apache/commons/collections/TestLinkedList.java
index a1c9b8940..27102fa77 100644
--- a/src/test/org/apache/commons/collections/TestLinkedList.java
+++ b/src/test/org/apache/commons/collections/TestLinkedList.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestLinkedList.java,v 1.3 2003/08/31 17:28:43 scolebourne Exp $
- * $Revision: 1.3 $
- * $Date: 2003/08/31 17:28:43 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestLinkedList.java,v 1.4 2003/10/02 22:14:29 scolebourne Exp $
+ * $Revision: 1.4 $
+ * $Date: 2003/10/02 22:14:29 $
  *
  * ====================================================================
  *
@@ -79,9 +79,9 @@ import java.util.NoSuchElementException;
  * test case (method) your {@link List} fails.
  *
  * @author Rich Dougherty
- * @version $Id: TestLinkedList.java,v 1.3 2003/08/31 17:28:43 scolebourne Exp $
+ * @version $Id: TestLinkedList.java,v 1.4 2003/10/02 22:14:29 scolebourne Exp $
  */
-public abstract class TestLinkedList extends TestList {
+public abstract class TestLinkedList extends AbstractTestList {
 
     public TestLinkedList(String testName) {
         super(testName);
diff --git a/src/test/org/apache/commons/collections/TestListUtils.java b/src/test/org/apache/commons/collections/TestListUtils.java
index fcef52bc9..db8af1890 100644
--- a/src/test/org/apache/commons/collections/TestListUtils.java
+++ b/src/test/org/apache/commons/collections/TestListUtils.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestListUtils.java,v 1.12 2003/09/20 17:02:03 scolebourne Exp $
- * $Revision: 1.12 $
- * $Date: 2003/09/20 17:02:03 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestListUtils.java,v 1.13 2003/10/02 22:14:29 scolebourne Exp $
+ * $Revision: 1.13 $
+ * $Date: 2003/10/02 22:14:29 $
  *
  * ====================================================================
  *
@@ -124,7 +124,7 @@ public class TestListUtils extends BulkTest {
             }
 
             public BulkTest bulkTestAll() {
-                return new TestList("") {
+                return new AbstractTestList("") {
                     public List makeEmptyList() {
                         return (List)typedCollection();
                     }
diff --git a/src/test/org/apache/commons/collections/TestMap.java b/src/test/org/apache/commons/collections/TestMap.java
index 1ad5b8dbd..77313a1e8 100644
--- a/src/test/org/apache/commons/collections/TestMap.java
+++ b/src/test/org/apache/commons/collections/TestMap.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestMap.java,v 1.28 2003/10/02 04:04:22 bayard Exp $
- * $Revision: 1.28 $
- * $Date: 2003/10/02 04:04:22 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestMap.java,v 1.29 2003/10/02 22:14:28 scolebourne Exp $
+ * $Revision: 1.29 $
+ * $Date: 2003/10/02 22:14:28 $
  *
  * ====================================================================
  *
@@ -152,9 +152,9 @@ import java.util.Set;
  * @author Michael Smith
  * @author Rodney Waldhoff
  * @author Paul Jack
- * @version $Revision: 1.28 $ $Date: 2003/10/02 04:04:22 $
+ * @version $Revision: 1.29 $ $Date: 2003/10/02 22:14:28 $
  */
-public abstract class TestMap extends TestObject {
+public abstract class TestMap extends AbstractTestObject {
 
     // These instance variables are initialized with the reset method.
     // Tests for map methods that alter the map (put, putAll, remove) 
@@ -1002,7 +1002,7 @@ public abstract class TestMap extends TestObject {
         return new TestMapValues();
     }
 
-    class TestMapValues extends TestCollection {
+    class TestMapValues extends AbstractTestCollection {
         public TestMapValues() {
             super("");
         }
diff --git a/src/test/org/apache/commons/collections/TestSet.java b/src/test/org/apache/commons/collections/TestSet.java
index 01116492a..9a8902b48 100644
--- a/src/test/org/apache/commons/collections/TestSet.java
+++ b/src/test/org/apache/commons/collections/TestSet.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestSet.java,v 1.5 2003/08/31 17:28:43 scolebourne Exp $
- * $Revision: 1.5 $
- * $Date: 2003/08/31 17:28:43 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestSet.java,v 1.6 2003/10/02 22:14:29 scolebourne Exp $
+ * $Revision: 1.6 $
+ * $Date: 2003/10/02 22:14:29 $
  *
  * ====================================================================
  *
@@ -81,9 +81,9 @@ import java.util.Set;
  *  elements may be added; see {@link TestCollection} for more details.

  *
  *  @author Paul Jack
- *  @version $Id: TestSet.java,v 1.5 2003/08/31 17:28:43 scolebourne Exp $
+ *  @version $Id: TestSet.java,v 1.6 2003/10/02 22:14:29 scolebourne Exp $
  */
-public abstract class TestSet extends TestCollection {
+public abstract class TestSet extends AbstractTestCollection {
 
     /**
      *  Constructor.
diff --git a/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java b/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java
index c09e757f8..965691bfc 100644
--- a/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java
+++ b/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java,v 1.6 2003/08/31 17:28:43 scolebourne Exp $
- * $Revision: 1.6 $
- * $Date: 2003/08/31 17:28:43 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java,v 1.7 2003/10/02 22:14:29 scolebourne Exp $
+ * $Revision: 1.7 $
+ * $Date: 2003/10/02 22:14:29 $
  *
  * ====================================================================
  *
@@ -68,7 +68,7 @@ import junit.framework.Test;
 /**
  * Test cases for UnboundedFifoBuffer.
  */
-public class TestUnboundedFifoBuffer extends TestCollection {
+public class TestUnboundedFifoBuffer extends AbstractTestCollection {
 
     public TestUnboundedFifoBuffer(String n) {
         super(n);
diff --git a/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java b/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java
index afc8ef431..b06ccfd26 100644
--- a/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java,v 1.1 2003/10/01 22:14:48 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/comparators/AbstractTestComparator.java,v 1.2 2003/10/02 22:14:35 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -65,7 +65,7 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 
 /**
  * Abstract test class for testing the Comparator interface.
@@ -75,7 +75,7 @@ import org.apache.commons.collections.TestObject;
  * 
  * @author Stephen Colebourne
  */
-public abstract class AbstractTestComparator extends TestObject {
+public abstract class AbstractTestComparator extends AbstractTestObject {
 
     /**
      * JUnit constructor.
diff --git a/src/test/org/apache/commons/collections/decorators/TestBlockingBuffer.java b/src/test/org/apache/commons/collections/decorators/TestBlockingBuffer.java
index 7d8dd4acb..56b7d8b69 100644
--- a/src/test/org/apache/commons/collections/decorators/TestBlockingBuffer.java
+++ b/src/test/org/apache/commons/collections/decorators/TestBlockingBuffer.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/decorators/Attic/TestBlockingBuffer.java,v 1.3 2003/09/20 17:05:36 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/decorators/Attic/TestBlockingBuffer.java,v 1.4 2003/10/02 22:14:34 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -68,19 +68,19 @@ import junit.framework.TestSuite;
 
 import org.apache.commons.collections.Buffer;
 import org.apache.commons.collections.BufferUnderflowException;
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 
 /**
  * Extension of {@link TestObject} for exercising the {@link BlockingBuffer}
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  * 
  * @author Janek Bogucki
  * @author Phil Steitz
  */
-public class TestBlockingBuffer extends TestObject {
+public class TestBlockingBuffer extends AbstractTestObject {
 
     public TestBlockingBuffer(String testName) {
         super(testName);
diff --git a/src/test/org/apache/commons/collections/decorators/TestFixedSizeList.java b/src/test/org/apache/commons/collections/decorators/TestFixedSizeList.java
index 5f077cfea..d82de42b6 100644
--- a/src/test/org/apache/commons/collections/decorators/TestFixedSizeList.java
+++ b/src/test/org/apache/commons/collections/decorators/TestFixedSizeList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/decorators/Attic/TestFixedSizeList.java,v 1.3 2003/08/31 17:28:42 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/decorators/Attic/TestFixedSizeList.java,v 1.4 2003/10/02 22:14:34 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -64,18 +64,18 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 
 /**
  * Extension of {@link TestList} for exercising the {@link FixedSizeList}
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:42 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:34 $
  * 
  * @author Stephen Colebourne
  */
-public class TestFixedSizeList extends TestList {
+public class TestFixedSizeList extends AbstractTestList {
 
     public TestFixedSizeList(String testName) {
         super(testName);
diff --git a/src/test/org/apache/commons/collections/decorators/TestPredicatedCollection.java b/src/test/org/apache/commons/collections/decorators/TestPredicatedCollection.java
index 694cc331d..17fab8d2b 100644
--- a/src/test/org/apache/commons/collections/decorators/TestPredicatedCollection.java
+++ b/src/test/org/apache/commons/collections/decorators/TestPredicatedCollection.java
@@ -63,18 +63,18 @@ import junit.framework.TestSuite;
 
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.PredicateUtils;
-import org.apache.commons.collections.TestCollection;
+import org.apache.commons.collections.AbstractTestCollection;
 
 /**
  * Extension of {@link TestCollection} for exercising the 
  * {@link PredicatedCollection} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.2 $ $Date: 2003/09/20 17:05:36 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:34 $
  * 
  * @author Phil Steitz
  */
-public class TestPredicatedCollection extends TestCollection {
+public class TestPredicatedCollection extends AbstractTestCollection {
 
     public TestPredicatedCollection(String name) {
         super(name);
diff --git a/src/test/org/apache/commons/collections/decorators/TestPredicatedList.java b/src/test/org/apache/commons/collections/decorators/TestPredicatedList.java
index da8d4f7d3..44fb46e9d 100644
--- a/src/test/org/apache/commons/collections/decorators/TestPredicatedList.java
+++ b/src/test/org/apache/commons/collections/decorators/TestPredicatedList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/decorators/Attic/TestPredicatedList.java,v 1.2 2003/09/20 17:05:36 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/decorators/Attic/TestPredicatedList.java,v 1.3 2003/10/02 22:14:34 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -65,18 +65,18 @@ import junit.framework.TestSuite;
 
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.PredicateUtils;
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 
 /**
  * Extension of {@link TestList} for exercising the 
  * {@link PredicatedList} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.2 $ $Date: 2003/09/20 17:05:36 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:34 $
  * 
  * @author Phil Steitz
  */
-public class TestPredicatedList extends TestList{
+public class TestPredicatedList extends AbstractTestList{
     
     public TestPredicatedList(String testName) {
         super(testName);
diff --git a/src/test/org/apache/commons/collections/decorators/TestTransformedCollection.java b/src/test/org/apache/commons/collections/decorators/TestTransformedCollection.java
index 5e8574f8a..e37f466b7 100644
--- a/src/test/org/apache/commons/collections/decorators/TestTransformedCollection.java
+++ b/src/test/org/apache/commons/collections/decorators/TestTransformedCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/decorators/Attic/TestTransformedCollection.java,v 1.3 2003/08/31 17:28:42 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/decorators/Attic/TestTransformedCollection.java,v 1.4 2003/10/02 22:14:34 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -66,7 +66,7 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestCollection;
+import org.apache.commons.collections.AbstractTestCollection;
 import org.apache.commons.collections.Transformer;
 
 /**
@@ -74,11 +74,11 @@ import org.apache.commons.collections.Transformer;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:42 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:34 $
  * 
  * @author Stephen Colebourne
  */
-public class TestTransformedCollection extends TestCollection {
+public class TestTransformedCollection extends AbstractTestCollection {
     
     private static class Noop implements Transformer, Serializable {
         public Object transform(Object input) {
diff --git a/src/test/org/apache/commons/collections/decorators/TestTransformedList.java b/src/test/org/apache/commons/collections/decorators/TestTransformedList.java
index e3ee84331..b363c68cf 100644
--- a/src/test/org/apache/commons/collections/decorators/TestTransformedList.java
+++ b/src/test/org/apache/commons/collections/decorators/TestTransformedList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/decorators/Attic/TestTransformedList.java,v 1.2 2003/08/31 17:28:42 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/decorators/Attic/TestTransformedList.java,v 1.3 2003/10/02 22:14:34 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -66,18 +66,18 @@ import java.util.ListIterator;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 
 /**
  * Extension of {@link TestList} for exercising the {@link TransformedList}
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:42 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:34 $
  * 
  * @author Stephen Colebourne
  */
-public class TestTransformedList extends TestList {
+public class TestTransformedList extends AbstractTestList {
     
     public TestTransformedList(String testName) {
         super(testName);
diff --git a/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java b/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java
index 4106c69f4..fa32ea8fa 100644
--- a/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java,v 1.1 2003/10/01 21:54:54 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java,v 1.2 2003/10/02 22:14:34 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -60,7 +60,7 @@ package org.apache.commons.collections.iterators;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 
 /**
  * Abstract class for testing the Iterator interface.
@@ -71,12 +71,12 @@ import org.apache.commons.collections.TestObject;
  * overriding the supportsXxx() methods if necessary.
  * 
  * @since Commons Collections 3.0
- * @version $Revision: 1.1 $ $Date: 2003/10/01 21:54:54 $
+ * @version $Revision: 1.2 $ $Date: 2003/10/02 22:14:34 $
  * 
  * @author Morgan Delagrange
  * @author Stephen Colebourne
  */
-public abstract class AbstractTestIterator extends TestObject {
+public abstract class AbstractTestIterator extends AbstractTestObject {
 
     /**
      * JUnit constructor.
diff --git a/src/test/org/apache/commons/collections/observed/TestObservableBuffer.java b/src/test/org/apache/commons/collections/observed/TestObservableBuffer.java
index 2576f3311..d04ad3d96 100644
--- a/src/test/org/apache/commons/collections/observed/TestObservableBuffer.java
+++ b/src/test/org/apache/commons/collections/observed/TestObservableBuffer.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/observed/Attic/TestObservableBuffer.java,v 1.1 2003/09/21 20:01:53 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/observed/Attic/TestObservableBuffer.java,v 1.2 2003/10/02 22:14:35 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -65,18 +65,18 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.commons.collections.ArrayStack;
-import org.apache.commons.collections.TestCollection;
+import org.apache.commons.collections.AbstractTestCollection;
 
 /**
  * Extension of {@link TestCollection} for exercising the
  * {@link ObservableBuffer} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.1 $ $Date: 2003/09/21 20:01:53 $
+ * @version $Revision: 1.2 $ $Date: 2003/10/02 22:14:35 $
  * 
  * @author Stephen Colebourne
  */
-public class TestObservableBuffer extends TestCollection implements ObservedTestHelper.ObservedFactory {
+public class TestObservableBuffer extends AbstractTestCollection implements ObservedTestHelper.ObservedFactory {
     
     public TestObservableBuffer(String testName) {
         super(testName);
diff --git a/src/test/org/apache/commons/collections/observed/TestObservableCollection.java b/src/test/org/apache/commons/collections/observed/TestObservableCollection.java
index 6bed500a1..a8293c902 100644
--- a/src/test/org/apache/commons/collections/observed/TestObservableCollection.java
+++ b/src/test/org/apache/commons/collections/observed/TestObservableCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/observed/Attic/TestObservableCollection.java,v 1.1 2003/09/21 20:01:53 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/observed/Attic/TestObservableCollection.java,v 1.2 2003/10/02 22:14:35 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -65,18 +65,18 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestCollection;
+import org.apache.commons.collections.AbstractTestCollection;
 
 /**
  * Extension of {@link TestCollection} for exercising the
  * {@link ObservedCollection} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.1 $ $Date: 2003/09/21 20:01:53 $
+ * @version $Revision: 1.2 $ $Date: 2003/10/02 22:14:35 $
  * 
  * @author Stephen Colebourne
  */
-public class TestObservableCollection extends TestCollection implements ObservedTestHelper.ObservedFactory {
+public class TestObservableCollection extends AbstractTestCollection implements ObservedTestHelper.ObservedFactory {
     
     public TestObservableCollection(String testName) {
         super(testName);
diff --git a/src/test/org/apache/commons/collections/observed/TestObservableList.java b/src/test/org/apache/commons/collections/observed/TestObservableList.java
index 47360c9a8..3d2e4b733 100644
--- a/src/test/org/apache/commons/collections/observed/TestObservableList.java
+++ b/src/test/org/apache/commons/collections/observed/TestObservableList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/observed/Attic/TestObservableList.java,v 1.1 2003/09/21 20:01:53 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/observed/Attic/TestObservableList.java,v 1.2 2003/10/02 22:14:34 scolebourne Exp $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -64,18 +64,18 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 
 /**
  * Extension of {@link TestList} for exercising the
  * {@link ObservedList} implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.1 $ $Date: 2003/09/21 20:01:53 $
+ * @version $Revision: 1.2 $ $Date: 2003/10/02 22:14:34 $
  * 
  * @author Stephen Colebourne
  */
-public class TestObservableList extends TestList implements ObservedTestHelper.ObservedFactory {
+public class TestObservableList extends AbstractTestList implements ObservedTestHelper.ObservedFactory {
     
     public TestObservableList(String testName) {
         super(testName);
diff --git a/src/test/org/apache/commons/collections/primitives/TestAbstractLongArrayList.java b/src/test/org/apache/commons/collections/primitives/TestAbstractLongArrayList.java
index 81aa82dd0..aa3adf702 100644
--- a/src/test/org/apache/commons/collections/primitives/TestAbstractLongArrayList.java
+++ b/src/test/org/apache/commons/collections/primitives/TestAbstractLongArrayList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestAbstractLongArrayList.java,v 1.7 2003/08/31 17:28:41 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestAbstractLongArrayList.java,v 1.8 2003/10/02 22:14:33 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -59,13 +59,13 @@ package org.apache.commons.collections.primitives;
 
 import java.util.List;
 
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 
 /**
- * @version $Revision: 1.7 $ $Date: 2003/08/31 17:28:41 $
+ * @version $Revision: 1.8 $ $Date: 2003/10/02 22:14:33 $
  * @author Rodney Waldhoff
  */
-public abstract class TestAbstractLongArrayList extends TestList {
+public abstract class TestAbstractLongArrayList extends AbstractTestList {
 
     //------------------------------------------------------------ Conventional
 
diff --git a/src/test/org/apache/commons/collections/primitives/TestByteList.java b/src/test/org/apache/commons/collections/primitives/TestByteList.java
index 49f91e523..a7bb3b4fd 100644
--- a/src/test/org/apache/commons/collections/primitives/TestByteList.java
+++ b/src/test/org/apache/commons/collections/primitives/TestByteList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestByteList.java,v 1.3 2003/08/31 17:28:41 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestByteList.java,v 1.4 2003/10/02 22:14:33 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -61,15 +61,15 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.adapters.ByteListList;
 import org.apache.commons.collections.primitives.adapters.ListByteList;
 
 /**
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:41 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:33 $
  * @author Rodney Waldhoff
  */
-public abstract class TestByteList extends TestList {
+public abstract class TestByteList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/TestCharList.java b/src/test/org/apache/commons/collections/primitives/TestCharList.java
index 548d46b35..d482be8ef 100644
--- a/src/test/org/apache/commons/collections/primitives/TestCharList.java
+++ b/src/test/org/apache/commons/collections/primitives/TestCharList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestCharList.java,v 1.3 2003/08/31 17:28:40 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestCharList.java,v 1.4 2003/10/02 22:14:33 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -61,15 +61,15 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.adapters.CharListList;
 import org.apache.commons.collections.primitives.adapters.ListCharList;
 
 /**
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:40 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:33 $
  * @author Rodney Waldhoff
  */
-public abstract class TestCharList extends TestList {
+public abstract class TestCharList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/TestDoubleList.java b/src/test/org/apache/commons/collections/primitives/TestDoubleList.java
index 86d6df4d8..8992a328a 100644
--- a/src/test/org/apache/commons/collections/primitives/TestDoubleList.java
+++ b/src/test/org/apache/commons/collections/primitives/TestDoubleList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestDoubleList.java,v 1.2 2003/08/31 17:28:40 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestDoubleList.java,v 1.3 2003/10/02 22:14:33 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -61,15 +61,15 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.adapters.DoubleListList;
 import org.apache.commons.collections.primitives.adapters.ListDoubleList;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:40 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:33 $
  * @author Rodney Waldhoff
  */
-public abstract class TestDoubleList extends TestList {
+public abstract class TestDoubleList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/TestFloatList.java b/src/test/org/apache/commons/collections/primitives/TestFloatList.java
index 7a03b85a4..41678c259 100644
--- a/src/test/org/apache/commons/collections/primitives/TestFloatList.java
+++ b/src/test/org/apache/commons/collections/primitives/TestFloatList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestFloatList.java,v 1.2 2003/08/31 17:28:40 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestFloatList.java,v 1.3 2003/10/02 22:14:33 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -61,15 +61,15 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.adapters.FloatListList;
 import org.apache.commons.collections.primitives.adapters.ListFloatList;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:40 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:33 $
  * @author Rodney Waldhoff
  */
-public abstract class TestFloatList extends TestList {
+public abstract class TestFloatList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/TestIntList.java b/src/test/org/apache/commons/collections/primitives/TestIntList.java
index 27b04c3aa..236897733 100644
--- a/src/test/org/apache/commons/collections/primitives/TestIntList.java
+++ b/src/test/org/apache/commons/collections/primitives/TestIntList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestIntList.java,v 1.10 2003/08/31 17:28:40 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestIntList.java,v 1.11 2003/10/02 22:14:33 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -61,15 +61,15 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.adapters.IntListList;
 import org.apache.commons.collections.primitives.adapters.ListIntList;
 
 /**
- * @version $Revision: 1.10 $ $Date: 2003/08/31 17:28:40 $
+ * @version $Revision: 1.11 $ $Date: 2003/10/02 22:14:33 $
  * @author Rodney Waldhoff
  */
-public abstract class TestIntList extends TestList {
+public abstract class TestIntList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/TestLongList.java b/src/test/org/apache/commons/collections/primitives/TestLongList.java
index ada983611..2b7d59bf4 100644
--- a/src/test/org/apache/commons/collections/primitives/TestLongList.java
+++ b/src/test/org/apache/commons/collections/primitives/TestLongList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestLongList.java,v 1.2 2003/08/31 17:28:40 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestLongList.java,v 1.3 2003/10/02 22:14:33 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -61,15 +61,15 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.adapters.LongListList;
 import org.apache.commons.collections.primitives.adapters.ListLongList;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:40 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:33 $
  * @author Rodney Waldhoff
  */
-public abstract class TestLongList extends TestList {
+public abstract class TestLongList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/TestShortList.java b/src/test/org/apache/commons/collections/primitives/TestShortList.java
index dfbd08b26..5fb2bb14f 100644
--- a/src/test/org/apache/commons/collections/primitives/TestShortList.java
+++ b/src/test/org/apache/commons/collections/primitives/TestShortList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestShortList.java,v 1.3 2003/08/31 17:28:41 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/Attic/TestShortList.java,v 1.4 2003/10/02 22:14:33 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -61,15 +61,15 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.adapters.ShortListList;
 import org.apache.commons.collections.primitives.adapters.ListShortList;
 
 /**
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:41 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:33 $
  * @author Rodney Waldhoff
  */
-public abstract class TestShortList extends TestList {
+public abstract class TestShortList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestByteCollectionCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestByteCollectionCollection.java
index b43fff878..d03759ee4 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestByteCollectionCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestByteCollectionCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestByteCollectionCollection.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestByteCollectionCollection.java,v 1.3 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -63,16 +63,16 @@ import java.util.Collection;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.RandomAccessByteList;
 import org.apache.commons.collections.primitives.ArrayByteList;
 import org.apache.commons.collections.primitives.ByteList;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestByteCollectionCollection extends TestObject {
+public class TestByteCollectionCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestByteListList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestByteListList.java
index 41aa678a1..d694e21fe 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestByteListList.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestByteListList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestByteListList.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestByteListList.java,v 1.3 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -64,15 +64,15 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.RandomAccessByteList;
 import org.apache.commons.collections.primitives.ArrayByteList;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestByteListList extends TestList {
+public class TestByteListList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestCharCollectionCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestCharCollectionCollection.java
index 0072ba32b..5ade7f3e4 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestCharCollectionCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestCharCollectionCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCharCollectionCollection.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCharCollectionCollection.java,v 1.3 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -63,16 +63,16 @@ import java.util.Collection;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.RandomAccessCharList;
 import org.apache.commons.collections.primitives.ArrayCharList;
 import org.apache.commons.collections.primitives.CharList;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestCharCollectionCollection extends TestObject {
+public class TestCharCollectionCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestCharListList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestCharListList.java
index 34284ad20..80b17039d 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestCharListList.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestCharListList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCharListList.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCharListList.java,v 1.3 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -64,15 +64,15 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.RandomAccessCharList;
 import org.apache.commons.collections.primitives.ArrayCharList;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestCharListList extends TestList {
+public class TestCharListList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionByteCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionByteCollection.java
index 78e9b06d1..d284df96f 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionByteCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionByteCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionByteCollection.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionByteCollection.java,v 1.3 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -65,14 +65,14 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.ByteCollection;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestCollectionByteCollection extends TestObject {
+public class TestCollectionByteCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionCharCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionCharCollection.java
index 59a8c5a6c..deec34021 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionCharCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionCharCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionCharCollection.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionCharCollection.java,v 1.3 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -65,14 +65,14 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.CharCollection;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestCollectionCharCollection extends TestObject {
+public class TestCollectionCharCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionDoubleCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionDoubleCollection.java
index 33015c15e..a97af49ef 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionDoubleCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionDoubleCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionDoubleCollection.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionDoubleCollection.java,v 1.3 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -65,14 +65,14 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.DoubleCollection;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestCollectionDoubleCollection extends TestObject {
+public class TestCollectionDoubleCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionFloatCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionFloatCollection.java
index 42a76bad6..1f4570b6a 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionFloatCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionFloatCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionFloatCollection.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionFloatCollection.java,v 1.3 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -65,14 +65,14 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.FloatCollection;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestCollectionFloatCollection extends TestObject {
+public class TestCollectionFloatCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionIntCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionIntCollection.java
index 7c6670baf..6de6618fd 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionIntCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionIntCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionIntCollection.java,v 1.3 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionIntCollection.java,v 1.4 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -65,14 +65,14 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.IntCollection;
 
 /**
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestCollectionIntCollection extends TestObject {
+public class TestCollectionIntCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionLongCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionLongCollection.java
index 29f1c43c7..442510495 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionLongCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionLongCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionLongCollection.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionLongCollection.java,v 1.3 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -65,14 +65,14 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.LongCollection;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestCollectionLongCollection extends TestObject {
+public class TestCollectionLongCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionShortCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionShortCollection.java
index 8071da88c..39a5b4af5 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionShortCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestCollectionShortCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionShortCollection.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestCollectionShortCollection.java,v 1.3 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -65,14 +65,14 @@ import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.ShortCollection;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestCollectionShortCollection extends TestObject {
+public class TestCollectionShortCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestDoubleCollectionCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestDoubleCollectionCollection.java
index 0747249f8..298a110fa 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestDoubleCollectionCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestDoubleCollectionCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestDoubleCollectionCollection.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestDoubleCollectionCollection.java,v 1.3 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -63,16 +63,16 @@ import java.util.Collection;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.RandomAccessDoubleList;
 import org.apache.commons.collections.primitives.ArrayDoubleList;
 import org.apache.commons.collections.primitives.DoubleList;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestDoubleCollectionCollection extends TestObject {
+public class TestDoubleCollectionCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestDoubleListList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestDoubleListList.java
index bca82d7b7..056d23100 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestDoubleListList.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestDoubleListList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestDoubleListList.java,v 1.2 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestDoubleListList.java,v 1.3 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -64,15 +64,15 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.RandomAccessDoubleList;
 import org.apache.commons.collections.primitives.ArrayDoubleList;
 
 /**
- * @version $Revision: 1.2 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestDoubleListList extends TestList {
+public class TestDoubleListList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestFloatCollectionCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestFloatCollectionCollection.java
index f11130397..39ce1718d 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestFloatCollectionCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestFloatCollectionCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestFloatCollectionCollection.java,v 1.3 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestFloatCollectionCollection.java,v 1.4 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -63,16 +63,16 @@ import java.util.Collection;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.RandomAccessFloatList;
 import org.apache.commons.collections.primitives.ArrayFloatList;
 import org.apache.commons.collections.primitives.FloatList;
 
 /**
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestFloatCollectionCollection extends TestObject {
+public class TestFloatCollectionCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestFloatListList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestFloatListList.java
index d75b264b2..4a0a7f551 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestFloatListList.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestFloatListList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestFloatListList.java,v 1.3 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestFloatListList.java,v 1.4 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -64,15 +64,15 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.RandomAccessFloatList;
 import org.apache.commons.collections.primitives.ArrayFloatList;
 
 /**
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestFloatListList extends TestList {
+public class TestFloatListList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestIntCollectionCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestIntCollectionCollection.java
index 2c20bb4f7..ee2a679b7 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestIntCollectionCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestIntCollectionCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestIntCollectionCollection.java,v 1.4 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestIntCollectionCollection.java,v 1.5 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -63,16 +63,16 @@ import java.util.Collection;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.RandomAccessIntList;
 import org.apache.commons.collections.primitives.ArrayIntList;
 import org.apache.commons.collections.primitives.IntList;
 
 /**
- * @version $Revision: 1.4 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.5 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestIntCollectionCollection extends TestObject {
+public class TestIntCollectionCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestIntListList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestIntListList.java
index 5ff48a33f..f1a9a22dd 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestIntListList.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestIntListList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestIntListList.java,v 1.5 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestIntListList.java,v 1.6 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -64,15 +64,15 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.RandomAccessIntList;
 import org.apache.commons.collections.primitives.ArrayIntList;
 
 /**
- * @version $Revision: 1.5 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.6 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestIntListList extends TestList {
+public class TestIntListList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestLongCollectionCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestLongCollectionCollection.java
index 1f4c40f5e..e3806b9b3 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestLongCollectionCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestLongCollectionCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestLongCollectionCollection.java,v 1.3 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestLongCollectionCollection.java,v 1.4 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -63,16 +63,16 @@ import java.util.Collection;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.RandomAccessLongList;
 import org.apache.commons.collections.primitives.ArrayLongList;
 import org.apache.commons.collections.primitives.LongList;
 
 /**
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestLongCollectionCollection extends TestObject {
+public class TestLongCollectionCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestLongListList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestLongListList.java
index 172eccf22..057511ab6 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestLongListList.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestLongListList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestLongListList.java,v 1.3 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestLongListList.java,v 1.4 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -64,15 +64,15 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.RandomAccessLongList;
 import org.apache.commons.collections.primitives.ArrayLongList;
 
 /**
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestLongListList extends TestList {
+public class TestLongListList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestShortCollectionCollection.java b/src/test/org/apache/commons/collections/primitives/adapters/TestShortCollectionCollection.java
index e108f6d00..cda99d001 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestShortCollectionCollection.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestShortCollectionCollection.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestShortCollectionCollection.java,v 1.3 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestShortCollectionCollection.java,v 1.4 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -63,16 +63,16 @@ import java.util.Collection;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.commons.collections.TestObject;
+import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.primitives.RandomAccessShortList;
 import org.apache.commons.collections.primitives.ArrayShortList;
 import org.apache.commons.collections.primitives.ShortList;
 
 /**
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestShortCollectionCollection extends TestObject {
+public class TestShortCollectionCollection extends AbstractTestObject {
 
     // conventional
     // ------------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/primitives/adapters/TestShortListList.java b/src/test/org/apache/commons/collections/primitives/adapters/TestShortListList.java
index 7882f96e5..f257a087f 100644
--- a/src/test/org/apache/commons/collections/primitives/adapters/TestShortListList.java
+++ b/src/test/org/apache/commons/collections/primitives/adapters/TestShortListList.java
@@ -1,5 +1,5 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestShortListList.java,v 1.3 2003/08/31 17:28:38 scolebourne Exp $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/primitives/adapters/Attic/TestShortListList.java,v 1.4 2003/10/02 22:14:31 scolebourne Exp $
  * ====================================================================
  * The Apache Software License, Version 1.1
  *
@@ -64,15 +64,15 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.TestList;
+import org.apache.commons.collections.AbstractTestList;
 import org.apache.commons.collections.primitives.RandomAccessShortList;
 import org.apache.commons.collections.primitives.ArrayShortList;
 
 /**
- * @version $Revision: 1.3 $ $Date: 2003/08/31 17:28:38 $
+ * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $
  * @author Rodney Waldhoff
  */
-public class TestShortListList extends TestList {
+public class TestShortListList extends AbstractTestList {
 
     // conventional
     // ------------------------------------------------------------------------