scolebourne 2003/02/19 12:33:21
Modified: collections/src/test/org/apache/commons/collections/iterators
TestArrayIterator2.java TestFilterListIterator.java
TestSingletonIterator.java TestArrayIterator.java
TestCollatingIterator.java
TestSingletonListIterator.java TestIterator.java
collections/src/test/org/apache/commons/collections
TestArrayStack.java TestCollectionUtils.java
TestNodeCachingLinkedList.java TestArrayList.java
TestCommonsLinkedList.java BulkTest.java
TestAll.java TestDoubleOrderedMap.java
TestLinkedList.java TestSetUtils.java
TestBoundedFifoBuffer.java TestReferenceMap.java
TestUnboundedFifoBuffer.java TestFastHashMap1.java
TestCursorableLinkedList.java
collections/src/test/org/apache/commons/collections/comparators
TestComparator.java
Log:
Tidy up imports
from Andrew Freeman
Revision Changes Path
1.3 +7 -5
jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java
Index: TestArrayIterator2.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestArrayIterator2.java 13 Dec 2002 12:10:48 -0000 1.2
+++ TestArrayIterator2.java 19 Feb 2003 20:33:10 -0000 1.3
@@ -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 with primitive type arrays
*
1.4 +9 -7
jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
Index: TestFilterListIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestFilterListIterator.java 1 Nov 2002 19:07:54 -0000 1.3
+++ TestFilterListIterator.java 19 Feb 2003 20:33:10 -0000 1.4
@@ -60,13 +60,15 @@
*/
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;
/**
1.4 +5 -3
jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java
Index: TestSingletonIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestSingletonIterator.java 15 Jan 2003 21:54:12 -0000 1.3
+++ TestSingletonIterator.java 19 Feb 2003 20:33:10 -0000 1.4
@@ -57,9 +57,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 SingletonIterator to ensure that the next() method will actually
1.3 +7 -5
jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java
Index: TestArrayIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestArrayIterator.java 13 Dec 2002 12:10:48 -0000 1.2
+++ TestArrayIterator.java 19 Feb 2003 20:33:10 -0000 1.3
@@ -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.
1.2 +10 -7
jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
Index: TestCollatingIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestCollatingIterator.java 15 Aug 2002 23:13:52 -0000 1.1
+++ TestCollatingIterator.java 19 Feb 2003 20:33:10 -0000 1.2
@@ -61,10 +61,13 @@
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;
/**
1.4 +5 -3
jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java
Index: TestSingletonListIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestSingletonListIterator.java 15 Jan 2003 21:54:12 -0000 1.3
+++ TestSingletonListIterator.java 19 Feb 2003 20:33:10 -0000 1.4
@@ -57,10 +57,12 @@
*/
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.
1.3 +4 -3
jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestIterator.java
Index: TestIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestIterator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestIterator.java 13 Dec 2002 12:03:46 -0000 1.2
+++ TestIterator.java 19 Feb 2003 20:33:10 -0000 1.3
@@ -62,6 +62,7 @@
import java.util.Iterator;
import java.util.NoSuchElementException;
+
import org.apache.commons.collections.TestObject;
/**
* Base class for tetsing Iterator interface
1.8 +8 -6
jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayStack.java
Index: TestArrayStack.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayStack.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestArrayStack.java 21 Jun 2002 03:33:28 -0000 1.7
+++ TestArrayStack.java 19 Feb 2003 20:33:11 -0000 1.8
@@ -61,8 +61,10 @@
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
1.14 +16 -6
jakarta-commons/collections/src/test/org/apache/commons/collections/TestCollectionUtils.java
Index: TestCollectionUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestCollectionUtils.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TestCollectionUtils.java 27 Jan 2003 23:19:28 -0000 1.13
+++ TestCollectionUtils.java 19 Feb 2003 20:33:11 -0000 1.14
@@ -61,8 +61,18 @@
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
1.3 +4 -4
jakarta-commons/collections/src/test/org/apache/commons/collections/TestNodeCachingLinkedList.java
Index: TestNodeCachingLinkedList.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestNodeCachingLinkedList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestNodeCachingLinkedList.java 7 Jan 2003 15:18:15 -0000 1.2
+++ TestNodeCachingLinkedList.java 19 Feb 2003 20:33:11 -0000 1.3
@@ -60,7 +60,7 @@
*/
package org.apache.commons.collections;
-import java.util.*;
+import java.util.LinkedList;
import junit.framework.Test;
/**
1.6 +6 -5
jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayList.java
Index: TestArrayList.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestArrayList.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestArrayList.java 12 Oct 2002 22:36:21 -0000 1.5
+++ TestArrayList.java 19 Feb 2003 20:33:11 -0000 1.6
@@ -61,9 +61,10 @@
package org.apache.commons.collections;
+import java.util.ArrayList;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import java.util.ArrayList;
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
1.2 +4 -4
jakarta-commons/collections/src/test/org/apache/commons/collections/TestCommonsLinkedList.java
Index: TestCommonsLinkedList.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestCommonsLinkedList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestCommonsLinkedList.java 7 Jan 2003 15:18:14 -0000 1.1
+++ TestCommonsLinkedList.java 19 Feb 2003 20:33:11 -0000 1.2
@@ -60,7 +60,7 @@
*/
package org.apache.commons.collections;
-import java.util.*;
+import java.util.LinkedList;
import junit.framework.Test;
1.3 +5 -4
jakarta-commons/collections/src/test/org/apache/commons/collections/BulkTest.java
Index: BulkTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/BulkTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BulkTest.java 12 Oct 2002 22:36:22 -0000 1.2
+++ BulkTest.java 19 Feb 2003 20:33:11 -0000 1.3
@@ -1,15 +1,16 @@
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;
/**
1.40 +7 -5
jakarta-commons/collections/src/test/org/apache/commons/collections/TestAll.java
Index: TestAll.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestAll.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- TestAll.java 7 Jan 2003 15:18:14 -0000 1.39
+++ TestAll.java 19 Feb 2003 20:33:11 -0000 1.40
@@ -61,7 +61,9 @@
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.
1.6 +13 -5
jakarta-commons/collections/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java
Index: TestDoubleOrderedMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestDoubleOrderedMap.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestDoubleOrderedMap.java 18 Jun 2002 05:35:58 -0000 1.5
+++ TestDoubleOrderedMap.java 19 Feb 2003 20:33:11 -0000 1.6
@@ -63,9 +63,17 @@
-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;
/**
1.2 +4 -14
jakarta-commons/collections/src/test/org/apache/commons/collections/TestLinkedList.java
Index: TestLinkedList.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestLinkedList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestLinkedList.java 7 Jan 2003 15:18:14 -0000 1.1
+++ TestLinkedList.java 19 Feb 2003 20:33:11 -0000 1.2
@@ -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;
1.3 +6 -5
jakarta-commons/collections/src/test/org/apache/commons/collections/TestSetUtils.java
Index: TestSetUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestSetUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestSetUtils.java 18 Aug 2002 20:11:38 -0000 1.2
+++ TestSetUtils.java 19 Feb 2003 20:33:11 -0000 1.3
@@ -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;
/**
1.4 +5 -4
jakarta-commons/collections/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java
Index: TestBoundedFifoBuffer.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestBoundedFifoBuffer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestBoundedFifoBuffer.java 13 Oct 2002 13:00:23 -0000 1.3
+++ TestBoundedFifoBuffer.java 19 Feb 2003 20:33:11 -0000 1.4
@@ -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.
*/
1.5 +4 -6
jakarta-commons/collections/src/test/org/apache/commons/collections/TestReferenceMap.java
Index: TestReferenceMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestReferenceMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestReferenceMap.java 7 Jan 2003 15:18:15 -0000 1.4
+++ TestReferenceMap.java 19 Feb 2003 20:33:11 -0000 1.5
@@ -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;
1.4 +5 -4
jakarta-commons/collections/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java
Index: TestUnboundedFifoBuffer.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestUnboundedFifoBuffer.java 13 Oct 2002 13:00:23 -0000 1.3
+++ TestUnboundedFifoBuffer.java 19 Feb 2003 20:33:11 -0000 1.4
@@ -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.
*/
1.5 +6 -7
jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastHashMap1.java
Index: TestFastHashMap1.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastHashMap1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestFastHashMap1.java 13 Aug 2002 04:34:09 -0000 1.4
+++ TestFastHashMap1.java 19 Feb 2003 20:33:11 -0000 1.5
@@ -61,11 +61,10 @@
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 <strong>fast</strong> mode.
1.8 +11 -6
jakarta-commons/collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
Index: TestCursorableLinkedList.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestCursorableLinkedList.java 7 Jan 2003 23:44:19 -0000 1.7
+++ TestCursorableLinkedList.java 19 Feb 2003 20:33:11 -0000 1.8
@@ -61,8 +61,13 @@
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
1.7 +1 -1
jakarta-commons/collections/src/test/org/apache/commons/collections/comparators/TestComparator.java
Index: TestComparator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/comparators/TestComparator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestComparator.java 7 Jan 2003 15:18:15 -0000 1.6
+++ TestComparator.java 19 Feb 2003 20:33:20 -0000 1.7
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
