commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1023744 [1/2] - in /commons/proper/collections/trunk/src/test/org/apache/commons/collections: ./ bag/ bidimap/ buffer/ collection/ comparators/ functors/ iterators/ keyvalue/ list/ map/ set/ splitmap/
Date Mon, 18 Oct 2010 11:36:24 GMT
Author: sebb
Date: Mon Oct 18 11:36:20 2010
New Revision: 1023744

URL: http://svn.apache.org/viewvc?rev=1023744&view=rev
Log:
Remove unnecessary main() and suite() methods

Modified:
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayList.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayStack.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestExtendedProperties.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestIteratorUtils.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTransformerUtils.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTreeBag.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestAllPredicate.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTransformedList.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestCompositeMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFlat3Map.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestHashedMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestIdentityMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLRUMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLinkedMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestReferenceMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestSingletonMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestCompositeSet.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSet.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayList.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayList.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayList.java Mon Oct 18 11:36:20 2010
@@ -18,9 +18,6 @@ package org.apache.commons.collections;
 
 import java.util.ArrayList;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.list.AbstractTestList;
 
 /**
@@ -36,15 +33,6 @@ public abstract class TestArrayList<E> e
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestArrayList.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestArrayList.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     /**
      * {@inheritDoc}
      */

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayStack.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayStack.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayStack.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestArrayStack.java Mon Oct 18 11:36:20 2010
@@ -37,11 +37,6 @@ public class TestArrayStack<E> extends T
         return BulkTest.makeSuite(TestArrayStack.class);
     }
 
