diff --git a/src/test/org/apache/commons/collections/BulkTest.java b/src/test/org/apache/commons/collections/BulkTest.java index 1bdf5ede6..5e3864deb 100644 --- a/src/test/org/apache/commons/collections/BulkTest.java +++ b/src/test/org/apache/commons/collections/BulkTest.java @@ -1,16 +1,17 @@ package org.apache.commons.collections; -import junit.framework.TestCase; -import junit.framework.TestSuite; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * A {@link TestCase} that can define both simple and bulk test methods.

@@ -119,7 +120,7 @@ import java.util.List; * interpret bulk test methods. * * @author Paul Jack - * @version $Id: BulkTest.java,v 1.2 2002/10/12 22:36:22 scolebourne Exp $ + * @version $Id: BulkTest.java,v 1.3 2003/02/19 20:33:11 scolebourne Exp $ */ public class BulkTest extends TestCase implements Cloneable { diff --git a/src/test/org/apache/commons/collections/TestAll.java b/src/test/org/apache/commons/collections/TestAll.java index a7c6821e0..a1e088698 100644 --- a/src/test/org/apache/commons/collections/TestAll.java +++ b/src/test/org/apache/commons/collections/TestAll.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestAll.java,v 1.39 2003/01/07 15:18:14 rwaldhoff Exp $ - * $Revision: 1.39 $ - * $Date: 2003/01/07 15:18:14 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestAll.java,v 1.40 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.40 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -61,12 +61,14 @@ package org.apache.commons.collections; -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * Entry point for all Collections tests. * @author Rodney Waldhoff - * @version $Id: TestAll.java,v 1.39 2003/01/07 15:18:14 rwaldhoff Exp $ + * @version $Id: TestAll.java,v 1.40 2003/02/19 20:33:11 scolebourne Exp $ */ public class TestAll extends TestCase { public TestAll(String testName) { diff --git a/src/test/org/apache/commons/collections/TestArrayList.java b/src/test/org/apache/commons/collections/TestArrayList.java index d588df12c..c70f10a91 100644 --- a/src/test/org/apache/commons/collections/TestArrayList.java +++ b/src/test/org/apache/commons/collections/TestArrayList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestArrayList.java,v 1.5 2002/10/12 22:36:21 scolebourne Exp $ - * $Revision: 1.5 $ - * $Date: 2002/10/12 22:36:21 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestArrayList.java,v 1.6 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.6 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -61,13 +61,14 @@ package org.apache.commons.collections; +import java.util.ArrayList; + import junit.framework.Test; import junit.framework.TestSuite; -import java.util.ArrayList; /** * @author Jason van Zyl - * @version $Id: TestArrayList.java,v 1.5 2002/10/12 22:36:21 scolebourne Exp $ + * @version $Id: TestArrayList.java,v 1.6 2003/02/19 20:33:11 scolebourne Exp $ */ public abstract class TestArrayList extends TestList { diff --git a/src/test/org/apache/commons/collections/TestArrayStack.java b/src/test/org/apache/commons/collections/TestArrayStack.java index 94b7dc3ba..39f480238 100644 --- a/src/test/org/apache/commons/collections/TestArrayStack.java +++ b/src/test/org/apache/commons/collections/TestArrayStack.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestArrayStack.java,v 1.7 2002/06/21 03:33:28 mas Exp $ - * $Revision: 1.7 $ - * $Date: 2002/06/21 03:33:28 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestArrayStack.java,v 1.8 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.8 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -61,12 +61,14 @@ package org.apache.commons.collections; -import junit.framework.*; -import java.util.*; +import java.util.EmptyStackException; +import java.util.List; + +import junit.framework.Test; /** * @author Craig McClanahan - * @version $Id: TestArrayStack.java,v 1.7 2002/06/21 03:33:28 mas Exp $ + * @version $Id: TestArrayStack.java,v 1.8 2003/02/19 20:33:11 scolebourne Exp $ */ public class TestArrayStack extends TestArrayList { diff --git a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java index b7cade42f..6c5c45aa8 100644 --- a/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java +++ b/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java,v 1.3 2002/10/13 13:00:23 scolebourne Exp $ - * $Revision: 1.3 $ - * $Date: 2002/10/13 13:00:23 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java,v 1.4 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.4 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -60,10 +60,11 @@ */ package org.apache.commons.collections; -import junit.framework.Test; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; + +import junit.framework.Test; /** * Test cases for BoundedFifoBuffer. */ diff --git a/src/test/org/apache/commons/collections/TestCollectionUtils.java b/src/test/org/apache/commons/collections/TestCollectionUtils.java index d27fbbb66..9822142b5 100644 --- a/src/test/org/apache/commons/collections/TestCollectionUtils.java +++ b/src/test/org/apache/commons/collections/TestCollectionUtils.java @@ -1,7 +1,7 @@ /* - * $Id: TestCollectionUtils.java,v 1.13 2003/01/27 23:19:28 rwaldhoff Exp $ - * $Revision: 1.13 $ - * $Date: 2003/01/27 23:19:28 $ + * $Id: TestCollectionUtils.java,v 1.14 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.14 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -61,12 +61,22 @@ package org.apache.commons.collections; -import junit.framework.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; /** * @author Rodney Waldhoff - * @version $Revision: 1.13 $ $Date: 2003/01/27 23:19:28 $ + * @version $Revision: 1.14 $ $Date: 2003/02/19 20:33:11 $ */ public class TestCollectionUtils extends TestCase { public TestCollectionUtils(String testName) { diff --git a/src/test/org/apache/commons/collections/TestCommonsLinkedList.java b/src/test/org/apache/commons/collections/TestCommonsLinkedList.java index a7fb2ae97..9da539b80 100644 --- a/src/test/org/apache/commons/collections/TestCommonsLinkedList.java +++ b/src/test/org/apache/commons/collections/TestCommonsLinkedList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestCommonsLinkedList.java,v 1.1 2003/01/07 15:18:14 rwaldhoff Exp $ - * $Revision: 1.1 $ - * $Date: 2003/01/07 15:18:14 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestCommonsLinkedList.java,v 1.2 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.2 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -60,7 +60,7 @@ */ package org.apache.commons.collections; -import java.util.*; +import java.util.LinkedList; import junit.framework.Test; diff --git a/src/test/org/apache/commons/collections/TestCursorableLinkedList.java b/src/test/org/apache/commons/collections/TestCursorableLinkedList.java index d6f3e248b..cede1767d 100644 --- a/src/test/org/apache/commons/collections/TestCursorableLinkedList.java +++ b/src/test/org/apache/commons/collections/TestCursorableLinkedList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v 1.7 2003/01/07 23:44:19 rwaldhoff Exp $ - * $Revision: 1.7 $ - * $Date: 2003/01/07 23:44:19 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v 1.8 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.8 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -61,12 +61,17 @@ package org.apache.commons.collections; -import junit.framework.*; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; + +import junit.framework.Test; /** * @author Rodney Waldhoff - * @version $Id: TestCursorableLinkedList.java,v 1.7 2003/01/07 23:44:19 rwaldhoff Exp $ + * @version $Id: TestCursorableLinkedList.java,v 1.8 2003/02/19 20:33:11 scolebourne Exp $ */ public class TestCursorableLinkedList extends TestList { public TestCursorableLinkedList(String testName) { diff --git a/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java b/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java index 84cac8f91..030e6a57c 100644 --- a/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java +++ b/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java,v 1.5 2002/06/18 05:35:58 mas Exp $ - * $Revision: 1.5 $ - * $Date: 2002/06/18 05:35:58 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java,v 1.6 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.6 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -63,9 +63,17 @@ package org.apache.commons.collections; -import junit.framework.*; +import java.util.Collection; +import java.util.ConcurrentModificationException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; -import java.util.*; +import junit.framework.Test; /** diff --git a/src/test/org/apache/commons/collections/TestFastHashMap1.java b/src/test/org/apache/commons/collections/TestFastHashMap1.java index 879db5300..b99b834ef 100644 --- a/src/test/org/apache/commons/collections/TestFastHashMap1.java +++ b/src/test/org/apache/commons/collections/TestFastHashMap1.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastHashMap1.java,v 1.4 2002/08/13 04:34:09 pjack Exp $ - * $Revision: 1.4 $ - * $Date: 2002/08/13 04:34:09 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastHashMap1.java,v 1.5 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.5 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -61,17 +61,16 @@ package org.apache.commons.collections; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import java.util.HashMap; import java.util.Map; +import junit.framework.Test; + /** * Test FastHashMap in fast mode. * * @author Jason van Zyl - * @version $Id: TestFastHashMap1.java,v 1.4 2002/08/13 04:34:09 pjack Exp $ + * @version $Id: TestFastHashMap1.java,v 1.5 2003/02/19 20:33:11 scolebourne Exp $ */ public class TestFastHashMap1 extends TestFastHashMap { diff --git a/src/test/org/apache/commons/collections/TestLinkedList.java b/src/test/org/apache/commons/collections/TestLinkedList.java index fcccf1760..d3aec9170 100644 --- a/src/test/org/apache/commons/collections/TestLinkedList.java +++ b/src/test/org/apache/commons/collections/TestLinkedList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestLinkedList.java,v 1.1 2003/01/07 15:18:14 rwaldhoff Exp $ - * $Revision: 1.1 $ - * $Date: 2003/01/07 15:18:14 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestLinkedList.java,v 1.2 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.2 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -61,20 +61,10 @@ package org.apache.commons.collections; -import java.io.IOException; -import java.io.Serializable; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.AbstractCollection; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; -import java.util.ConcurrentModificationException; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.ListIterator; import java.util.NoSuchElementException; @@ -89,7 +79,7 @@ import java.util.NoSuchElementException; * test case (method) your {@link List} fails. * * @author Rich Dougherty - * @version $Id: TestLinkedList.java,v 1.1 2003/01/07 15:18:14 rwaldhoff Exp $ + * @version $Id: TestLinkedList.java,v 1.2 2003/02/19 20:33:11 scolebourne Exp $ */ public abstract class TestLinkedList extends TestList { diff --git a/src/test/org/apache/commons/collections/TestNodeCachingLinkedList.java b/src/test/org/apache/commons/collections/TestNodeCachingLinkedList.java index 27679b00b..1beb7b3dd 100644 --- a/src/test/org/apache/commons/collections/TestNodeCachingLinkedList.java +++ b/src/test/org/apache/commons/collections/TestNodeCachingLinkedList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestNodeCachingLinkedList.java,v 1.2 2003/01/07 15:18:15 rwaldhoff Exp $ - * $Revision: 1.2 $ - * $Date: 2003/01/07 15:18:15 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestNodeCachingLinkedList.java,v 1.3 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.3 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -60,7 +60,7 @@ */ package org.apache.commons.collections; -import java.util.*; +import java.util.LinkedList; import junit.framework.Test; /** diff --git a/src/test/org/apache/commons/collections/TestReferenceMap.java b/src/test/org/apache/commons/collections/TestReferenceMap.java index 7ea7261de..2b2fc7b8b 100644 --- a/src/test/org/apache/commons/collections/TestReferenceMap.java +++ b/src/test/org/apache/commons/collections/TestReferenceMap.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestReferenceMap.java,v 1.4 2003/01/07 15:18:15 rwaldhoff Exp $ - * $Revision: 1.4 $ - * $Date: 2003/01/07 15:18:15 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestReferenceMap.java,v 1.5 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.5 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -61,9 +61,7 @@ package org.apache.commons.collections; -import java.util.HashMap; import java.util.Map; -import java.util.Random; import junit.framework.Test; @@ -72,7 +70,7 @@ import junit.framework.Test; * Tests for ReferenceMap. * * @author Paul Jack - * @version $Id: TestReferenceMap.java,v 1.4 2003/01/07 15:18:15 rwaldhoff Exp $ + * @version $Id: TestReferenceMap.java,v 1.5 2003/02/19 20:33:11 scolebourne Exp $ */ public class TestReferenceMap extends TestMap { diff --git a/src/test/org/apache/commons/collections/TestSetUtils.java b/src/test/org/apache/commons/collections/TestSetUtils.java index 98b26cb2f..24d2880c6 100644 --- a/src/test/org/apache/commons/collections/TestSetUtils.java +++ b/src/test/org/apache/commons/collections/TestSetUtils.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestSetUtils.java,v 1.2 2002/08/18 20:11:38 pjack Exp $ - * $Revision: 1.2 $ - * $Date: 2002/08/18 20:11:38 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestSetUtils.java,v 1.3 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.3 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -60,10 +60,11 @@ */ package org.apache.commons.collections; -import junit.framework.Test; import java.util.Collection; -import java.util.Set; import java.util.HashSet; +import java.util.Set; + +import junit.framework.Test; /** diff --git a/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java b/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java index b79c438e0..848da1181 100644 --- a/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java +++ b/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java,v 1.3 2002/10/13 13:00:23 scolebourne Exp $ - * $Revision: 1.3 $ - * $Date: 2002/10/13 13:00:23 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java,v 1.4 2003/02/19 20:33:11 scolebourne Exp $ + * $Revision: 1.4 $ + * $Date: 2003/02/19 20:33:11 $ * * ==================================================================== * @@ -60,10 +60,11 @@ */ package org.apache.commons.collections; -import junit.framework.Test; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; + +import junit.framework.Test; /** * Test cases for UnboundedFifoBuffer. */ diff --git a/src/test/org/apache/commons/collections/comparators/TestComparator.java b/src/test/org/apache/commons/collections/comparators/TestComparator.java index f77179f4c..458b57b75 100644 --- a/src/test/org/apache/commons/collections/comparators/TestComparator.java +++ b/src/test/org/apache/commons/collections/comparators/TestComparator.java @@ -1,7 +1,7 @@ package org.apache.commons.collections.comparators; -import java.io.IOException; import java.io.FileNotFoundException; +import java.io.IOException; import java.io.Serializable; import java.util.Collections; import java.util.Comparator; diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java b/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java index 53eab4f4a..184055f5b 100644 --- a/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java,v 1.2 2002/12/13 12:10:48 scolebourne Exp $ - * $Revision: 1.2 $ - * $Date: 2002/12/13 12:10:48 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java,v 1.3 2003/02/19 20:33:10 scolebourne Exp $ + * $Revision: 1.3 $ + * $Date: 2003/02/19 20:33:10 $ * * ==================================================================== * @@ -60,9 +60,11 @@ */ package org.apache.commons.collections.iterators; -import junit.framework.*; import java.util.Iterator; import java.util.NoSuchElementException; + +import junit.framework.Test; +import junit.framework.TestSuite; /** * Tests the ArrayIterator to ensure that the next() method will actually * perform the iteration rather than the hasNext() method. @@ -72,7 +74,7 @@ import java.util.NoSuchElementException; * @author Mauricio S. Moura * @author Morgan Delagrange * @author Stephen Colebourne - * @version $Id: TestArrayIterator.java,v 1.2 2002/12/13 12:10:48 scolebourne Exp $ + * @version $Id: TestArrayIterator.java,v 1.3 2003/02/19 20:33:10 scolebourne Exp $ */ public class TestArrayIterator extends TestIterator { diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java b/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java index de921d4a6..5697a1a73 100644 --- a/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java +++ b/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java,v 1.2 2002/12/13 12:10:48 scolebourne Exp $ - * $Revision: 1.2 $ - * $Date: 2002/12/13 12:10:48 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java,v 1.3 2003/02/19 20:33:10 scolebourne Exp $ + * $Revision: 1.3 $ + * $Date: 2003/02/19 20:33:10 $ * * ==================================================================== * @@ -60,15 +60,17 @@ */ package org.apache.commons.collections.iterators; -import junit.framework.*; import java.util.Iterator; import java.util.NoSuchElementException; + +import junit.framework.Test; +import junit.framework.TestSuite; /** * Tests the ArrayIterator with primitive type arrays * * @author Morgan Delagrange * @author James Strachan - * @version $Id: TestArrayIterator2.java,v 1.2 2002/12/13 12:10:48 scolebourne Exp $ + * @version $Id: TestArrayIterator2.java,v 1.3 2003/02/19 20:33:10 scolebourne Exp $ */ public class TestArrayIterator2 extends TestIterator { diff --git a/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java b/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java index 025d06751..6777ff35c 100644 --- a/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java,v 1.1 2002/08/15 23:13:52 pjack Exp $ - * $Revision: 1.1 $ - * $Date: 2002/08/15 23:13:52 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java,v 1.2 2003/02/19 20:33:10 scolebourne Exp $ + * $Revision: 1.2 $ + * $Date: 2003/02/19 20:33:10 $ * * ==================================================================== * @@ -61,15 +61,18 @@ package org.apache.commons.collections.iterators; -import junit.framework.*; -import java.util.Iterator; -import java.util.Comparator; import java.util.ArrayList; +import java.util.Comparator; +import java.util.Iterator; + +import junit.framework.Test; +import junit.framework.TestSuite; + import org.apache.commons.collections.comparators.ComparableComparator; /** * Unit test suite for {@link CollatingIterator}. - * @version $Revision: 1.1 $ $Date: 2002/08/15 23:13:52 $ + * @version $Revision: 1.2 $ $Date: 2003/02/19 20:33:10 $ * @author Rodney Waldhoff */ public class TestCollatingIterator extends TestIterator { diff --git a/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java b/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java index d03a5b7f6..23d4862b3 100644 --- a/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java,v 1.3 2002/11/01 19:07:54 rwaldhoff Exp $ - * $Revision: 1.3 $ - * $Date: 2002/11/01 19:07:54 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java,v 1.4 2003/02/19 20:33:10 scolebourne Exp $ + * $Revision: 1.4 $ + * $Date: 2003/02/19 20:33:10 $ * * ==================================================================== * @@ -60,17 +60,19 @@ */ package org.apache.commons.collections.iterators; -import junit.framework.TestCase; -import junit.framework.TestSuite; -import junit.framework.Test; import java.util.ArrayList; import java.util.List; import java.util.ListIterator; import java.util.Random; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.apache.commons.collections.Predicate; /** - * @version $Revision: 1.3 $ $Date: 2002/11/01 19:07:54 $ + * @version $Revision: 1.4 $ $Date: 2003/02/19 20:33:10 $ * @author Rodney Waldhoff */ public class TestFilterListIterator extends TestCase { diff --git a/src/test/org/apache/commons/collections/iterators/TestIterator.java b/src/test/org/apache/commons/collections/iterators/TestIterator.java index f75a38d3b..3ab101fa7 100644 --- a/src/test/org/apache/commons/collections/iterators/TestIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestIterator.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/Attic/TestIterator.java,v 1.2 2002/12/13 12:03:46 scolebourne Exp $ - * $Revision: 1.2 $ - * $Date: 2002/12/13 12:03:46 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/Attic/TestIterator.java,v 1.3 2003/02/19 20:33:10 scolebourne Exp $ + * $Revision: 1.3 $ + * $Date: 2003/02/19 20:33:10 $ * * ==================================================================== * @@ -62,6 +62,7 @@ package org.apache.commons.collections.iterators; import java.util.Iterator; import java.util.NoSuchElementException; + import org.apache.commons.collections.TestObject; /** * Base class for tetsing Iterator interface diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java index e33dbbb09..7ba493bbb 100644 --- a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java,v 1.3 2003/01/15 21:54:12 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java,v 1.4 2003/02/19 20:33:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -57,16 +57,18 @@ */ package org.apache.commons.collections.iterators; -import junit.framework.*; import java.util.Iterator; import java.util.NoSuchElementException; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * Tests the SingletonIterator to ensure that the next() method will actually * perform the iteration rather than the hasNext() method. * * @author James Strachan - * @version $Id: TestSingletonIterator.java,v 1.3 2003/01/15 21:54:12 scolebourne Exp $ + * @version $Id: TestSingletonIterator.java,v 1.4 2003/02/19 20:33:10 scolebourne Exp $ */ public class TestSingletonIterator extends TestIterator { diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java b/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java index 891007399..f2f4e2cd2 100644 --- a/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java,v 1.3 2003/01/15 21:54:12 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java,v 1.4 2003/02/19 20:33:10 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -57,16 +57,18 @@ */ package org.apache.commons.collections.iterators; -import junit.framework.*; import java.util.Iterator; import java.util.ListIterator; import java.util.NoSuchElementException; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * Tests the SingletonListIterator. * * @author Stephen Colebourne - * @version $Id: TestSingletonListIterator.java,v 1.3 2003/01/15 21:54:12 scolebourne Exp $ + * @version $Id: TestSingletonListIterator.java,v 1.4 2003/02/19 20:33:10 scolebourne Exp $ */ public class TestSingletonListIterator extends TestIterator {