From 8b313fecf6264311f3ede29f5b6a227e99fe3bea Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Sun, 16 Nov 2003 22:15:12 +0000 Subject: [PATCH] Refactor tests to interface based subpackages git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131347 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/collections/TestArrayList.java | 6 ++++-- .../apache/commons/collections/TestBeanMap.java | 6 ++++-- .../commons/collections/TestBinaryHeap.java | 5 +++-- .../collections/TestBoundedFifoBuffer.java | 6 ++++-- .../commons/collections/TestBufferUtils.java | 5 +++-- .../collections/TestCircularFifoBuffer.java | 6 ++++-- .../collections/TestCollectionUtils.java | 5 +++-- .../collections/TestCursorableLinkedList.java | 6 ++++-- .../collections/TestDoubleOrderedMap.java | 6 ++++-- .../commons/collections/TestFastHashMap.java | 6 ++++-- .../commons/collections/TestFlat3Map.java | 5 +++-- .../apache/commons/collections/TestHashBag.java | 6 ++++-- .../commons/collections/TestLinkedList.java | 6 ++++-- .../commons/collections/TestListUtils.java | 5 +++-- .../commons/collections/TestMapUtils.java | 5 +++-- .../commons/collections/TestMultiHashMap.java | 6 ++++-- .../commons/collections/TestReferenceMap.java | 6 ++++-- .../collections/TestSequencedHashMap.java | 6 ++++-- .../commons/collections/TestSetUtils.java | 5 +++-- .../collections/TestStaticBucketMap.java | 6 ++++-- .../apache/commons/collections/TestTreeBag.java | 6 ++++-- .../apache/commons/collections/TestTreeMap.java | 6 ++++-- .../collections/TestUnboundedFifoBuffer.java | 6 ++++-- .../collections/{ => bag}/AbstractTestBag.java | 9 ++++++--- .../{ => bag}/AbstractTestSortedBag.java | 7 ++++--- .../collections/bag/TestPredicatedBag.java | 5 ++--- .../bag/TestPredicatedSortedBag.java | 5 ++--- .../collections/bag/TestTransformedBag.java | 5 ++--- .../bag/TestTransformedSortedBag.java | 5 ++--- .../commons/collections/bag/TestTypedBag.java | 5 ++--- .../collections/bag/TestTypedSortedBag.java | 5 ++--- .../bidimap/AbstractTestBidiMap.java | 6 +++--- .../bidimap/AbstractTestSortedBidiMap.java | 6 +++--- .../AbstractTestCollection.java | 8 +++++--- .../collection/TestCompositeCollection.java | 6 ++---- .../collection/TestPredicatedCollection.java | 3 +-- .../collection/TestTransformedCollection.java | 5 ++--- .../{ => list}/AbstractTestList.java | 9 ++++++--- .../collections/list/TestFixedSizeList.java | 6 ++---- .../collections/list/TestPredicatedList.java | 5 ++--- .../collections/list/TestSetUniqueList.java | 6 ++---- .../collections/list/TestTransformedList.java | 5 ++--- .../collections/list/TestUnmodifiableList.java | 5 ++--- .../collections/{ => map}/AbstractTestMap.java | 17 ++++++++++++++--- .../{ => map}/AbstractTestSortedMap.java | 8 +++++--- .../collections/map/TestFixedSizeMap.java | 6 ++---- .../collections/map/TestFixedSizeSortedMap.java | 5 ++--- .../commons/collections/map/TestLazyMap.java | 5 ++--- .../collections/map/TestListOrderedMap.java | 5 ++--- .../collections/map/TestPredicatedMap.java | 5 ++--- .../collections/map/TestTransformedMap.java | 5 ++--- .../map/TestTransformedSortedMap.java | 5 ++--- .../collections/map/TestUnmodifiableMap.java | 6 ++---- .../collections/observed/TestObservableBag.java | 6 +++--- .../observed/TestObservableBuffer.java | 6 +++--- .../observed/TestObservableCollection.java | 6 +++--- .../observed/TestObservableList.java | 6 +++--- .../collections/observed/TestObservableSet.java | 6 +++--- .../observed/TestObservableSortedBag.java | 6 +++--- .../observed/TestObservableSortedSet.java | 6 +++--- .../primitives/TestAbstractLongArrayList.java | 6 +++--- .../collections/primitives/TestByteList.java | 6 +++--- .../collections/primitives/TestCharList.java | 6 +++--- .../collections/primitives/TestDoubleList.java | 6 +++--- .../collections/primitives/TestFloatList.java | 6 +++--- .../collections/primitives/TestIntList.java | 6 +++--- .../collections/primitives/TestLongList.java | 8 ++++---- .../collections/primitives/TestShortList.java | 8 ++++---- .../adapters/TestByteCollectionCollection.java | 6 +++--- .../primitives/adapters/TestByteListList.java | 8 ++++---- .../adapters/TestCharCollectionCollection.java | 6 +++--- .../primitives/adapters/TestCharListList.java | 8 ++++---- .../TestDoubleCollectionCollection.java | 6 +++--- .../primitives/adapters/TestDoubleListList.java | 8 ++++---- .../adapters/TestFloatCollectionCollection.java | 6 +++--- .../primitives/adapters/TestFloatListList.java | 8 ++++---- .../adapters/TestIntCollectionCollection.java | 6 +++--- .../primitives/adapters/TestIntListList.java | 8 ++++---- .../adapters/TestLongCollectionCollection.java | 6 +++--- .../primitives/adapters/TestLongListList.java | 8 ++++---- .../adapters/TestShortCollectionCollection.java | 6 +++--- .../primitives/adapters/TestShortListList.java | 8 ++++---- .../collections/{ => set}/AbstractTestSet.java | 8 +++++--- .../{ => set}/AbstractTestSortedSet.java | 10 ++++++---- .../collections/set/TestListOrderedSet.java | 6 ++---- .../collections/set/TestPredicatedSet.java | 5 ++--- .../set/TestPredicatedSortedSet.java | 5 ++--- .../collections/set/TestTransformedSet.java | 5 ++--- .../set/TestTransformedSortedSet.java | 5 ++--- .../collections/set/TestTypedSortedSet.java | 5 ++--- .../set/TestUnmodifiableSortedSet.java | 6 ++---- 91 files changed, 295 insertions(+), 266 deletions(-) rename src/test/org/apache/commons/collections/{ => bag}/AbstractTestBag.java (97%) rename src/test/org/apache/commons/collections/{ => bag}/AbstractTestSortedBag.java (94%) rename src/test/org/apache/commons/collections/{ => collection}/AbstractTestCollection.java (99%) rename src/test/org/apache/commons/collections/{ => list}/AbstractTestList.java (99%) rename src/test/org/apache/commons/collections/{ => map}/AbstractTestMap.java (98%) rename src/test/org/apache/commons/collections/{ => map}/AbstractTestSortedMap.java (98%) rename src/test/org/apache/commons/collections/{ => set}/AbstractTestSet.java (96%) rename src/test/org/apache/commons/collections/{ => set}/AbstractTestSortedSet.java (97%) diff --git a/src/test/org/apache/commons/collections/TestArrayList.java b/src/test/org/apache/commons/collections/TestArrayList.java index 517d91897..eba741189 100644 --- a/src/test/org/apache/commons/collections/TestArrayList.java +++ b/src/test/org/apache/commons/collections/TestArrayList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestArrayList.java,v 1.9 2003/10/05 21:03:44 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestArrayList.java,v 1.10 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -62,10 +62,12 @@ import java.util.ArrayList; import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.collections.list.AbstractTestList; + /** * Abstract test class for ArrayList. * - * @version $Revision: 1.9 $ $Date: 2003/10/05 21:03:44 $ + * @version $Revision: 1.10 $ $Date: 2003/11/16 22:15:09 $ * * @author Jason van Zyl */ diff --git a/src/test/org/apache/commons/collections/TestBeanMap.java b/src/test/org/apache/commons/collections/TestBeanMap.java index aecfb8841..5ec91ae1f 100644 --- a/src/test/org/apache/commons/collections/TestBeanMap.java +++ b/src/test/org/apache/commons/collections/TestBeanMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBeanMap.java,v 1.14 2003/11/01 18:47:18 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBeanMap.java,v 1.15 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,10 +64,12 @@ import java.util.Map; import junit.framework.Test; import junit.textui.TestRunner; +import org.apache.commons.collections.map.AbstractTestMap; + /** * Test cases for BeanMap * - * @version $Revision: 1.14 $ $Date: 2003/11/01 18:47:18 $ + * @version $Revision: 1.15 $ $Date: 2003/11/16 22:15:09 $ * * @author Morgan Delagrange * @author Stephen Colebourne diff --git a/src/test/org/apache/commons/collections/TestBinaryHeap.java b/src/test/org/apache/commons/collections/TestBinaryHeap.java index b2741176b..819342f2d 100644 --- a/src/test/org/apache/commons/collections/TestBinaryHeap.java +++ b/src/test/org/apache/commons/collections/TestBinaryHeap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBinaryHeap.java,v 1.11 2003/10/05 21:03:44 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBinaryHeap.java,v 1.12 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -66,13 +66,14 @@ import java.util.NoSuchElementException; import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.collections.collection.AbstractTestCollection; import org.apache.commons.collections.comparators.ComparableComparator; import org.apache.commons.collections.comparators.ReverseComparator; /** * Tests the BinaryHeap. * - * @version $Revision: 1.11 $ $Date: 2003/10/05 21:03:44 $ + * @version $Revision: 1.12 $ $Date: 2003/11/16 22:15:09 $ * * @author Michael A. Smith */ diff --git a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java index d68248e25..af1c1c9d0 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.9 2003/10/05 21:03:44 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.10 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -63,10 +63,12 @@ import java.util.Iterator; import junit.framework.Test; +import org.apache.commons.collections.collection.AbstractTestCollection; + /** * Test cases for BoundedFifoBuffer. * - * @version $Revision: 1.9 $ $Date: 2003/10/05 21:03:44 $ + * @version $Revision: 1.10 $ $Date: 2003/11/16 22:15:09 $ * * @author Paul Jack */ diff --git a/src/test/org/apache/commons/collections/TestBufferUtils.java b/src/test/org/apache/commons/collections/TestBufferUtils.java index a62d26227..0f5ce19bc 100644 --- a/src/test/org/apache/commons/collections/TestBufferUtils.java +++ b/src/test/org/apache/commons/collections/TestBufferUtils.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBufferUtils.java,v 1.9 2003/11/16 00:05:47 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBufferUtils.java,v 1.10 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -63,11 +63,12 @@ import java.util.Collection; import junit.framework.Test; import org.apache.commons.collections.buffer.PredicatedBuffer; +import org.apache.commons.collections.collection.AbstractTestCollection; /** * Tests for BufferUtils. * - * @version $Revision: 1.9 $ $Date: 2003/11/16 00:05:47 $ + * @version $Revision: 1.10 $ $Date: 2003/11/16 22:15:09 $ * * @author Unknown */ diff --git a/src/test/org/apache/commons/collections/TestCircularFifoBuffer.java b/src/test/org/apache/commons/collections/TestCircularFifoBuffer.java index 2d7ba8f35..09c7e2a29 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.5 2003/10/05 21:11:06 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.6 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,10 +64,12 @@ import java.util.List; import junit.framework.Test; +import org.apache.commons.collections.collection.AbstractTestCollection; + /** * Test cases for CircularFifoBuffer. * - * @version $Revision: 1.5 $ $Date: 2003/10/05 21:11:06 $ + * @version $Revision: 1.6 $ $Date: 2003/11/16 22:15:09 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/TestCollectionUtils.java b/src/test/org/apache/commons/collections/TestCollectionUtils.java index 95eef400d..df83bebfe 100644 --- a/src/test/org/apache/commons/collections/TestCollectionUtils.java +++ b/src/test/org/apache/commons/collections/TestCollectionUtils.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestCollectionUtils.java,v 1.30 2003/11/16 00:05:47 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestCollectionUtils.java,v 1.31 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -75,6 +75,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.collections.collection.AbstractTestCollection; import org.apache.commons.collections.collection.PredicatedCollection; import org.apache.commons.collections.collection.SynchronizedCollection; import org.apache.commons.collections.collection.TransformedCollection; @@ -88,7 +89,7 @@ import org.apache.commons.collections.collection.UnmodifiableCollection; * @author Stephen Colebourne * @author Phil Steitz * - * @version $Revision: 1.30 $ $Date: 2003/11/16 00:05:47 $ + * @version $Revision: 1.31 $ $Date: 2003/11/16 22:15:09 $ */ public class TestCollectionUtils extends TestCase { diff --git a/src/test/org/apache/commons/collections/TestCursorableLinkedList.java b/src/test/org/apache/commons/collections/TestCursorableLinkedList.java index b24e6c983..274217542 100644 --- a/src/test/org/apache/commons/collections/TestCursorableLinkedList.java +++ b/src/test/org/apache/commons/collections/TestCursorableLinkedList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v 1.14 2003/10/05 21:11:06 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v 1.15 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -65,10 +65,12 @@ import java.util.ListIterator; import junit.framework.Test; +import org.apache.commons.collections.list.AbstractTestList; + /** * Test class. * - * @version $Revision: 1.14 $ $Date: 2003/10/05 21:11:06 $ + * @version $Revision: 1.15 $ $Date: 2003/11/16 22:15:09 $ * * @author Rodney Waldhoff * @author Simon Kitching diff --git a/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java b/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java index c364f3349..0d2fece7f 100644 --- a/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java +++ b/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java,v 1.11 2003/11/01 18:47:18 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java,v 1.12 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -69,6 +69,8 @@ import java.util.Set; import junit.framework.Test; +import org.apache.commons.collections.map.AbstractTestMap; + /** * Class TestDoubleOrderedMap *

@@ -77,7 +79,7 @@ import junit.framework.Test; * Map that does not support duplicate keys, duplicate * values, or null values. * - * @version $Revision: 1.11 $ $Date: 2003/11/01 18:47:18 $ + * @version $Revision: 1.12 $ $Date: 2003/11/16 22:15:09 $ * * @author Marc Johnson * @author Stephen Colebourne diff --git a/src/test/org/apache/commons/collections/TestFastHashMap.java b/src/test/org/apache/commons/collections/TestFastHashMap.java index 146af6d7f..c8fe125b3 100644 --- a/src/test/org/apache/commons/collections/TestFastHashMap.java +++ b/src/test/org/apache/commons/collections/TestFastHashMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastHashMap.java,v 1.12 2003/10/07 22:20:57 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastHashMap.java,v 1.13 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -61,10 +61,12 @@ import java.util.Map; import junit.framework.Test; +import org.apache.commons.collections.map.AbstractTestMap; + /** * Tests FastHashMap. * - * @version $Revision: 1.12 $ $Date: 2003/10/07 22:20:57 $ + * @version $Revision: 1.13 $ $Date: 2003/11/16 22:15:09 $ * * @author Jason van Zyl */ diff --git a/src/test/org/apache/commons/collections/TestFlat3Map.java b/src/test/org/apache/commons/collections/TestFlat3Map.java index d051c4934..f1db233ac 100644 --- a/src/test/org/apache/commons/collections/TestFlat3Map.java +++ b/src/test/org/apache/commons/collections/TestFlat3Map.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/TestFlat3Map.java,v 1.2 2003/11/08 18:46:57 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestFlat3Map.java,v 1.3 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,11 +64,12 @@ import junit.textui.TestRunner; import org.apache.commons.collections.iterators.AbstractTestMapIterator; import org.apache.commons.collections.iterators.MapIterator; +import org.apache.commons.collections.map.AbstractTestMap; /** * JUnit tests. * - * @version $Revision: 1.2 $ $Date: 2003/11/08 18:46:57 $ + * @version $Revision: 1.3 $ $Date: 2003/11/16 22:15:09 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/TestHashBag.java b/src/test/org/apache/commons/collections/TestHashBag.java index 2a321377d..40cf13020 100644 --- a/src/test/org/apache/commons/collections/TestHashBag.java +++ b/src/test/org/apache/commons/collections/TestHashBag.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestHashBag.java,v 1.6 2003/10/05 21:17:40 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestHashBag.java,v 1.7 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -60,11 +60,13 @@ package org.apache.commons.collections; import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.collections.bag.AbstractTestBag; + /** * Extension of {@link TestBag} for exercising the {@link HashBag} * implementation. * - * @version $Revision: 1.6 $ $Date: 2003/10/05 21:17:40 $ + * @version $Revision: 1.7 $ $Date: 2003/11/16 22:15:09 $ * * @author Chuck Burdick */ diff --git a/src/test/org/apache/commons/collections/TestLinkedList.java b/src/test/org/apache/commons/collections/TestLinkedList.java index 82d07a728..f911b6a1e 100644 --- a/src/test/org/apache/commons/collections/TestLinkedList.java +++ b/src/test/org/apache/commons/collections/TestLinkedList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestLinkedList.java,v 1.5 2003/10/05 21:17:40 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestLinkedList.java,v 1.6 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -63,6 +63,8 @@ import java.util.LinkedList; import java.util.List; import java.util.NoSuchElementException; +import org.apache.commons.collections.list.AbstractTestList; + /** * Tests base {@link java.util.LinkedList} methods and contracts. *

@@ -73,7 +75,7 @@ import java.util.NoSuchElementException; * you may still use this base set of cases. Simply override the * test case (method) your {@link List} fails. * - * @version $Revision: 1.5 $ $Date: 2003/10/05 21:17:40 $ + * @version $Revision: 1.6 $ $Date: 2003/11/16 22:15:09 $ * * @author Rich Dougherty */ diff --git a/src/test/org/apache/commons/collections/TestListUtils.java b/src/test/org/apache/commons/collections/TestListUtils.java index cfbe85cd6..6713e5955 100644 --- a/src/test/org/apache/commons/collections/TestListUtils.java +++ b/src/test/org/apache/commons/collections/TestListUtils.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestListUtils.java,v 1.15 2003/11/16 00:05:47 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestListUtils.java,v 1.16 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,12 +64,13 @@ import java.util.List; import junit.framework.Test; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.list.PredicatedList; /** * Tests for ListUtils. * - * @version $Revision: 1.15 $ $Date: 2003/11/16 00:05:47 $ + * @version $Revision: 1.16 $ $Date: 2003/11/16 22:15:09 $ * * @author Stephen Colebourne * @author Neil O'Toole diff --git a/src/test/org/apache/commons/collections/TestMapUtils.java b/src/test/org/apache/commons/collections/TestMapUtils.java index 212c525c5..4d6decde7 100644 --- a/src/test/org/apache/commons/collections/TestMapUtils.java +++ b/src/test/org/apache/commons/collections/TestMapUtils.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestMapUtils.java,v 1.19 2003/11/16 00:05:47 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestMapUtils.java,v 1.20 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -70,13 +70,14 @@ import java.util.TreeMap; import junit.framework.Test; +import org.apache.commons.collections.map.AbstractTestMap; import org.apache.commons.collections.map.LazyMap; import org.apache.commons.collections.map.PredicatedMap; /** * Tests for MapUtils. * - * @version $Revision: 1.19 $ $Date: 2003/11/16 00:05:47 $ + * @version $Revision: 1.20 $ $Date: 2003/11/16 22:15:09 $ * * @author Stephen Colebourne * @author Arun Mammen Thomas diff --git a/src/test/org/apache/commons/collections/TestMultiHashMap.java b/src/test/org/apache/commons/collections/TestMultiHashMap.java index 30d77a7cf..d09692b9a 100644 --- a/src/test/org/apache/commons/collections/TestMultiHashMap.java +++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestMultiHashMap.java,v 1.13 2003/10/05 21:17:40 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestMultiHashMap.java,v 1.14 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,10 +64,12 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.collections.map.AbstractTestMap; + /** * Unit Tests for MultiHashMap. * - * @version $Revision: 1.13 $ $Date: 2003/10/05 21:17:40 $ + * @version $Revision: 1.14 $ $Date: 2003/11/16 22:15:09 $ * * @author Unknown */ diff --git a/src/test/org/apache/commons/collections/TestReferenceMap.java b/src/test/org/apache/commons/collections/TestReferenceMap.java index 0f97dd352..abbb827c7 100644 --- a/src/test/org/apache/commons/collections/TestReferenceMap.java +++ b/src/test/org/apache/commons/collections/TestReferenceMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestReferenceMap.java,v 1.13 2003/10/07 22:20:57 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestReferenceMap.java,v 1.14 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -62,10 +62,12 @@ import java.util.Map; import junit.framework.Test; +import org.apache.commons.collections.map.AbstractTestMap; + /** * Tests for ReferenceMap. * - * @version $Revision: 1.13 $ $Date: 2003/10/07 22:20:57 $ + * @version $Revision: 1.14 $ $Date: 2003/11/16 22:15:09 $ * * @author Paul Jack */ diff --git a/src/test/org/apache/commons/collections/TestSequencedHashMap.java b/src/test/org/apache/commons/collections/TestSequencedHashMap.java index ac45bf5cb..561a33a4a 100644 --- a/src/test/org/apache/commons/collections/TestSequencedHashMap.java +++ b/src/test/org/apache/commons/collections/TestSequencedHashMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestSequencedHashMap.java,v 1.22 2003/10/05 21:23:21 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestSequencedHashMap.java,v 1.23 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -65,13 +65,15 @@ import java.util.Map; import junit.framework.Test; +import org.apache.commons.collections.map.AbstractTestMap; + /** * Unit tests * {@link org.apache.commons.collections.SequencedHashMap}. * Be sure to use the "labRat" instance whenever possible, * so that subclasses will be tested correctly. * - * @version $Revision: 1.22 $ $Date: 2003/10/05 21:23:21 $ + * @version $Revision: 1.23 $ $Date: 2003/11/16 22:15:09 $ * * @author Morgan Delagrange * @author Daniel Rall diff --git a/src/test/org/apache/commons/collections/TestSetUtils.java b/src/test/org/apache/commons/collections/TestSetUtils.java index 9df0b162e..fd2698efa 100644 --- a/src/test/org/apache/commons/collections/TestSetUtils.java +++ b/src/test/org/apache/commons/collections/TestSetUtils.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestSetUtils.java,v 1.12 2003/11/16 00:05:47 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestSetUtils.java,v 1.13 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,12 +64,13 @@ import java.util.Set; import junit.framework.Test; +import org.apache.commons.collections.set.AbstractTestSet; import org.apache.commons.collections.set.PredicatedSet; /** * Tests for SetUtils. * - * @version $Revision: 1.12 $ $Date: 2003/11/16 00:05:47 $ + * @version $Revision: 1.13 $ $Date: 2003/11/16 22:15:09 $ * * @author Stephen Colebourne * @author Neil O'Toole diff --git a/src/test/org/apache/commons/collections/TestStaticBucketMap.java b/src/test/org/apache/commons/collections/TestStaticBucketMap.java index d4e9b1dad..e81c91ef0 100644 --- a/src/test/org/apache/commons/collections/TestStaticBucketMap.java +++ b/src/test/org/apache/commons/collections/TestStaticBucketMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestStaticBucketMap.java,v 1.7 2003/10/05 21:23:21 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestStaticBucketMap.java,v 1.8 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -61,11 +61,13 @@ import java.util.Map; import junit.framework.Test; +import org.apache.commons.collections.map.AbstractTestMap; + /** * Unit tests * {@link org.apache.commons.collections.StaticBucketMap}. * - * @version $Revision: 1.7 $ $Date: 2003/10/05 21:23:21 $ + * @version $Revision: 1.8 $ $Date: 2003/11/16 22:15:09 $ * * @author Michael A. Smith */ diff --git a/src/test/org/apache/commons/collections/TestTreeBag.java b/src/test/org/apache/commons/collections/TestTreeBag.java index 4ad9a61b1..07c0f2056 100644 --- a/src/test/org/apache/commons/collections/TestTreeBag.java +++ b/src/test/org/apache/commons/collections/TestTreeBag.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestTreeBag.java,v 1.6 2003/10/05 21:23:21 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestTreeBag.java,v 1.7 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -60,11 +60,13 @@ package org.apache.commons.collections; import junit.framework.Test; import junit.framework.TestSuite; +import org.apache.commons.collections.bag.AbstractTestBag; + /** * Extension of {@link TestBag} for exercising the {@link TreeBag} * implementation. * - * @version $Revision: 1.6 $ $Date: 2003/10/05 21:23:21 $ + * @version $Revision: 1.7 $ $Date: 2003/11/16 22:15:09 $ * * @author Chuck Burdick */ diff --git a/src/test/org/apache/commons/collections/TestTreeMap.java b/src/test/org/apache/commons/collections/TestTreeMap.java index 657586492..78c687ced 100644 --- a/src/test/org/apache/commons/collections/TestTreeMap.java +++ b/src/test/org/apache/commons/collections/TestTreeMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestTreeMap.java,v 1.10 2003/10/07 22:20:57 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestTreeMap.java,v 1.11 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -59,10 +59,12 @@ package org.apache.commons.collections; import java.util.TreeMap; +import org.apache.commons.collections.map.AbstractTestMap; + /** * Tests TreeMap. * - * @version $Revision: 1.10 $ $Date: 2003/10/07 22:20:57 $ + * @version $Revision: 1.11 $ $Date: 2003/11/16 22:15:09 $ * * @author Jason van Zyl */ diff --git a/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java b/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java index 27b77579f..589f6998e 100644 --- a/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java +++ b/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java,v 1.8 2003/10/05 21:23:21 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java,v 1.9 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -63,10 +63,12 @@ import java.util.Iterator; import junit.framework.Test; +import org.apache.commons.collections.collection.AbstractTestCollection; + /** * Test cases for UnboundedFifoBuffer. * - * @version $Revision: 1.8 $ $Date: 2003/10/05 21:23:21 $ + * @version $Revision: 1.9 $ $Date: 2003/11/16 22:15:09 $ * * @author Unknown */ diff --git a/src/test/org/apache/commons/collections/AbstractTestBag.java b/src/test/org/apache/commons/collections/bag/AbstractTestBag.java similarity index 97% rename from src/test/org/apache/commons/collections/AbstractTestBag.java rename to src/test/org/apache/commons/collections/bag/AbstractTestBag.java index 017a41239..cbff3a5e0 100644 --- a/src/test/org/apache/commons/collections/AbstractTestBag.java +++ b/src/test/org/apache/commons/collections/bag/AbstractTestBag.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/AbstractTestBag.java,v 1.2 2003/10/05 12:34:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/AbstractTestBag.java,v 1.1 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -55,13 +55,16 @@ * . * */ -package org.apache.commons.collections; +package org.apache.commons.collections.bag; import java.util.ArrayList; import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.List; +import org.apache.commons.collections.AbstractTestObject; +import org.apache.commons.collections.Bag; + /** * Abstract test class for {@link Bag} methods and contracts. *

@@ -72,7 +75,7 @@ import java.util.List; * you may still use this base set of cases. Simply override the * test case (method) your {@link Bag} fails. * - * @version $Revision: 1.2 $ $Date: 2003/10/05 12:34:46 $ + * @version $Revision: 1.1 $ $Date: 2003/11/16 22:15:10 $ * * @author Chuck Burdick * @author Stephen Colebourne diff --git a/src/test/org/apache/commons/collections/AbstractTestSortedBag.java b/src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.java similarity index 94% rename from src/test/org/apache/commons/collections/AbstractTestSortedBag.java rename to src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.java index 73dbac234..d86ab28b7 100644 --- a/src/test/org/apache/commons/collections/AbstractTestSortedBag.java +++ b/src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.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/AbstractTestSortedBag.java,v 1.2 2003/10/05 23:10:31 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/AbstractTestSortedBag.java,v 1.1 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -55,13 +55,14 @@ * . * */ -package org.apache.commons.collections; +package org.apache.commons.collections.bag; + /** * Abstract test class for {@link SortedBag} methods and contracts. * * @since Commons Collections 3.0 - * @version $Revision: 1.2 $ $Date: 2003/10/05 23:10:31 $ + * @version $Revision: 1.1 $ $Date: 2003/11/16 22:15:10 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java index 9a86c7428..c3a1fdb19 100644 --- a/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -62,7 +62,6 @@ import java.util.Set; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestBag; import org.apache.commons.collections.Bag; import org.apache.commons.collections.HashBag; import org.apache.commons.collections.Predicate; @@ -73,7 +72,7 @@ import org.apache.commons.collections.PredicateUtils; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java index 639fbd015..a7bf7c790 100644 --- a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -62,7 +62,6 @@ import java.util.Comparator; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestSortedBag; import org.apache.commons.collections.Bag; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.PredicateUtils; @@ -74,7 +73,7 @@ import org.apache.commons.collections.TreeBag; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/bag/TestTransformedBag.java b/src/test/org/apache/commons/collections/bag/TestTransformedBag.java index 479ec04bf..6db482bdf 100644 --- a/src/test/org/apache/commons/collections/bag/TestTransformedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestTransformedBag.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestTransformedBag.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestTransformedBag.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -60,7 +60,6 @@ package org.apache.commons.collections.bag; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestBag; import org.apache.commons.collections.Bag; import org.apache.commons.collections.HashBag; import org.apache.commons.collections.collection.TestTransformedCollection; @@ -70,7 +69,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java index 56f953622..5dd650548 100644 --- a/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -60,7 +60,6 @@ package org.apache.commons.collections.bag; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestSortedBag; import org.apache.commons.collections.Bag; import org.apache.commons.collections.TreeBag; import org.apache.commons.collections.collection.TestTransformedCollection; @@ -70,7 +69,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/bag/TestTypedBag.java b/src/test/org/apache/commons/collections/bag/TestTypedBag.java index a7d015d5b..74f0f11eb 100644 --- a/src/test/org/apache/commons/collections/bag/TestTypedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestTypedBag.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestTypedBag.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestTypedBag.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -62,7 +62,6 @@ import java.util.Set; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestBag; import org.apache.commons.collections.Bag; import org.apache.commons.collections.HashBag; @@ -71,7 +70,7 @@ import org.apache.commons.collections.HashBag; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java index 1f00f660d..4377a385b 100644 --- a/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -62,7 +62,6 @@ import java.util.Comparator; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestSortedBag; import org.apache.commons.collections.Bag; import org.apache.commons.collections.SortedBag; import org.apache.commons.collections.TreeBag; @@ -72,7 +71,7 @@ import org.apache.commons.collections.TreeBag; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java b/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java index 51f918668..1d20fbc16 100644 --- a/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java,v 1.1 2003/11/16 20:35:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java,v 1.2 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -63,15 +63,15 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.AbstractTestMap; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.iterators.AbstractTestMapIterator; import org.apache.commons.collections.iterators.MapIterator; +import org.apache.commons.collections.map.AbstractTestMap; /** * Abstract test class for {@link BidiMap} methods and contracts. * - * @version $Revision: 1.1 $ $Date: 2003/11/16 20:35:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:11 $ * * @author Matthew Hawthorne * @author Stephen Colebourne diff --git a/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java index 604db6cd5..61158a975 100644 --- a/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java,v 1.2 2003/11/16 21:39:42 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bidimap/AbstractTestSortedBidiMap.java,v 1.3 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -69,13 +69,13 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.apache.commons.collections.AbstractTestSortedMap; import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections.map.AbstractTestSortedMap; /** * Abstract test class for {@link SortedBidiMap} methods and contracts. * - * @version $Revision: 1.2 $ $Date: 2003/11/16 21:39:42 $ + * @version $Revision: 1.3 $ $Date: 2003/11/16 22:15:11 $ * * @author Matthew Hawthorne * @author Stephen Colebourne diff --git a/src/test/org/apache/commons/collections/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java similarity index 99% rename from src/test/org/apache/commons/collections/AbstractTestCollection.java rename to src/test/org/apache/commons/collections/collection/AbstractTestCollection.java index 62cc4b276..f2370f6f8 100644 --- a/src/test/org/apache/commons/collections/AbstractTestCollection.java +++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.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/AbstractTestCollection.java,v 1.9 2003/11/16 21:39:42 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java,v 1.1 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -55,7 +55,7 @@ * . * */ -package org.apache.commons.collections; +package org.apache.commons.collections.collection; import java.lang.reflect.Array; import java.util.ArrayList; @@ -70,6 +70,8 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; +import org.apache.commons.collections.AbstractTestObject; + /** * Abstract test class for {@link java.util.Collection} methods and contracts. *

@@ -147,7 +149,7 @@ import java.util.NoSuchElementException; * you may still use this base set of cases. Simply override the * test case (method) your {@link Collection} fails. * - * @version $Revision: 1.9 $ $Date: 2003/11/16 21:39:42 $ + * @version $Revision: 1.1 $ $Date: 2003/11/16 22:15:11 $ * * @author Rodney Waldhoff * @author Paul Jack diff --git a/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java b/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java index d8b770f92..3ac45e95e 100644 --- a/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java,v 1.1 2003/11/16 00:05:47 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java,v 1.2 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -63,14 +63,12 @@ import java.util.Iterator; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestCollection; - /** * Extension of {@link AbstractTestCollection} for exercising the * {@link CompositeCollection} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:47 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:11 $ * * @author Brian McCallister * @author Phil Steitz diff --git a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java index 0cdcb5ddc..2eec98d61 100644 --- a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java @@ -61,7 +61,6 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestCollection; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.PredicateUtils; @@ -70,7 +69,7 @@ import org.apache.commons.collections.PredicateUtils; * {@link PredicatedCollection} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:47 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:11 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java index 999cd63a2..f3aa1c4e5 100644 --- a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java +++ b/src/test/org/apache/commons/collections/collection/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/collection/TestTransformedCollection.java,v 1.1 2003/11/16 00:05:47 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java,v 1.2 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -66,7 +66,6 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestCollection; import org.apache.commons.collections.Transformer; /** @@ -74,7 +73,7 @@ import org.apache.commons.collections.Transformer; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:47 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:11 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/AbstractTestList.java b/src/test/org/apache/commons/collections/list/AbstractTestList.java similarity index 99% rename from src/test/org/apache/commons/collections/AbstractTestList.java rename to src/test/org/apache/commons/collections/list/AbstractTestList.java index bb57339ca..d25016808 100644 --- a/src/test/org/apache/commons/collections/AbstractTestList.java +++ b/src/test/org/apache/commons/collections/list/AbstractTestList.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/AbstractTestList.java,v 1.3 2003/10/20 22:58:28 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/list/AbstractTestList.java,v 1.1 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -55,7 +55,7 @@ * . * */ -package org.apache.commons.collections; +package org.apache.commons.collections.list; import java.io.IOException; import java.io.Serializable; @@ -72,6 +72,9 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; +import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections.collection.AbstractTestCollection; + /** * Abstract test class for {@link java.util.List} methods and contracts. *

@@ -83,7 +86,7 @@ import java.util.NoSuchElementException; * test case (method) your {@link List} fails or override one of the * protected methods from AbstractTestCollection. * - * @version $Revision: 1.3 $ $Date: 2003/10/20 22:58:28 $ + * @version $Revision: 1.1 $ $Date: 2003/11/16 22:15:09 $ * * @author Rodney Waldhoff * @author Paul Jack diff --git a/src/test/org/apache/commons/collections/list/TestFixedSizeList.java b/src/test/org/apache/commons/collections/list/TestFixedSizeList.java index 94457ab4b..83c3b4b0e 100644 --- a/src/test/org/apache/commons/collections/list/TestFixedSizeList.java +++ b/src/test/org/apache/commons/collections/list/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/list/TestFixedSizeList.java,v 1.1 2003/11/16 00:05:44 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/list/TestFixedSizeList.java,v 1.2 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,14 +64,12 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestList; - /** * Extension of {@link TestList} for exercising the {@link FixedSizeList} * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:44 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:09 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/list/TestPredicatedList.java b/src/test/org/apache/commons/collections/list/TestPredicatedList.java index a5362fbb4..aafefcb83 100644 --- a/src/test/org/apache/commons/collections/list/TestPredicatedList.java +++ b/src/test/org/apache/commons/collections/list/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/list/TestPredicatedList.java,v 1.1 2003/11/16 00:05:44 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/list/TestPredicatedList.java,v 1.2 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -63,7 +63,6 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestList; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.PredicateUtils; @@ -72,7 +71,7 @@ import org.apache.commons.collections.PredicateUtils; * {@link PredicatedList} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:44 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:09 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/list/TestSetUniqueList.java b/src/test/org/apache/commons/collections/list/TestSetUniqueList.java index 6380b8bc2..fef049b1f 100644 --- a/src/test/org/apache/commons/collections/list/TestSetUniqueList.java +++ b/src/test/org/apache/commons/collections/list/TestSetUniqueList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/list/TestSetUniqueList.java,v 1.1 2003/11/16 00:05:44 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/list/TestSetUniqueList.java,v 1.2 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -67,13 +67,11 @@ import junit.framework.Test; import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.commons.collections.AbstractTestList; - /** * JUnit tests. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:44 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:09 $ * * @author Matthew Hawthorne */ diff --git a/src/test/org/apache/commons/collections/list/TestTransformedList.java b/src/test/org/apache/commons/collections/list/TestTransformedList.java index ede435da3..8a1b90cc7 100644 --- a/src/test/org/apache/commons/collections/list/TestTransformedList.java +++ b/src/test/org/apache/commons/collections/list/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/list/TestTransformedList.java,v 1.1 2003/11/16 00:05:44 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/list/TestTransformedList.java,v 1.2 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -66,7 +66,6 @@ import java.util.ListIterator; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestList; import org.apache.commons.collections.collection.TestTransformedCollection; /** @@ -74,7 +73,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:44 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:09 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java b/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java index f9ff75794..d6495ffff 100644 --- a/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java +++ b/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java,v 1.1 2003/11/16 00:05:44 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java,v 1.2 2003/11/16 22:15:09 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -65,7 +65,6 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestList; import org.apache.commons.collections.map.TestPredicatedSortedMap; /** @@ -73,7 +72,7 @@ import org.apache.commons.collections.map.TestPredicatedSortedMap; * {@link UnmodifiableList} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:44 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:09 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/AbstractTestMap.java b/src/test/org/apache/commons/collections/map/AbstractTestMap.java similarity index 98% rename from src/test/org/apache/commons/collections/AbstractTestMap.java rename to src/test/org/apache/commons/collections/map/AbstractTestMap.java index 79226fd2e..18c3cf51c 100644 --- a/src/test/org/apache/commons/collections/AbstractTestMap.java +++ b/src/test/org/apache/commons/collections/map/AbstractTestMap.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/AbstractTestMap.java,v 1.13 2003/11/16 21:39:42 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/AbstractTestMap.java,v 1.1 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -55,7 +55,7 @@ * . * */ -package org.apache.commons.collections; +package org.apache.commons.collections.map; import java.io.IOException; import java.io.Serializable; @@ -67,6 +67,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.collections.AbstractTestObject; +import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections.collection.AbstractTestCollection; +import org.apache.commons.collections.set.AbstractTestSet; + /** * Abstract test class for {@link java.util.Map} methods and contracts. *

@@ -153,7 +158,7 @@ import java.util.Set; * @author Rodney Waldhoff * @author Paul Jack * @author Stephen Colebourne - * @version $Revision: 1.13 $ $Date: 2003/11/16 21:39:42 $ + * @version $Revision: 1.1 $ $Date: 2003/11/16 22:15:10 $ */ public abstract class AbstractTestMap extends AbstractTestObject { @@ -444,6 +449,12 @@ public abstract class AbstractTestMap extends AbstractTestObject { return (Map.Entry) map.entrySet().iterator().next(); } + /** + * Gets the compatability version, needed for package access. + */ + protected String getCompatibilityVersion() { + return super.getCompatibilityVersion(); + } //----------------------------------------------------------------------- /** * Test to ensure the test setup is working properly. This method checks diff --git a/src/test/org/apache/commons/collections/AbstractTestSortedMap.java b/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java similarity index 98% rename from src/test/org/apache/commons/collections/AbstractTestSortedMap.java rename to src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java index f3d6ae545..e92ef3711 100644 --- a/src/test/org/apache/commons/collections/AbstractTestSortedMap.java +++ b/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.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/AbstractTestSortedMap.java,v 1.4 2003/10/31 01:25:45 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/AbstractTestSortedMap.java,v 1.1 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -55,7 +55,7 @@ * . * */ -package org.apache.commons.collections; +package org.apache.commons.collections.map; import java.util.ArrayList; import java.util.Arrays; @@ -65,10 +65,12 @@ import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; +import org.apache.commons.collections.BulkTest; + /** * Abstract test class for {@link java.util.SortedMap} methods and contracts. * - * @version $Revision: 1.4 $ $Date: 2003/10/31 01:25:45 $ + * @version $Revision: 1.1 $ $Date: 2003/11/16 22:15:11 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java b/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java index 5213d3175..d5b0a2ba7 100644 --- a/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java +++ b/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java,v 1.2 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -63,14 +63,12 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestMap; - /** * Extension of {@link AbstractTestMap} for exercising the {@link FixedSizeMap} * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:11 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java b/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java index 559b4588d..c861c6d98 100644 --- a/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java +++ b/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java,v 1.2 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -63,7 +63,6 @@ import java.util.TreeMap; import junit.framework.Test; -import org.apache.commons.collections.AbstractTestSortedMap; import org.apache.commons.collections.BulkTest; /** @@ -71,7 +70,7 @@ import org.apache.commons.collections.BulkTest; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:11 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/map/TestLazyMap.java b/src/test/org/apache/commons/collections/map/TestLazyMap.java index 11a5f1efc..c6ff5035f 100644 --- a/src/test/org/apache/commons/collections/map/TestLazyMap.java +++ b/src/test/org/apache/commons/collections/map/TestLazyMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestLazyMap.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestLazyMap.java,v 1.2 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -63,7 +63,6 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestMap; import org.apache.commons.collections.Factory; import org.apache.commons.collections.FactoryUtils; @@ -72,7 +71,7 @@ import org.apache.commons.collections.FactoryUtils; * {@link LazyMap} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:11 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/map/TestListOrderedMap.java b/src/test/org/apache/commons/collections/map/TestListOrderedMap.java index 52505ba4b..dea4b6e50 100644 --- a/src/test/org/apache/commons/collections/map/TestListOrderedMap.java +++ b/src/test/org/apache/commons/collections/map/TestListOrderedMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestListOrderedMap.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestListOrderedMap.java,v 1.2 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -66,7 +66,6 @@ import java.util.Set; import junit.framework.Test; -import org.apache.commons.collections.AbstractTestMap; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.iterators.AbstractTestMapIterator; import org.apache.commons.collections.iterators.MapIterator; @@ -76,7 +75,7 @@ import org.apache.commons.collections.iterators.MapIterator; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:11 $ * * @author Henri Yandell * @author Stephen Colebourne diff --git a/src/test/org/apache/commons/collections/map/TestPredicatedMap.java b/src/test/org/apache/commons/collections/map/TestPredicatedMap.java index b63198acb..f064a65a6 100644 --- a/src/test/org/apache/commons/collections/map/TestPredicatedMap.java +++ b/src/test/org/apache/commons/collections/map/TestPredicatedMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestPredicatedMap.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestPredicatedMap.java,v 1.2 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,7 +64,6 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestMap; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.PredicateUtils; @@ -73,7 +72,7 @@ import org.apache.commons.collections.PredicateUtils; * {@link PredicatedMap} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:11 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/map/TestTransformedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedMap.java index 0b3f6a417..d94180f46 100644 --- a/src/test/org/apache/commons/collections/map/TestTransformedMap.java +++ b/src/test/org/apache/commons/collections/map/TestTransformedMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestTransformedMap.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestTransformedMap.java,v 1.2 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,7 +64,6 @@ import java.util.Set; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestMap; import org.apache.commons.collections.collection.TestTransformedCollection; /** @@ -72,7 +71,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:11 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java index 5d8e58647..bd601257c 100644 --- a/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java +++ b/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java,v 1.2 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -63,7 +63,6 @@ import java.util.TreeMap; import junit.framework.Test; -import org.apache.commons.collections.AbstractTestSortedMap; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.collection.TestTransformedCollection; @@ -72,7 +71,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:11 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java index 7fa5c39cf..012233872 100644 --- a/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java +++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -67,14 +67,12 @@ import java.util.Set; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestMap; - /** * Extension of {@link AbstractTestMap} for exercising the * {@link UnmodifiableMap} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/observed/TestObservableBag.java b/src/test/org/apache/commons/collections/observed/TestObservableBag.java index d6ab4a6e9..7a9b63f6f 100644 --- a/src/test/org/apache/commons/collections/observed/TestObservableBag.java +++ b/src/test/org/apache/commons/collections/observed/TestObservableBag.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/TestObservableBag.java,v 1.3 2003/11/02 16:21:16 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/observed/Attic/TestObservableBag.java,v 1.4 2003/11/16 22:15:12 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -60,16 +60,16 @@ package org.apache.commons.collections.observed; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestBag; import org.apache.commons.collections.Bag; import org.apache.commons.collections.HashBag; +import org.apache.commons.collections.bag.AbstractTestBag; /** * Extension of {@link TestBag} for exercising the * {@link ObservableBag} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.3 $ $Date: 2003/11/02 16:21:16 $ + * @version $Revision: 1.4 $ $Date: 2003/11/16 22:15:12 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/observed/TestObservableBuffer.java b/src/test/org/apache/commons/collections/observed/TestObservableBuffer.java index 622a4e8ac..0952fbe2f 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.3 2003/11/02 16:21:16 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.4 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,15 +64,15 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestCollection; import org.apache.commons.collections.ArrayStack; +import org.apache.commons.collections.collection.AbstractTestCollection; /** * Extension of {@link TestCollection} for exercising the * {@link ObservableBuffer} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.3 $ $Date: 2003/11/02 16:21:16 $ + * @version $Revision: 1.4 $ $Date: 2003/11/16 22:15:11 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/observed/TestObservableCollection.java b/src/test/org/apache/commons/collections/observed/TestObservableCollection.java index a8293c902..91fb51ff5 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.2 2003/10/02 22:14:35 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.3 2003/11/16 22:15:12 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.AbstractTestCollection; +import org.apache.commons.collections.collection.AbstractTestCollection; /** * Extension of {@link TestCollection} for exercising the * {@link ObservedCollection} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.2 $ $Date: 2003/10/02 22:14:35 $ + * @version $Revision: 1.3 $ $Date: 2003/11/16 22:15:12 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/observed/TestObservableList.java b/src/test/org/apache/commons/collections/observed/TestObservableList.java index 3d2e4b733..da1c3e5ee 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.2 2003/10/02 22:14:34 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.3 2003/11/16 22:15:12 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,14 +64,14 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestList; +import org.apache.commons.collections.list.AbstractTestList; /** * Extension of {@link TestList} for exercising the * {@link ObservedList} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.2 $ $Date: 2003/10/02 22:14:34 $ + * @version $Revision: 1.3 $ $Date: 2003/11/16 22:15:12 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/observed/TestObservableSet.java b/src/test/org/apache/commons/collections/observed/TestObservableSet.java index 943f5f336..01e411279 100644 --- a/src/test/org/apache/commons/collections/observed/TestObservableSet.java +++ b/src/test/org/apache/commons/collections/observed/TestObservableSet.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/TestObservableSet.java,v 1.2 2003/10/02 22:48:40 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/observed/Attic/TestObservableSet.java,v 1.3 2003/11/16 22:15:12 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,14 +64,14 @@ import java.util.Set; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestSet; +import org.apache.commons.collections.set.AbstractTestSet; /** * Extension of {@link TestSet} for exercising the * {@link ObservedSet} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.2 $ $Date: 2003/10/02 22:48:40 $ + * @version $Revision: 1.3 $ $Date: 2003/11/16 22:15:12 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/observed/TestObservableSortedBag.java b/src/test/org/apache/commons/collections/observed/TestObservableSortedBag.java index 3cdbfc678..426d82cfe 100644 --- a/src/test/org/apache/commons/collections/observed/TestObservableSortedBag.java +++ b/src/test/org/apache/commons/collections/observed/TestObservableSortedBag.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/TestObservableSortedBag.java,v 1.3 2003/11/02 16:21:16 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/observed/Attic/TestObservableSortedBag.java,v 1.4 2003/11/16 22:15:12 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -60,16 +60,16 @@ package org.apache.commons.collections.observed; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestSortedBag; import org.apache.commons.collections.Bag; import org.apache.commons.collections.TreeBag; +import org.apache.commons.collections.bag.AbstractTestSortedBag; /** * Extension of {@link TestSortedBag} for exercising the * {@link ObservedSortedBag} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.3 $ $Date: 2003/11/02 16:21:16 $ + * @version $Revision: 1.4 $ $Date: 2003/11/16 22:15:12 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/observed/TestObservableSortedSet.java b/src/test/org/apache/commons/collections/observed/TestObservableSortedSet.java index 4ab225d42..6f36fcd27 100644 --- a/src/test/org/apache/commons/collections/observed/TestObservableSortedSet.java +++ b/src/test/org/apache/commons/collections/observed/TestObservableSortedSet.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/TestObservableSortedSet.java,v 1.5 2003/11/02 16:21:16 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/observed/Attic/TestObservableSortedSet.java,v 1.6 2003/11/16 22:15:12 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,15 +64,15 @@ import java.util.TreeSet; import junit.framework.Test; -import org.apache.commons.collections.AbstractTestSortedSet; import org.apache.commons.collections.BulkTest; +import org.apache.commons.collections.set.AbstractTestSortedSet; /** * Extension of {@link TestSortedSet} for exercising the * {@link ObservedSortedSet} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.5 $ $Date: 2003/11/02 16:21:16 $ + * @version $Revision: 1.6 $ $Date: 2003/11/16 22:15:12 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/primitives/TestAbstractLongArrayList.java b/src/test/org/apache/commons/collections/primitives/TestAbstractLongArrayList.java index c4122ebf2..8191270a3 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.9 2003/10/09 11:09:10 rwaldhoff 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.10 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -59,10 +59,10 @@ package org.apache.commons.collections.primitives; import java.util.List; -import org.apache.commons.collections.AbstractTestList; +import org.apache.commons.collections.list.AbstractTestList; /** - * @version $Revision: 1.9 $ $Date: 2003/10/09 11:09:10 $ + * @version $Revision: 1.10 $ $Date: 2003/11/16 22:15:11 $ * @author Rodney Waldhoff * @deprecated this should have been removed along with the others */ diff --git a/src/test/org/apache/commons/collections/primitives/TestByteList.java b/src/test/org/apache/commons/collections/primitives/TestByteList.java index a7bb3b4fd..d4bd1e127 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.4 2003/10/02 22:14:33 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.5 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -61,12 +61,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.commons.collections.AbstractTestList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.adapters.ByteListList; import org.apache.commons.collections.primitives.adapters.ListByteList; /** - * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:33 $ + * @version $Revision: 1.5 $ $Date: 2003/11/16 22:15:11 $ * @author Rodney Waldhoff */ public abstract class TestByteList extends AbstractTestList { diff --git a/src/test/org/apache/commons/collections/primitives/TestCharList.java b/src/test/org/apache/commons/collections/primitives/TestCharList.java index d482be8ef..7ce22904e 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.4 2003/10/02 22:14:33 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.5 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -61,12 +61,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.commons.collections.AbstractTestList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.adapters.CharListList; import org.apache.commons.collections.primitives.adapters.ListCharList; /** - * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:33 $ + * @version $Revision: 1.5 $ $Date: 2003/11/16 22:15:11 $ * @author Rodney Waldhoff */ public abstract class TestCharList extends AbstractTestList { diff --git a/src/test/org/apache/commons/collections/primitives/TestDoubleList.java b/src/test/org/apache/commons/collections/primitives/TestDoubleList.java index 8992a328a..b3fcda8ff 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.3 2003/10/02 22:14:33 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.4 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -61,12 +61,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.commons.collections.AbstractTestList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.adapters.DoubleListList; import org.apache.commons.collections.primitives.adapters.ListDoubleList; /** - * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:33 $ + * @version $Revision: 1.4 $ $Date: 2003/11/16 22:15:11 $ * @author Rodney Waldhoff */ public abstract class TestDoubleList extends AbstractTestList { diff --git a/src/test/org/apache/commons/collections/primitives/TestFloatList.java b/src/test/org/apache/commons/collections/primitives/TestFloatList.java index 41678c259..14effec27 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.3 2003/10/02 22:14:33 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.4 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -61,12 +61,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.commons.collections.AbstractTestList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.adapters.FloatListList; import org.apache.commons.collections.primitives.adapters.ListFloatList; /** - * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:33 $ + * @version $Revision: 1.4 $ $Date: 2003/11/16 22:15:11 $ * @author Rodney Waldhoff */ public abstract class TestFloatList extends AbstractTestList { diff --git a/src/test/org/apache/commons/collections/primitives/TestIntList.java b/src/test/org/apache/commons/collections/primitives/TestIntList.java index 236897733..84d3aa304 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.11 2003/10/02 22:14:33 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.12 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -61,12 +61,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.commons.collections.AbstractTestList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.adapters.IntListList; import org.apache.commons.collections.primitives.adapters.ListIntList; /** - * @version $Revision: 1.11 $ $Date: 2003/10/02 22:14:33 $ + * @version $Revision: 1.12 $ $Date: 2003/11/16 22:15:11 $ * @author Rodney Waldhoff */ public abstract class TestIntList extends AbstractTestList { diff --git a/src/test/org/apache/commons/collections/primitives/TestLongList.java b/src/test/org/apache/commons/collections/primitives/TestLongList.java index 2b7d59bf4..4d8332149 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.3 2003/10/02 22:14:33 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.4 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -61,12 +61,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.commons.collections.AbstractTestList; -import org.apache.commons.collections.primitives.adapters.LongListList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.adapters.ListLongList; +import org.apache.commons.collections.primitives.adapters.LongListList; /** - * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:33 $ + * @version $Revision: 1.4 $ $Date: 2003/11/16 22:15:11 $ * @author Rodney Waldhoff */ public abstract class TestLongList extends AbstractTestList { diff --git a/src/test/org/apache/commons/collections/primitives/TestShortList.java b/src/test/org/apache/commons/collections/primitives/TestShortList.java index 5fb2bb14f..34a2eddfb 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.4 2003/10/02 22:14:33 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.5 2003/11/16 22:15:11 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -61,12 +61,12 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.commons.collections.AbstractTestList; -import org.apache.commons.collections.primitives.adapters.ShortListList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.adapters.ListShortList; +import org.apache.commons.collections.primitives.adapters.ShortListList; /** - * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:33 $ + * @version $Revision: 1.5 $ $Date: 2003/11/16 22:15:11 $ * @author Rodney Waldhoff */ public abstract class TestShortList extends AbstractTestList { 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 d03759ee4..f01652578 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.3 2003/10/02 22:14:31 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.4 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; 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; +import org.apache.commons.collections.primitives.RandomAccessByteList; /** - * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.4 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestByteCollectionCollection extends AbstractTestObject { 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 d694e21fe..23daf92c5 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.3 2003/10/02 22:14:31 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.4 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.AbstractTestList; -import org.apache.commons.collections.primitives.RandomAccessByteList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.ArrayByteList; +import org.apache.commons.collections.primitives.RandomAccessByteList; /** - * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.4 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestByteListList extends AbstractTestList { 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 5ade7f3e4..ba6292806 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.3 2003/10/02 22:14:31 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.4 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; 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; +import org.apache.commons.collections.primitives.RandomAccessCharList; /** - * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.4 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestCharCollectionCollection extends AbstractTestObject { 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 80b17039d..b2c578bdb 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.3 2003/10/02 22:14:31 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.4 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.AbstractTestList; -import org.apache.commons.collections.primitives.RandomAccessCharList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.ArrayCharList; +import org.apache.commons.collections.primitives.RandomAccessCharList; /** - * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.4 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestCharListList extends AbstractTestList { 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 298a110fa..fb1846539 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.3 2003/10/02 22:14:31 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.4 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; 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; +import org.apache.commons.collections.primitives.RandomAccessDoubleList; /** - * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.4 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestDoubleCollectionCollection extends AbstractTestObject { 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 056d23100..5c4b67c00 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.3 2003/10/02 22:14:31 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.4 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.AbstractTestList; -import org.apache.commons.collections.primitives.RandomAccessDoubleList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.ArrayDoubleList; +import org.apache.commons.collections.primitives.RandomAccessDoubleList; /** - * @version $Revision: 1.3 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.4 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestDoubleListList extends AbstractTestList { 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 39ce1718d..c8a069c14 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.4 2003/10/02 22:14:31 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.5 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; 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; +import org.apache.commons.collections.primitives.RandomAccessFloatList; /** - * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.5 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestFloatCollectionCollection extends AbstractTestObject { 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 4a0a7f551..208d5206c 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.4 2003/10/02 22:14:31 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.5 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.AbstractTestList; -import org.apache.commons.collections.primitives.RandomAccessFloatList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.ArrayFloatList; +import org.apache.commons.collections.primitives.RandomAccessFloatList; /** - * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.5 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestFloatListList extends AbstractTestList { 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 ee2a679b7..bbe3dd3d8 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.5 2003/10/02 22:14:31 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.6 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; 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; +import org.apache.commons.collections.primitives.RandomAccessIntList; /** - * @version $Revision: 1.5 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.6 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestIntCollectionCollection extends AbstractTestObject { 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 f1a9a22dd..12c8db0ac 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.6 2003/10/02 22:14:31 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.7 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.AbstractTestList; -import org.apache.commons.collections.primitives.RandomAccessIntList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.ArrayIntList; +import org.apache.commons.collections.primitives.RandomAccessIntList; /** - * @version $Revision: 1.6 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.7 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestIntListList extends AbstractTestList { 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 e3806b9b3..572faf3c4 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.4 2003/10/02 22:14:31 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.5 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; 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; +import org.apache.commons.collections.primitives.RandomAccessLongList; /** - * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.5 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestLongCollectionCollection extends AbstractTestObject { 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 057511ab6..4bb40aa0d 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.4 2003/10/02 22:14:31 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.5 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.AbstractTestList; -import org.apache.commons.collections.primitives.RandomAccessLongList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.ArrayLongList; +import org.apache.commons.collections.primitives.RandomAccessLongList; /** - * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.5 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestLongListList extends AbstractTestList { 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 cda99d001..1e0ac1384 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.4 2003/10/02 22:14:31 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.5 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; 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.RandomAccessShortList; import org.apache.commons.collections.primitives.ShortList; /** - * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.5 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestShortCollectionCollection extends AbstractTestObject { 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 f257a087f..2ab34618f 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.4 2003/10/02 22:14:31 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.5 2003/11/16 22:15:08 scolebourne Exp $ * ==================================================================== * The Apache Software License, Version 1.1 * @@ -64,12 +64,12 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.apache.commons.collections.BulkTest; -import org.apache.commons.collections.AbstractTestList; -import org.apache.commons.collections.primitives.RandomAccessShortList; +import org.apache.commons.collections.list.AbstractTestList; import org.apache.commons.collections.primitives.ArrayShortList; +import org.apache.commons.collections.primitives.RandomAccessShortList; /** - * @version $Revision: 1.4 $ $Date: 2003/10/02 22:14:31 $ + * @version $Revision: 1.5 $ $Date: 2003/11/16 22:15:08 $ * @author Rodney Waldhoff */ public class TestShortListList extends AbstractTestList { diff --git a/src/test/org/apache/commons/collections/AbstractTestSet.java b/src/test/org/apache/commons/collections/set/AbstractTestSet.java similarity index 96% rename from src/test/org/apache/commons/collections/AbstractTestSet.java rename to src/test/org/apache/commons/collections/set/AbstractTestSet.java index 8ac911e3c..5372b0cbe 100644 --- a/src/test/org/apache/commons/collections/AbstractTestSet.java +++ b/src/test/org/apache/commons/collections/set/AbstractTestSet.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/AbstractTestSet.java,v 1.3 2003/10/10 21:19:39 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/AbstractTestSet.java,v 1.1 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -55,7 +55,7 @@ * . * */ -package org.apache.commons.collections; +package org.apache.commons.collections.set; import java.util.Arrays; import java.util.Collection; @@ -63,6 +63,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import org.apache.commons.collections.collection.AbstractTestCollection; + /** * Abstract test class for {@link Set} methods and contracts. *

@@ -78,7 +80,7 @@ import java.util.Set; * elements may be added; see {@link AbstractTestCollection} for more details. * * @since Commons Collections 3.0 - * @version $Revision: 1.3 $ $Date: 2003/10/10 21:19:39 $ + * @version $Revision: 1.1 $ $Date: 2003/11/16 22:15:10 $ * * @author Paul Jack */ diff --git a/src/test/org/apache/commons/collections/AbstractTestSortedSet.java b/src/test/org/apache/commons/collections/set/AbstractTestSortedSet.java similarity index 97% rename from src/test/org/apache/commons/collections/AbstractTestSortedSet.java rename to src/test/org/apache/commons/collections/set/AbstractTestSortedSet.java index 37707cbea..05bc6902b 100644 --- a/src/test/org/apache/commons/collections/AbstractTestSortedSet.java +++ b/src/test/org/apache/commons/collections/set/AbstractTestSortedSet.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/AbstractTestSortedSet.java,v 1.4 2003/10/12 06:37:30 psteitz Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/AbstractTestSortedSet.java,v 1.1 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -55,7 +55,7 @@ * . * */ -package org.apache.commons.collections; +package org.apache.commons.collections.set; import java.util.Collection; import java.util.Iterator; @@ -63,6 +63,8 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; +import org.apache.commons.collections.BulkTest; + /** * Abstract test class for {@link SortedSet} methods and contracts. *

@@ -72,7 +74,7 @@ import java.util.TreeSet; * elements may be added; see {@link AbstractTestCollection} for more details. * * @since Commons Collections 3.0 - * @version $Revision: 1.4 $ $Date: 2003/10/12 06:37:30 $ + * @version $Revision: 1.1 $ $Date: 2003/11/16 22:15:10 $ * * @author Stephen Colebourne * @author Dieter Wimberger @@ -220,7 +222,7 @@ public abstract class AbstractTestSortedSet extends AbstractTestSet { return new TestSortedSetSubSet(lobound, false); } - class TestSortedSetSubSet extends AbstractTestSortedSet { + public class TestSortedSetSubSet extends AbstractTestSortedSet { private int m_Type; private int m_LowBound; diff --git a/src/test/org/apache/commons/collections/set/TestListOrderedSet.java b/src/test/org/apache/commons/collections/set/TestListOrderedSet.java index 527f0b891..ca8c19a22 100644 --- a/src/test/org/apache/commons/collections/set/TestListOrderedSet.java +++ b/src/test/org/apache/commons/collections/set/TestListOrderedSet.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestListOrderedSet.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestListOrderedSet.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -66,14 +66,12 @@ import java.util.Set; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestSet; - /** * Extension of {@link TestSet} for exercising the {@link ListOrderedSet} * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Henning P. Schmiedehausen * @author Stephen Colebourne diff --git a/src/test/org/apache/commons/collections/set/TestPredicatedSet.java b/src/test/org/apache/commons/collections/set/TestPredicatedSet.java index 0b23800c8..cae4bc3ac 100644 --- a/src/test/org/apache/commons/collections/set/TestPredicatedSet.java +++ b/src/test/org/apache/commons/collections/set/TestPredicatedSet.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestPredicatedSet.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestPredicatedSet.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -63,7 +63,6 @@ import java.util.Set; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestSet; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.PredicateUtils; @@ -72,7 +71,7 @@ import org.apache.commons.collections.PredicateUtils; * {@link PredicatedSet} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java b/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java index fa77397d6..ad279ee40 100644 --- a/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java +++ b/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -65,7 +65,6 @@ import java.util.TreeSet; import junit.framework.Test; -import org.apache.commons.collections.AbstractTestSortedSet; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.PredicateUtils; @@ -76,7 +75,7 @@ import org.apache.commons.collections.map.TestPredicatedSortedMap; * {@link PredicatedSortedSet} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/set/TestTransformedSet.java b/src/test/org/apache/commons/collections/set/TestTransformedSet.java index f3cd3be48..95c6b781f 100644 --- a/src/test/org/apache/commons/collections/set/TestTransformedSet.java +++ b/src/test/org/apache/commons/collections/set/TestTransformedSet.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestTransformedSet.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestTransformedSet.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -65,7 +65,6 @@ import java.util.Set; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestSet; import org.apache.commons.collections.collection.TestTransformedCollection; /** @@ -73,7 +72,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java b/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java index 60f868d0c..83ce1323f 100644 --- a/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java +++ b/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -65,7 +65,6 @@ import java.util.TreeSet; import junit.framework.Test; -import org.apache.commons.collections.AbstractTestSortedSet; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.collection.TestTransformedCollection; @@ -74,7 +73,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Stephen Colebourne */ diff --git a/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java b/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java index 0c7b06167..1b6b8a98a 100644 --- a/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java +++ b/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestTypedSortedSet.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -64,7 +64,6 @@ import java.util.TreeSet; import junit.framework.Test; -import org.apache.commons.collections.AbstractTestSortedSet; import org.apache.commons.collections.BulkTest; @@ -73,7 +72,7 @@ import org.apache.commons.collections.BulkTest; * {@link TypedSortedSet} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Phil Steitz */ diff --git a/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java b/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java index e2b4bb8b1..998e0ff8f 100644 --- a/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java +++ b/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java,v 1.1 2003/11/16 00:05:46 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java,v 1.2 2003/11/16 22:15:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -66,14 +66,12 @@ import java.util.TreeSet; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.commons.collections.AbstractTestSortedSet; - /** * Extension of {@link AbstractTestSortedSet} for exercising the * {@link UnmodifiableSortedSet} implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.1 $ $Date: 2003/11/16 00:05:46 $ + * @version $Revision: 1.2 $ $Date: 2003/11/16 22:15:10 $ * * @author Phil Steitz */