-    public static void main(String args[]) {
-        String[] testCaseName = { TestArrayStack.class.getName() };
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     public ArrayStack<E> makeObject() {
         return new ArrayStack<E>();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java Mon Oct 18 11:36:20 2010
@@ -50,10 +50,6 @@ import org.junit.Test;
  * @version $Revision$ $Date$
  */
 public class TestCollectionUtils extends MockTestCase {
-    public static void main(String args[]) {
-        String[] testCaseName = { TestCollectionUtils.class.getName() };
-        junit.textui.TestRunner.main(testCaseName);
-    }
 
     /**
      * Collection of {@link Integer}s

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestExtendedProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestExtendedProperties.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestExtendedProperties.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestExtendedProperties.java Mon Oct 18 11:36:20 2010
@@ -22,9 +22,7 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.Properties;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Tests some basic functions of the ExtendedProperties class.
@@ -45,15 +43,6 @@ public class TestExtendedProperties exte
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestExtendedProperties.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestExtendedProperties.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     public void testRetrieve() {
         /*
          * should be empty and return null

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestIteratorUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestIteratorUtils.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestIteratorUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestIteratorUtils.java Mon Oct 18 11:36:20 2010
@@ -44,10 +44,6 @@ public class TestIteratorUtils extends B
         super(name);
     }
 
-    public static void main(String args[]) {
-        junit.textui.TestRunner.run(suite());
-    }
-
     public static Test suite() {
         return BulkTest.makeSuite(TestIteratorUtils.class);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTransformerUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTransformerUtils.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTransformerUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTransformerUtils.java Mon Oct 18 11:36:20 2010
@@ -24,10 +24,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.functors.CloneTransformer;
 import org.apache.commons.collections.functors.ConstantTransformer;
 import org.apache.commons.collections.functors.EqualPredicate;
@@ -60,21 +56,6 @@ public class TestTransformerUtils extend
     }
 
     /**
-     * Main.
-     * @param args
-     */
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    /**
-     * Return class as a test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(TestTransformerUtils.class);
-    }
-
-    /**
      * Set up instance variables required by this test case.
      */
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeMap.java Mon Oct 18 11:36:20 2010
@@ -33,11 +33,6 @@ public abstract class TestTreeMap<K, V> 
         super(testName);
     }
 
-    public static void main(String args[]) {
-        String[] testCaseName = { TestTreeMap.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     public boolean isAllowNullKey() {
         return false;

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java Mon Oct 18 11:36:20 2010
@@ -16,9 +16,6 @@
  */
 package org.apache.commons.collections.bag;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Bag;
 
 /**
@@ -35,15 +32,6 @@ public class TestHashBag<T> extends Abst
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestHashBag.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestHashBag.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     public Bag<T> makeObject() {
         return new HashBag<T>();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java Mon Oct 18 11:36:20 2010
@@ -18,9 +18,6 @@ package org.apache.commons.collections.b
 
 import java.util.Set;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Bag;
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.functors.TruePredicate;
@@ -40,15 +37,6 @@ public class TestPredicatedBag<T> extend
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestPredicatedBag.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestPredicatedBag.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //--------------------------------------------------------------------------
 
     protected Predicate<T> stringPredicate() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java Mon Oct 18 11:36:20 2010
@@ -18,9 +18,6 @@ package org.apache.commons.collections.b
 
 import java.util.Comparator;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.SortedBag;
 import org.apache.commons.collections.functors.TruePredicate;
@@ -42,15 +39,6 @@ public class TestPredicatedSortedBag<T> 
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestPredicatedSortedBag.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestPredicatedSortedBag.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //--------------------------------------------------------------------------
 
     protected Predicate<T> stringPredicate() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java Mon Oct 18 11:36:20 2010
@@ -16,9 +16,6 @@
  */
 package org.apache.commons.collections.bag;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Bag;
 import org.apache.commons.collections.Transformer;
 import org.apache.commons.collections.collection.TestTransformedCollection;
@@ -38,15 +35,6 @@ public class TestTransformedBag<T> exten
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestTransformedBag.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestTransformedBag.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     @SuppressWarnings("unchecked")
     public Bag<T> makeObject() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java Mon Oct 18 11:36:20 2010
@@ -16,9 +16,6 @@
  */
 package org.apache.commons.collections.bag;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Bag;
 import org.apache.commons.collections.SortedBag;
 import org.apache.commons.collections.Transformer;
@@ -39,15 +36,6 @@ public class TestTransformedSortedBag<T>
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestTransformedSortedBag.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestTransformedSortedBag.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     @SuppressWarnings("unchecked")
     public SortedBag<T> makeObject() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTreeBag.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTreeBag.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTreeBag.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTreeBag.java Mon Oct 18 11:36:20 2010
@@ -16,9 +16,6 @@
  */
 package org.apache.commons.collections.bag;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Bag;
 import org.apache.commons.collections.SortedBag;
 
@@ -36,15 +33,6 @@ public class TestTreeBag<T> extends Abst
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestTreeBag.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestTreeBag.class.getName() };
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     public SortedBag<T> makeObject() {
         return new TreeBag<T>();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.b
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.OrderedBidiMap;
 
 /**
@@ -36,10 +33,6 @@ public class TestAbstractOrderedBidiMapD
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestAbstractOrderedBidiMapDecorator.class);
-    }
-
     /**
      * {@inheritDoc}
      */

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java Mon Oct 18 11:36:20 2010
@@ -17,8 +17,6 @@
 package org.apache.commons.collections.bidimap;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.BulkTest;
 
 /**
@@ -31,10 +29,6 @@ import org.apache.commons.collections.Bu
  */
 public class TestDualHashBidiMap<K, V> extends AbstractTestBidiMap<K, V> {
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-    
     public static Test suite() {
         return BulkTest.makeSuite(TestDualHashBidiMap.class);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java Mon Oct 18 11:36:20 2010
@@ -17,8 +17,6 @@
 package org.apache.commons.collections.bidimap;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.BulkTest;
 
 /**
@@ -31,10 +29,6 @@ import org.apache.commons.collections.Bu
  */
 public class TestDualTreeBidiMap<K extends Comparable<K>, V extends Comparable<V>> extends AbstractTestSortedBidiMap<K, V> {
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-    
     public static Test suite() {
         return BulkTest.makeSuite(TestDualTreeBidiMap.class);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java Mon Oct 18 11:36:20 2010
@@ -27,8 +27,6 @@ import java.util.List;
 import java.util.TreeMap;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.SortedBidiMap;
 import org.apache.commons.collections.comparators.ComparableComparator;
@@ -45,10 +43,6 @@ import org.apache.commons.collections.co
  */
 public class TestDualTreeBidiMap2<K extends Comparable<K>, V extends Comparable<V>> extends AbstractTestSortedBidiMap<K, V> {
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
     public static Test suite() {
         return BulkTest.makeSuite(TestDualTreeBidiMap2.class);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java Mon Oct 18 11:36:20 2010
@@ -19,8 +19,6 @@ package org.apache.commons.collections.b
 import java.util.TreeMap;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.BidiMap;
 import org.apache.commons.collections.BulkTest;
 
@@ -33,10 +31,6 @@ import org.apache.commons.collections.Bu
  */
 public class TestTreeBidiMap<K extends Comparable<K>, V extends Comparable<V>> extends AbstractTestOrderedBidiMap<K, V> {
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-    
     public static Test suite() {
         return BulkTest.makeSuite(TestTreeBidiMap.class);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java Mon Oct 18 11:36:20 2010
@@ -20,8 +20,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.BidiMap;
 import org.apache.commons.collections.BulkTest;
 
@@ -34,10 +32,6 @@ import org.apache.commons.collections.Bu
  */
 public class TestUnmodifiableBidiMap<K, V> extends AbstractTestBidiMap<K, V> {
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
     public static Test suite() {
         return BulkTest.makeSuite(TestUnmodifiableBidiMap.class);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java Mon Oct 18 11:36:20 2010
@@ -20,8 +20,6 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.BidiMap;
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.OrderedBidiMap;
@@ -35,10 +33,6 @@ import org.apache.commons.collections.Or
  */
 public class TestUnmodifiableOrderedBidiMap<K extends Comparable<K>, V extends Comparable<V>> extends AbstractTestOrderedBidiMap<K, V> {
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
     public static Test suite() {
         return BulkTest.makeSuite(TestUnmodifiableOrderedBidiMap.class);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java Mon Oct 18 11:36:20 2010
@@ -20,8 +20,6 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.SortedBidiMap;
 
@@ -34,10 +32,6 @@ import org.apache.commons.collections.So
  */
 public class TestUnmodifiableSortedBidiMap<K extends Comparable<K>, V extends Comparable<V>> extends AbstractTestSortedBidiMap<K, V> {
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
     public static Test suite() {
         return BulkTest.makeSuite(TestUnmodifiableSortedBidiMap.class);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java Mon Oct 18 11:36:20 2010
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.collections.buffer;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
 import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.Buffer;
 import org.apache.commons.collections.BufferUnderflowException;
@@ -43,15 +41,6 @@ public class TestBlockingBuffer<E> exten
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestBlockingBuffer.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestBlockingBuffer.class.getName() };
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     public Buffer<E> makeObject() {
         return BlockingBuffer.decorate(new MyBuffer<E>());

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java Mon Oct 18 11:36:20 2010
@@ -25,24 +25,12 @@ import java.util.Iterator;
 import java.util.Collections;
 import java.util.Arrays;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 public class TestBoundedBuffer<E> extends AbstractTestObject {
 
     public TestBoundedBuffer(String testName) {
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestBoundedBuffer.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestBoundedBuffer.class.getName() };
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     public String getCompatibilityVersion() {
         return "3.2";

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java Mon Oct 18 11:36:20 2010
@@ -26,8 +26,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.Buffer;
 import org.apache.commons.collections.BufferUnderflowException;
 import org.apache.commons.collections.BulkTest;
@@ -50,10 +48,6 @@ public class TestCircularFifoBuffer<E> e
         return BulkTest.makeSuite(TestCircularFifoBuffer.class);
     }
 
-    public static void main(String args[]) {
-        TestRunner.run(TestCircularFifoBuffer.class);
-    }
-
     //-----------------------------------------------------------------------
     /**
      *  Runs through the regular verifications, but also verifies that

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java Mon Oct 18 11:36:20 2010
@@ -18,9 +18,6 @@ package org.apache.commons.collections.b
 
 import java.util.Collection;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.ArrayStack;
 import org.apache.commons.collections.Buffer;
 import org.apache.commons.collections.BufferUnderflowException;
@@ -42,15 +39,6 @@ public class TestPredicatedBuffer<E> ext
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestPredicatedBuffer.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestPredicatedBuffer.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //---------------------------------------------------------------
 
     protected Buffer<E> decorateCollection(Buffer<E> buffer, Predicate<E> predicate) {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java Mon Oct 18 11:36:20 2010
@@ -24,9 +24,6 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.Random;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Buffer;
 import org.apache.commons.collections.BufferUnderflowException;
 import org.apache.commons.collections.ComparatorUtils;
@@ -44,14 +41,6 @@ import org.apache.commons.collections.co
  */
 public class TestPriorityBuffer<E> extends AbstractTestCollection<E> {
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(TestPriorityBuffer.class);
-    }
-
     public TestPriorityBuffer(String testName) {
         super(testName);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.b
 import java.util.Arrays;
 import java.util.Collection;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.ArrayStack;
 import org.apache.commons.collections.Buffer;
 import org.apache.commons.collections.collection.AbstractTestCollection;
@@ -42,15 +39,6 @@ public class TestSynchronizedBuffer<E> e
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestSynchronizedBuffer.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestSynchronizedBuffer.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //-----------------------------------------------------------------------
     @Override
     public Buffer<E> makeObject() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java Mon Oct 18 11:36:20 2010
@@ -16,10 +16,7 @@
  */
 package org.apache.commons.collections.buffer;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.ArrayStack;
 import org.apache.commons.collections.Buffer;
 import org.apache.commons.collections.collection.TestTransformedCollection;
@@ -39,15 +36,6 @@ public class TestTransformedBuffer exten
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestTransformedBuffer.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestTransformedBuffer.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     public void testTransformedBuffer() {
         Buffer<Object> buffer = TransformedBuffer.decorate(new ArrayStack<Object>(), TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, buffer.size());

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.b
 import java.util.Arrays;
 import java.util.Collection;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.ArrayStack;
 import org.apache.commons.collections.Buffer;
 import org.apache.commons.collections.collection.AbstractTestCollection;
@@ -42,15 +39,6 @@ public class TestUnmodifiableBuffer<E> e
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestUnmodifiableBuffer.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestUnmodifiableBuffer.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //-----------------------------------------------------------------------
     @Override
     public Collection<E> makeObject() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java Mon Oct 18 11:36:20 2010
@@ -23,9 +23,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Extension of {@link AbstractTestCollection} for exercising the
  * {@link CompositeCollection} implementation.
@@ -42,15 +39,6 @@ public class TestCompositeCollection<E> 
         super(name);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestCompositeCollection.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestCompositeCollection.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
  //-----------------------------------------------------------------------------
     /**
      * Run stock collection tests without Mutator, so turn off add, remove

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java Mon Oct 18 11:36:20 2010
@@ -21,9 +21,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.functors.TruePredicate;
 
@@ -42,15 +39,6 @@ public class TestPredicatedCollection<E>
         super(name);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestPredicatedCollection.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestPredicatedCollection.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
    //------------------------------------------------------------------------
     protected Predicate<E> truePredicate = TruePredicate.<E>truePredicate();
 

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java Mon Oct 18 11:36:20 2010
@@ -20,9 +20,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Extension of {@link AbstractTestCollection} for exercising the
  * {@link SynchronizedCollection} implementation.
@@ -39,15 +36,6 @@ public class TestSynchronizedCollection<
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestSynchronizedCollection.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestSynchronizedCollection.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //-----------------------------------------------------------------------
     @Override
     public Collection<E> makeObject() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java Mon Oct 18 11:36:20 2010
@@ -21,9 +21,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Transformer;
 import org.apache.commons.collections.TransformerUtils;
 
@@ -51,15 +48,6 @@ public class TestTransformedCollection e
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestTransformedCollection.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestTransformedCollection.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //-----------------------------------------------------------------------
     @Override
     public Collection<Object> makeConfirmedCollection() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java Mon Oct 18 11:36:20 2010
@@ -21,9 +21,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Extension of {@link AbstractTestCollection} for exercising the
  * {@link UnmodifiableCollection} implementation.
@@ -40,15 +37,6 @@ public class TestUnmodifiableCollection<
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestUnmodifiableCollection.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestUnmodifiableCollection.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //-----------------------------------------------------------------------
     @Override
     public Collection<E> makeObject() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java Mon Oct 18 11:36:20 2010
@@ -20,9 +20,6 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Tests for {@link BooleanComparator}.
  *
@@ -39,10 +36,6 @@ public class TestBooleanComparator exten
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestBooleanComparator.class);
-    }
-
     // collections testing framework
     // ------------------------------------------------------------------------
 

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java Mon Oct 18 11:36:20 2010
@@ -20,9 +20,6 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Tests for ComparableComparator.
  *
@@ -36,10 +33,6 @@ public class TestComparableComparator ex
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestComparableComparator.class);
-    }
-
     @Override
     public Comparator<Integer> makeObject() {
         return new ComparableComparator<Integer>();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java Mon Oct 18 11:36:20 2010
@@ -21,9 +21,6 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Tests for ComparatorChain.
  *
@@ -37,10 +34,6 @@ public class TestComparatorChain extends
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestComparatorChain.class);
-    }
-
     @Override
     public Comparator<PseudoRow> makeObject() {
         ComparatorChain<PseudoRow> chain = new ComparatorChain<PseudoRow>(new ColumnComparator(0));

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java Mon Oct 18 11:36:20 2010
@@ -22,9 +22,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Test class for FixedOrderComparator.
@@ -60,14 +58,6 @@ public class TestFixedOrderComparator ex
         super(name);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestFixedOrderComparator.class);
-    }
-
-    public static void main(String args[]) {
-        junit.textui.TestRunner.run(suite());
-    }
-
     //
     // Set up and tear down
     //

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java Mon Oct 18 11:36:20 2010
@@ -25,9 +25,6 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Tests for ReverseComparator.
  *
@@ -41,10 +38,6 @@ public class TestReverseComparator exten
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestReverseComparator.class);
-    }
-
     /**
      * For the purposes of this test, return a
      * ReverseComparator that wraps the java.util.Collections.reverseOrder()

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestAllPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestAllPredicate.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestAllPredicate.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestAllPredicate.java Mon Oct 18 11:36:20 2010
@@ -1,6 +1,5 @@
 package org.apache.commons.collections.functors;
 
-import junit.framework.JUnit4TestAdapter;
 import org.apache.commons.collections.Predicate;
 
 import static org.apache.commons.collections.functors.AllPredicate.allPredicate;
@@ -22,15 +21,6 @@ import java.util.Collections;
 public class TestAllPredicate extends TestAnyAllOnePredicate<Integer> {
 
     /**
-     * Creates a JUnit3 test suite.
-     *
-     * @return a JUnit3 test suite
-     */
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(TestAllPredicate.class);
-    }
-    
-    /**
      * Creates a new <code>TestAllPredicate</code>.
      */
     public TestAllPredicate() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.i
 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.
@@ -38,10 +35,6 @@ public class TestArrayIterator<E> extend
 
     protected String[] testArray = { "One", "Two", "Three" };
 
-    public static Test suite() {
-        return new TestSuite(TestArrayIterator.class);
-    }
-
     public TestArrayIterator(String testName) {
         super(testName);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.i
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Tests the ArrayIterator with primitive type arrays.
  *
@@ -34,10 +31,6 @@ public class TestArrayIterator2<E> exten
 
     protected int[] testArray = { 2, 4, 6, 8 };
 
-    public static Test suite() {
-        return new TestSuite(TestArrayIterator2.class);
-    }
-
     public TestArrayIterator2(String testName) {
         super(testName);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java Mon Oct 18 11:36:20 2010
@@ -20,9 +20,6 @@ import java.util.Arrays;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Test the ArrayListIterator class.
  *
@@ -35,10 +32,6 @@ public class TestArrayListIterator<E> ex
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestArrayListIterator.class);
-    }
-
     @Override
     public ArrayListIterator<E> makeEmptyIterator() {
         return new ArrayListIterator<E>(new Object[0]);

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java Mon Oct 18 11:36:20 2010
@@ -16,9 +16,6 @@
  */
 package org.apache.commons.collections.iterators;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Test the ArrayListIterator class with primitives.
  *
@@ -31,10 +28,6 @@ public class TestArrayListIterator2<E> e
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestArrayListIterator2.class);
-    }
-
     @Override
     public ArrayListIterator<E> makeEmptyIterator() {
         return new ArrayListIterator<E>(new int[0]);

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.i
 import java.util.ArrayList;
 import java.util.Comparator;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.comparators.ComparableComparator;
 
 /**
@@ -38,10 +35,6 @@ public class TestCollatingIterator exten
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestCollatingIterator.class);
-    }
-
     //--------------------------------------------------------------- Lifecycle
 
     private Comparator<Integer> comparator = null;

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java Mon Oct 18 11:36:20 2010
@@ -25,9 +25,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.functors.NotNullPredicate;
 
@@ -69,13 +66,6 @@ public class TestFilterIterator<E> exten
     }
 
     /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-        return (new TestSuite(TestFilterIterator.class));
-    }
-
-    /**
      * Returns an full iterator wrapped in a
      * FilterIterator that blocks all the elements
      *

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java Mon Oct 18 11:36:20 2010
@@ -21,10 +21,7 @@ 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;
 
 /**
@@ -39,15 +36,6 @@ public class TestFilterListIterator exte
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestFilterListIterator.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestFilterListIterator.class.getName() };
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     private ArrayList<Integer> list = null;
     private ArrayList<Integer> odds = null;
     private ArrayList<Integer> evens = null;

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java Mon Oct 18 11:36:20 2010
@@ -21,9 +21,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.IteratorUtils;
 import org.apache.commons.collections.Predicate;
 
@@ -46,10 +43,6 @@ public class TestIteratorChain extends A
     protected List<String> list2 = null;
     protected List<String> list3 = null;
 
-    public static Test suite() {
-        return new TestSuite(TestIteratorChain.class);
-    }
-
     public TestIteratorChain(String testName) {
         super(testName);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java Mon Oct 18 11:36:20 2010
@@ -21,8 +21,6 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
 import org.apache.commons.collections.ResettableListIterator;
 
 /**
@@ -41,10 +39,6 @@ public class TestListIteratorWrapper<E> 
 
     protected List<E> list1 = null;
 
-    public static Test suite() {
-        return new TestSuite(TestListIteratorWrapper.class);
-    }
-
     public TestListIteratorWrapper(String testName) {
         super(testName);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java Mon Oct 18 11:36:20 2010
@@ -21,8 +21,6 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
 import org.apache.commons.collections.ResettableListIterator;
 
 /**
@@ -40,10 +38,6 @@ public class TestListIteratorWrapper2<E>
 
     protected List<E> list1 = null;
 
-    public static Test suite() {
-        return new TestSuite(TestListIteratorWrapper2.class);
-    }
-
     public TestListIteratorWrapper2(String testName) {
         super(testName);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java Mon Oct 18 11:36:20 2010
@@ -21,9 +21,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Tests the LoopingIterator class.
@@ -39,10 +37,6 @@ public class TestLoopingIterator extends
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestLoopingIterator.class);
-    }
-
     /**
      * Tests constructor exception.
      */

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java Mon Oct 18 11:36:20 2010
@@ -21,9 +21,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Tests the LoopingListIterator class.
@@ -38,10 +36,6 @@ public class TestLoopingListIterator ext
         super(testName);
     }
     
-    public static Test suite() {
-        return new TestSuite(TestLoopingListIterator.class);
-    }
-
     /**
      * Tests constructor exception.
      */

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.i
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Tests the ObjectArrayIterator.
  *
@@ -36,10 +33,6 @@ public class TestObjectArrayIterator<E> 
 
     protected String[] testArray = { "One", "Two", "Three" };
 
-    public static Test suite() {
-        return new TestSuite(TestObjectArrayIterator.class);
-    }
-
     public TestObjectArrayIterator(String testName) {
         super(testName);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java Mon Oct 18 11:36:20 2010
@@ -20,9 +20,6 @@ import java.util.Arrays;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Tests the ObjectArrayListIterator class.
  *
@@ -36,10 +33,6 @@ public class TestObjectArrayListIterator
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestObjectArrayListIterator.class);
-    }
-
     @Override
     @SuppressWarnings("unchecked")
     public ObjectArrayListIterator<E> makeEmptyIterator() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java Mon Oct 18 11:36:20 2010
@@ -16,9 +16,6 @@
  */
 package org.apache.commons.collections.iterators;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Tests the ObjectArrayListIterator class.
  *
@@ -34,10 +31,6 @@ public class TestObjectArrayListIterator
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestObjectArrayListIterator2.class);
-    }
-
     @Override
     @SuppressWarnings("unchecked")
     public ObjectArrayListIterator<E> makeEmptyIterator() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java Mon Oct 18 11:36:20 2010
@@ -21,10 +21,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.IteratorUtils;
 import org.apache.commons.collections.Transformer;
 
@@ -48,14 +44,6 @@ public class TestObjectGraphIterator ext
         super(testName);
     }
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(TestObjectGraphIterator.class);
-    }
-
     @Override
     public void setUp() {
         list1 = new ArrayList<String>();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java Mon Oct 18 11:36:20 2010
@@ -22,10 +22,6 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.ResettableListIterator;
 
 /**
@@ -37,15 +33,6 @@ public class TestReverseListIterator<E> 
 
     protected String[] testArray = { "One", "Two", "Three", "Four" };
 
-    public static void main(String args[]) {
-        String[] testCaseName = { TestReverseListIterator.class.getName() };
-        TestRunner.main(testCaseName);
-    }
-
-    public static Test suite() {
-        return new TestSuite(TestReverseListIterator.class);
-    }
-
     public TestReverseListIterator(String testName) {
         super(testName);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.i
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.ResettableIterator;
 
 /**
@@ -36,10 +33,6 @@ public class TestSingletonIterator<E> ex
 
     private static final Object testValue = "foo";
 
-    public static Test suite() {
-        return new TestSuite(TestSingletonIterator.class);
-    }
-
     public TestSingletonIterator(String testName) {
         super(testName);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.i
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.ResettableIterator;
 
 /**
@@ -36,10 +33,6 @@ public class TestSingletonIterator2<E> e
 
     private static final Object testValue = "foo";
 
-    public static Test suite() {
-        return new TestSuite(TestSingletonIterator2.class);
-    }
-
     public TestSingletonIterator2(String testName) {
         super(testName);
     }



Mime
View raw message