You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2003/09/20 19:05:37 UTC

cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections/decorators TestPredicatedCollection.java TestTypedBag.java TestPredicatedSortedBag.java TestPredicatedBuffer.java TestLazySortedMap.java TestPredicatedList.java TestPredicatedSortedMap.java TestLazyMap.java TestPredicatedBag.java TestTypedSortedBag.java TestPredicatedSet.java TestPredicatedMap.java TestBlockingBuffer.java

scolebourne    2003/09/20 10:05:37

  Modified:    collections/src/test/org/apache/commons/collections/decorators
                        TestPredicatedCollection.java TestTypedBag.java
                        TestPredicatedSortedBag.java
                        TestPredicatedBuffer.java TestLazySortedMap.java
                        TestPredicatedList.java
                        TestPredicatedSortedMap.java TestLazyMap.java
                        TestPredicatedBag.java TestTypedSortedBag.java
                        TestPredicatedSet.java TestPredicatedMap.java
                        TestBlockingBuffer.java
  Log:
  Organize imports
  
  Revision  Changes    Path
  1.2       +6 -5      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedCollection.java
  
  Index: TestPredicatedCollection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedCollection.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestPredicatedCollection.java	12 Sep 2003 03:59:00 -0000	1.1
  +++ TestPredicatedCollection.java	20 Sep 2003 17:05:36 -0000	1.2
  @@ -54,15 +54,16 @@
   package org.apache.commons.collections.decorators;
   
   import java.util.ArrayList;
  +import java.util.Arrays;
   import java.util.Collection;
   import java.util.List;
  -import java.util.Arrays;
  -import org.apache.commons.collections.TestCollection;
  -import org.apache.commons.collections.Predicate;
  -import org.apache.commons.collections.PredicateUtils;
   
   import junit.framework.Test;
   import junit.framework.TestSuite;
  +
  +import org.apache.commons.collections.Predicate;
  +import org.apache.commons.collections.PredicateUtils;
  +import org.apache.commons.collections.TestCollection;
   
   /**
    * Extension of {@link TestCollection} for exercising the 
  
  
  
  1.2       +4 -4      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestTypedBag.java
  
  Index: TestTypedBag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestTypedBag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestTypedBag.java	20 Sep 2003 02:51:50 -0000	1.1
  +++ TestTypedBag.java	20 Sep 2003 17:05:36 -0000	1.2
  @@ -57,10 +57,10 @@
    */
   package org.apache.commons.collections.decorators;
   
  +import java.util.Set;
  +
   import junit.framework.Test;
   import junit.framework.TestSuite;
  -
  -import java.util.Set;
   
   import org.apache.commons.collections.Bag;
   import org.apache.commons.collections.HashBag;
  
  
  
  1.3       +7 -6      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedSortedBag.java
  
  Index: TestPredicatedSortedBag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedSortedBag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestPredicatedSortedBag.java	19 Sep 2003 22:21:53 -0000	1.2
  +++ TestPredicatedSortedBag.java	20 Sep 2003 17:05:36 -0000	1.3
  @@ -57,16 +57,17 @@
    */
   package org.apache.commons.collections.decorators;
   
  +import java.util.Comparator;
  +
   import junit.framework.Test;
   import junit.framework.TestSuite;
  -import java.util.Comparator;
   
   import org.apache.commons.collections.Bag;
  -import org.apache.commons.collections.SortedBag;
  -import org.apache.commons.collections.TreeBag;
   import org.apache.commons.collections.Predicate;
  -import org.apache.commons.collections.TestBag;
   import org.apache.commons.collections.PredicateUtils;
  +import org.apache.commons.collections.SortedBag;
  +import org.apache.commons.collections.TestBag;
  +import org.apache.commons.collections.TreeBag;
   
   /**
    * Extension of {@link TestBag} for exercising the {@link PredicatedSortedBag}
  
  
  
  1.2       +5 -5      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedBuffer.java
  
  Index: TestPredicatedBuffer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedBuffer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestPredicatedBuffer.java	12 Sep 2003 03:59:00 -0000	1.1
  +++ TestPredicatedBuffer.java	20 Sep 2003 17:05:36 -0000	1.2
  @@ -57,15 +57,15 @@
    */
   package org.apache.commons.collections.decorators;
   
  +import java.util.Collection;
  +
   import junit.framework.Test;
   import junit.framework.TestSuite;
  -import java.util.ArrayList;
  -import java.util.Collection;
   
   import org.apache.commons.collections.ArrayStack;
   import org.apache.commons.collections.Buffer;
  -import org.apache.commons.collections.Predicate;
   import org.apache.commons.collections.BufferUnderflowException;
  +import org.apache.commons.collections.Predicate;
   
   /**
    * Extension of {@link TestPredicatedCollection} for exercising the 
  
  
  
  1.2       +7 -7      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestLazySortedMap.java
  
  Index: TestLazySortedMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestLazySortedMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestLazySortedMap.java	14 Sep 2003 03:30:23 -0000	1.1
  +++ TestLazySortedMap.java	20 Sep 2003 17:05:36 -0000	1.2
  @@ -57,13 +57,13 @@
    */
   package org.apache.commons.collections.decorators;
   
  -import junit.framework.Test;
  -import junit.framework.TestSuite;
  -
  -import java.util.TreeMap;
  +import java.util.Comparator;
   import java.util.Map;
   import java.util.SortedMap;
  -import java.util.Comparator;
  +import java.util.TreeMap;
  +
  +import junit.framework.Test;
  +import junit.framework.TestSuite;
   
   import org.apache.commons.collections.Factory;
   import org.apache.commons.collections.Transformer;
  
  
  
  1.2       +7 -5      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedList.java
  
  Index: TestPredicatedList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedList.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestPredicatedList.java	12 Sep 2003 03:59:00 -0000	1.1
  +++ TestPredicatedList.java	20 Sep 2003 17:05:36 -0000	1.2
  @@ -57,14 +57,16 @@
    */
   package org.apache.commons.collections.decorators;
   
  -import junit.framework.Test;
  -import junit.framework.TestSuite;
   import java.util.ArrayList;
   import java.util.List;
   
  -import org.apache.commons.collections.TestList;
  +import junit.framework.Test;
  +import junit.framework.TestSuite;
  +
   import org.apache.commons.collections.Predicate;
   import org.apache.commons.collections.PredicateUtils;
  +import org.apache.commons.collections.TestList;
  +
   /**
    * Extension of {@link TestList} for exercising the 
    * {@link PredicatedList} implementation.
  
  
  
  1.2       +6 -7      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedSortedMap.java
  
  Index: TestPredicatedSortedMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedSortedMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestPredicatedSortedMap.java	13 Sep 2003 16:12:47 -0000	1.1
  +++ TestPredicatedSortedMap.java	20 Sep 2003 17:05:36 -0000	1.2
  @@ -57,14 +57,13 @@
    */
   package org.apache.commons.collections.decorators;
   
  -import junit.framework.Test;
  -import junit.framework.TestSuite;
  -import java.util.Map;
  -import java.util.Iterator;
   import java.util.Comparator;
  -import java.util.HashMap;
  +import java.util.Map;
   import java.util.SortedMap;
   import java.util.TreeMap;
  +
  +import junit.framework.Test;
  +import junit.framework.TestSuite;
   
   import org.apache.commons.collections.Predicate;
   
  
  
  
  1.2       +7 -5      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestLazyMap.java
  
  Index: TestLazyMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestLazyMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestLazyMap.java	14 Sep 2003 03:30:23 -0000	1.1
  +++ TestLazyMap.java	20 Sep 2003 17:05:36 -0000	1.2
  @@ -57,14 +57,16 @@
    */
   package org.apache.commons.collections.decorators;
   
  -import junit.framework.Test;
  -import junit.framework.TestSuite;
   import java.util.HashMap;
   import java.util.Map;
   
  -import org.apache.commons.collections.TestMap;
  +import junit.framework.Test;
  +import junit.framework.TestSuite;
  +
   import org.apache.commons.collections.Factory;
   import org.apache.commons.collections.FactoryUtils;
  +import org.apache.commons.collections.TestMap;
  +
   /**
    * Extension of {@link TestMap} for exercising the 
    * {@link LazyMap} implementation.
  
  
  
  1.3       +5 -4      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedBag.java
  
  Index: TestPredicatedBag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedBag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestPredicatedBag.java	19 Sep 2003 22:21:53 -0000	1.2
  +++ TestPredicatedBag.java	20 Sep 2003 17:05:36 -0000	1.3
  @@ -57,15 +57,16 @@
    */
   package org.apache.commons.collections.decorators;
   
  +import java.util.Set;
  +
   import junit.framework.Test;
   import junit.framework.TestSuite;
  -import java.util.Set;
   
   import org.apache.commons.collections.Bag;
   import org.apache.commons.collections.HashBag;
  -import org.apache.commons.collections.TestBag;
   import org.apache.commons.collections.Predicate;
   import org.apache.commons.collections.PredicateUtils;
  +import org.apache.commons.collections.TestBag;
   
   /**
    * Extension of {@link TestBag} for exercising the {@link PredicatedBag}
  
  
  
  1.2       +5 -4      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestTypedSortedBag.java
  
  Index: TestTypedSortedBag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestTypedSortedBag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestTypedSortedBag.java	20 Sep 2003 02:51:50 -0000	1.1
  +++ TestTypedSortedBag.java	20 Sep 2003 17:05:36 -0000	1.2
  @@ -57,14 +57,15 @@
    */
   package org.apache.commons.collections.decorators;
   
  +import java.util.Comparator;
  +
   import junit.framework.Test;
   import junit.framework.TestSuite;
  -import java.util.Comparator;
   
   import org.apache.commons.collections.Bag;
   import org.apache.commons.collections.SortedBag;
  -import org.apache.commons.collections.TreeBag;
   import org.apache.commons.collections.TestBag;
  +import org.apache.commons.collections.TreeBag;
   
   /**
    * Extension of {@link TestBag} for exercising the {@link TypedSortedBag}
  
  
  
  1.2       +7 -5      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedSet.java
  
  Index: TestPredicatedSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedSet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestPredicatedSet.java	12 Sep 2003 03:59:00 -0000	1.1
  +++ TestPredicatedSet.java	20 Sep 2003 17:05:36 -0000	1.2
  @@ -57,14 +57,16 @@
    */
   package org.apache.commons.collections.decorators;
   
  -import junit.framework.Test;
  -import junit.framework.TestSuite;
   import java.util.HashSet;
   import java.util.Set;
   
  -import org.apache.commons.collections.TestSet;
  +import junit.framework.Test;
  +import junit.framework.TestSuite;
  +
   import org.apache.commons.collections.Predicate;
   import org.apache.commons.collections.PredicateUtils;
  +import org.apache.commons.collections.TestSet;
  +
   /**
    * Extension of {@link TestSet} for exercising the 
    * {@link PredicatedSet} implementation.
  
  
  
  1.2       +8 -7      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedMap.java
  
  Index: TestPredicatedMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestPredicatedMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestPredicatedMap.java	13 Sep 2003 16:12:47 -0000	1.1
  +++ TestPredicatedMap.java	20 Sep 2003 17:05:36 -0000	1.2
  @@ -57,16 +57,17 @@
    */
   package org.apache.commons.collections.decorators;
   
  -import junit.framework.Test;
  -import junit.framework.TestSuite;
   import java.util.HashMap;
  -import java.util.Map;
  -import java.util.Set;
   import java.util.Iterator;
  +import java.util.Map;
  +
  +import junit.framework.Test;
  +import junit.framework.TestSuite;
   
  -import org.apache.commons.collections.TestMap;
   import org.apache.commons.collections.Predicate;
   import org.apache.commons.collections.PredicateUtils;
  +import org.apache.commons.collections.TestMap;
  +
   /**
    * Extension of {@link TestMap} for exercising the 
    * {@link PredicatedMap} implementation.
  
  
  
  1.3       +2 -4      jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestBlockingBuffer.java
  
  Index: TestBlockingBuffer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestBlockingBuffer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestBlockingBuffer.java	18 Sep 2003 03:28:28 -0000	1.2
  +++ TestBlockingBuffer.java	20 Sep 2003 17:05:36 -0000	1.3
  @@ -68,8 +68,6 @@
   
   import org.apache.commons.collections.Buffer;
   import org.apache.commons.collections.BufferUnderflowException;
  -import org.apache.commons.collections.decorators.BlockingBuffer;
  -
   import org.apache.commons.collections.TestObject;
   
   /**