You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2010/10/18 13:36:24 UTC

svn commit: r1023744 [2/2] - in /commons/proper/collections/trunk/src/test/org/apache/commons/collections: ./ bag/ bidimap/ buffer/ collection/ comparators/ functors/ iterators/ keyvalue/ list/ map/ set/ splitmap/

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.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;
-
 /**
  * Tests the UniqueFilterIterator class.
  *
@@ -42,10 +39,6 @@ public class TestUniqueFilterIterator<E>
 
     protected List<E> list1 = null;
 
-    public static Test suite() {
-        return new TestSuite(TestUniqueFilterIterator.class);
-    }
-
     public TestUniqueFilterIterator(String testName) {
         super(testName);
     }

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java Mon Oct 18 11:36:20 2010
@@ -22,9 +22,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Unmodifiable;
 
 /**
@@ -39,10 +36,6 @@ public class TestUnmodifiableListIterato
     protected String[] testArray = { "One", "Two", "Three" };
     protected List<E> testList;
 
-    public static Test suite() {
-        return new TestSuite(TestUnmodifiableListIterator.class);
-    }
-
     public TestUnmodifiableListIterator(String testName) {
         super(testName);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.i
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.IterableMap;
 import org.apache.commons.collections.MapIterator;
 import org.apache.commons.collections.Unmodifiable;
@@ -36,10 +33,6 @@ import org.apache.commons.collections.bi
  */
 public class TestUnmodifiableMapIterator<K, V> extends AbstractTestMapIterator<K, V> {
 
-    public static Test suite() {
-        return new TestSuite(TestUnmodifiableMapIterator.class);
-    }
-
     public TestUnmodifiableMapIterator(String testName) {
         super(testName);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java Mon Oct 18 11:36:20 2010
@@ -20,9 +20,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.OrderedMap;
 import org.apache.commons.collections.OrderedMapIterator;
 import org.apache.commons.collections.Unmodifiable;
@@ -37,10 +34,6 @@ import org.apache.commons.collections.ma
  */
 public class TestUnmodifiableOrderedMapIterator<K, V> extends AbstractTestOrderedMapIterator<K, V> {
 
-    public static Test suite() {
-        return new TestSuite(TestUnmodifiableOrderedMapIterator.class);
-    }
-
     public TestUnmodifiableOrderedMapIterator(String testName) {
         super(testName);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,7 @@ package org.apache.commons.collections.k
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Test the DefaultKeyValue class.
@@ -46,14 +44,6 @@ public class TestDefaultKeyValue<K, V> e
 
     }
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(TestDefaultKeyValue.class);
-    }
-
-    public static Test suite() {
-        return new TestSuite(TestDefaultKeyValue.class);
-    }
-
     //-----------------------------------------------------------------------
     /**
      * Make an instance of DefaultKeyValue with the default (null) key and value.

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java Mon Oct 18 11:36:20 2010
@@ -18,9 +18,6 @@ package org.apache.commons.collections.k
 
 import java.util.Map;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.KeyValue;
 
 /**
@@ -37,14 +34,6 @@ public class TestDefaultMapEntry<K, V> e
         super(testName);
     }
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(TestDefaultMapEntry.class);
-    }
-
-    public static Test suite() {
-        return new TestSuite(TestDefaultMapEntry.class);
-    }
-
     //-----------------------------------------------------------------------
     /**
      * Make an instance of Map.Entry with the default (null) key and value.

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java Mon Oct 18 11:36:20 2010
@@ -27,9 +27,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import junit.framework.Assert;
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Unit tests for {@link org.apache.commons.collections.keyvalue.MultiKey}.
@@ -50,15 +48,6 @@ public class TestMultiKey extends TestCa
         super(name);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestMultiKey.class);
-    }
-
-    public static void main(String[] args) {
-        String[] testCaseName = { TestMultiKey.class.getName() };
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     public void setUp() throws Exception {
         super.setUp();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.k
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Test the TiedMapEntry class.
  *
@@ -36,14 +33,6 @@ public class TestTiedMapEntry<K, V> exte
         super(testName);
     }
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(TestTiedMapEntry.class);
-    }
-
-    public static Test suite() {
-        return new TestSuite(TestTiedMapEntry.class);
-    }
-
     //-----------------------------------------------------------------------
     /**
      * Gets the instance to test

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java Mon Oct 18 11:36:20 2010
@@ -18,9 +18,6 @@ package org.apache.commons.collections.k
 
 import java.util.Map;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.KeyValue;
 import org.apache.commons.collections.Unmodifiable;
 
@@ -38,14 +35,6 @@ public class TestUnmodifiableMapEntry<K,
         super(testName);
     }
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(TestUnmodifiableMapEntry.class);
-    }
-
-    public static Test suite() {
-        return new TestSuite(TestUnmodifiableMapEntry.class);
-    }
-
     //-----------------------------------------------------------------------
     /**
      * Make an instance of Map.Entry with the default (null) key and value.

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

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.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 AbstractTestList} for exercising the {@link GrowthList}.
  *
@@ -38,15 +35,6 @@ public class TestGrowthList<E> extends A
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestGrowthList.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestGrowthList.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     public List<E> makeObject() {
         return new GrowthList<E>();

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.l
 import java.util.ArrayList;
 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;
 
@@ -40,15 +37,6 @@ public class TestPredicatedList<E> exten
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestPredicatedList.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestPredicatedList.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/list/TestSetUniqueList.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java Mon Oct 18 11:36:20 2010
@@ -25,10 +25,6 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Set;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
 /**
  * JUnit tests.
  *
@@ -40,14 +36,6 @@ import junit.textui.TestRunner;
  */
 public class TestSetUniqueList<E> extends AbstractTestList<E> {
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(TestSetUniqueList.class);
-    }
-
     public TestSetUniqueList(String testName) {
         super(testName);
     }

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

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

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

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestCompositeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestCompositeMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestCompositeMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestCompositeMap.java Mon Oct 18 11:36:20 2010
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.collections.map;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
 import junit.framework.Assert;
 
 import java.util.Map;
@@ -41,21 +39,12 @@ public class TestCompositeMap<K, V> exte
         super(testName);
     }
     
-    public static Test suite() {
-        return new TestSuite(TestCompositeMap.class);
-    }
-    
     @Override
     public void setUp() throws Exception {
         super.setUp();
         this.pass = false;
     }
     
-    public static void main(String args[]) {
-        String[] testCaseName = {TestCompositeMap.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-    
     @Override
     public CompositeMap<K, V> makeObject() {
         CompositeMap<K, V> map = new CompositeMap<K, V>();

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.m
 import java.util.HashMap;
 import java.util.Map;
 
-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.IterableMap;
@@ -45,15 +42,6 @@ public class TestDefaultedMap<K, V> exte
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestDefaultedMap.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestDefaultedMap.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //-----------------------------------------------------------------------
     @Override
     public IterableMap<K, V> makeObject() {

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

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFlat3Map.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFlat3Map.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFlat3Map.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFlat3Map.java Mon Oct 18 11:36:20 2010
@@ -24,8 +24,6 @@ import java.util.Iterator;
 import java.util.Map;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.IterableMap;
 import org.apache.commons.collections.MapIterator;
@@ -51,10 +49,6 @@ public class TestFlat3Map<K, V> extends 
         super(testName);
     }
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
     public static Test suite() {
         return BulkTest.makeSuite(TestFlat3Map.class);
     }

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestIdentityMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestIdentityMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestIdentityMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestIdentityMap.java Mon Oct 18 11:36:20 2010
@@ -23,8 +23,6 @@ import java.util.Map;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.AbstractTestObject;
 import org.apache.commons.collections.IterableMap;
 
@@ -46,10 +44,6 @@ public class TestIdentityMap<K, V> exten
         super(testName);
     }
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
     public static Test suite() {
         return new TestSuite(TestIdentityMap.class);
 //        return BulkTest.makeSuite(TestIdentityMap.class);  // causes race condition!

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLRUMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLRUMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLRUMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLRUMap.java Mon Oct 18 11:36:20 2010
@@ -23,8 +23,6 @@ import java.util.List;
 import java.util.Map;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.MapIterator;
 import org.apache.commons.collections.OrderedMap;
@@ -43,10 +41,6 @@ public class TestLRUMap<K, V> extends Ab
         super(testName);
     }
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
     public static Test suite() {
         return BulkTest.makeSuite(TestLRUMap.class);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java Mon Oct 18 11:36:20 2010
@@ -43,11 +43,6 @@ public class TestLazyMap<K, V> extends A
         super(testName);
     }
 
-    public static void main(String args[]) {
-        String[] testCaseName = { TestLazyMap.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     public LazyMap<K,V> makeObject() {
         return getLazyMap(new HashMap<K,V>(), FactoryUtils.<V>nullFactory());

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java Mon Oct 18 11:36:20 2010
@@ -46,11 +46,6 @@ public class TestLazySortedMap<K, V> ext
         super(testName);
     }
     
-    public static void main(String args[]) {
-        String[] testCaseName = { TestLazySortedMap.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     public SortedMap<K,V> makeObject() {
         return getLazySortedMap(new TreeMap<K,V>(), FactoryUtils.<V>nullFactory());

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLinkedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLinkedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLinkedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLinkedMap.java Mon Oct 18 11:36:20 2010
@@ -22,8 +22,6 @@ import java.util.List;
 import java.util.Map;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.MapIterator;
 import org.apache.commons.collections.OrderedMap;
@@ -43,10 +41,6 @@ public class TestLinkedMap<K, V> extends
         super(testName);
     }
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
     public static Test suite() {
         return BulkTest.makeSuite(TestLinkedMap.class);
     }

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

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java Mon Oct 18 11:36:20 2010
@@ -19,8 +19,6 @@ package org.apache.commons.collections.m
 import java.util.Map;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.MapIterator;
 import org.apache.commons.collections.keyvalue.MultiKey;
@@ -47,10 +45,6 @@ public class TestMultiKeyMap<K, V> exten
         super(testName);
     }
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
     public static Test suite() {
         return BulkTest.makeSuite(TestMultiKeyMap.class);
     }

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java Mon Oct 18 11:36:20 2010
@@ -25,9 +25,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.IteratorUtils;
 import org.apache.commons.collections.MultiMap;
 
@@ -46,15 +43,6 @@ public class TestMultiValueMap<K, V> ext
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestMultiValueMap.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestMultiValueMap.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     public void testNoMappingReturnsNull() {
         final MultiValueMap<K, V> map = createTestMap();
         assertNull(map.get("whatever"));

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java Mon Oct 18 11:36:20 2010
@@ -20,9 +20,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.IterableMap;
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.functors.TruePredicate;
@@ -50,15 +47,6 @@ public class TestPredicatedMap<K, V> ext
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestPredicatedMap.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestPredicatedMap.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //-----------------------------------------------------------------------
     protected IterableMap<K, V> decorateMap(Map<K, V> map, Predicate<? super K> keyPredicate,
         Predicate<? super V> valuePredicate) {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java Mon Oct 18 11:36:20 2010
@@ -23,9 +23,6 @@ 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;
 import org.apache.commons.collections.functors.TruePredicate;
 
@@ -52,15 +49,6 @@ public class TestPredicatedSortedMap<K, 
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestPredicatedSortedMap.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestPredicatedSortedMap.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //-----------------------------------------------------------------------
     protected SortedMap<K, V> decorateMap(SortedMap<K, V> map, Predicate<? super K> keyPredicate,
         Predicate<? super V> valuePredicate) {

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

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestSingletonMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestSingletonMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestSingletonMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestSingletonMap.java Mon Oct 18 11:36:20 2010
@@ -19,8 +19,6 @@ package org.apache.commons.collections.m
 import java.util.HashMap;
 
 import junit.framework.Test;
-import junit.textui.TestRunner;
-
 import org.apache.commons.collections.BoundedMap;
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.KeyValue;
@@ -43,10 +41,6 @@ public class TestSingletonMap<K, V> exte
         super(testName);
     }
 
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
     public static Test suite() {
         return BulkTest.makeSuite(TestSingletonMap.class);
     }

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java Mon Oct 18 11:36:20 2010
@@ -20,9 +20,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.IterableMap;
 import org.apache.commons.collections.Transformer;
 import org.apache.commons.collections.TransformerUtils;
@@ -43,15 +40,6 @@ public class TestTransformedMap<K, V> ex
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestTransformedMap.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestTransformedMap.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //-----------------------------------------------------------------------
     @Override
     public IterableMap<K, V> makeObject() {

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.m
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.IterableMap;
 import org.apache.commons.collections.Unmodifiable;
 
@@ -40,15 +37,6 @@ public class TestUnmodifiableMap<K, V> e
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestUnmodifiableMap.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestUnmodifiableMap.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //-------------------------------------------------------------------
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java Mon Oct 18 11:36:20 2010
@@ -18,9 +18,6 @@ package org.apache.commons.collections.m
 
 import java.util.HashMap;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.OrderedMap;
 import org.apache.commons.collections.Unmodifiable;
 
@@ -39,15 +36,6 @@ public class TestUnmodifiableOrderedMap<
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestUnmodifiableOrderedMap.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestUnmodifiableOrderedMap.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //-------------------------------------------------------------------
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.m
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Unmodifiable;
 
 /**
@@ -39,15 +36,6 @@ public class TestUnmodifiableSortedMap<K
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestUnmodifiableSortedMap.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestUnmodifiableSortedMap.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     //-------------------------------------------------------------------
 
     @Override

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestCompositeSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestCompositeSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestCompositeSet.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestCompositeSet.java Mon Oct 18 11:36:20 2010
@@ -21,9 +21,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.collection.CompositeCollection;
 
 /**
@@ -42,10 +39,6 @@ public class TestCompositeSet<E> extends
         super(name);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestCompositeSet.class);
-    }
-
     @Override
     public CompositeSet<E> makeObject() {
         final HashSet<E> contained = new HashSet<E>();

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

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet.java Mon Oct 18 11:36:20 2010
@@ -18,9 +18,6 @@ package org.apache.commons.collections.s
 
 import java.util.Set;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.map.HashedMap;
 
 /**
@@ -37,15 +34,6 @@ public class TestMapBackedSet<E> extends
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestMapBackedSet.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestMapBackedSet.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     public Set<E> makeObject() {
         return MapBackedSet.decorate(new HashedMap<E, Object>());

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.s
 import java.util.Iterator;
 import java.util.Set;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.map.LinkedMap;
 
 /**
@@ -38,15 +35,6 @@ public class TestMapBackedSet2<E> extend
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestMapBackedSet2.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestMapBackedSet2.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     @Override
     public Set<E> makeObject() {
         return MapBackedSet.decorate(new LinkedMap<E, Object>());

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.s
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.functors.TruePredicate;
 
@@ -40,15 +37,6 @@ public class TestPredicatedSet<E> extend
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestPredicatedSet.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestPredicatedSet.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/set/TestPredicatedSortedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java Mon Oct 18 11:36:20 2010
@@ -27,7 +27,6 @@ import junit.framework.Test;
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.functors.TruePredicate;
-import org.apache.commons.collections.map.TestPredicatedSortedMap;
 
 /**
  * Extension of {@link AbstractTestSortedSet} for exercising the
@@ -48,11 +47,6 @@ public class TestPredicatedSortedSet<E> 
         return BulkTest.makeSuite(TestPredicatedSortedSet.class);
     }
 
-    public static void main(String args[]) {
-        String[] testCaseName = { TestPredicatedSortedMap.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/set/TestSynchronizedSet.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java Mon Oct 18 11:36:20 2010
@@ -42,11 +42,6 @@ public class TestSynchronizedSet<E> exte
         return BulkTest.makeSuite(TestSynchronizedSet.class);
     }
 
-    public static void main(String args[]) {
-        String[] testCaseName = { TestSynchronizedSet.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
    //-------------------------------------------------------------------
     @Override
     public Set<E> makeObject() {

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

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

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

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

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

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java Mon Oct 18 11:36:20 2010
@@ -19,9 +19,6 @@ package org.apache.commons.collections.s
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.IterableMap;
 import org.apache.commons.collections.MapIterator;
@@ -66,15 +63,6 @@ public class TestSplitMapUtils extends B
         }
     }
 
-    public static Test suite() {
-        return new TestSuite(TestSplitMapUtils.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestSplitMapUtils.class.getName() };
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     // -----------------------------------------------------------------------
 
     public void testReadableMap() {

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java Mon Oct 18 11:36:20 2010
@@ -23,9 +23,6 @@ import java.io.ObjectOutputStream;
 import java.math.BigInteger;
 import java.util.HashMap;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.collections.BulkTest;
 import org.apache.commons.collections.MapIterator;
 import org.apache.commons.collections.Transformer;
@@ -65,15 +62,6 @@ public class TestTransformedMap extends 
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestTransformedMap.class);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestTransformedMap.class.getName() };
-        junit.textui.TestRunner.main(testCaseName);
-    }
-
     // -----------------------------------------------------------------------
     public void testTransformedMap() {
         TransformedMap<Integer, String, Object, Class<?>> map = TransformedMap.decorate(