From 9dfb8286f3b430ff163c687b568fabf2e238fe2c Mon Sep 17 00:00:00 2001 From: Sebastian Bazley Date: Mon, 18 Oct 2010 11:36:20 +0000 Subject: [PATCH] Remove unnecessary main() and suite() methods git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1023744 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/collections/TestArrayList.java | 12 ------------ .../commons/collections/TestArrayStack.java | 5 ----- .../collections/TestCollectionUtils.java | 4 ---- .../collections/TestExtendedProperties.java | 11 ----------- .../collections/TestIteratorUtils.java | 4 ---- .../collections/TestTransformerUtils.java | 19 ------------------- .../commons/collections/TestTreeMap.java | 5 ----- .../commons/collections/bag/TestHashBag.java | 12 ------------ .../collections/bag/TestPredicatedBag.java | 12 ------------ .../bag/TestPredicatedSortedBag.java | 12 ------------ .../collections/bag/TestTransformedBag.java | 12 ------------ .../bag/TestTransformedSortedBag.java | 12 ------------ .../commons/collections/bag/TestTreeBag.java | 12 ------------ .../TestAbstractOrderedBidiMapDecorator.java | 7 ------- .../bidimap/TestDualHashBidiMap.java | 6 ------ .../bidimap/TestDualTreeBidiMap.java | 6 ------ .../bidimap/TestDualTreeBidiMap2.java | 6 ------ .../collections/bidimap/TestTreeBidiMap.java | 6 ------ .../bidimap/TestUnmodifiableBidiMap.java | 6 ------ .../TestUnmodifiableOrderedBidiMap.java | 6 ------ .../TestUnmodifiableSortedBidiMap.java | 6 ------ .../buffer/TestBlockingBuffer.java | 11 ----------- .../collections/buffer/TestBoundedBuffer.java | 12 ------------ .../buffer/TestCircularFifoBuffer.java | 6 ------ .../buffer/TestPredicatedBuffer.java | 12 ------------ .../buffer/TestPriorityBuffer.java | 11 ----------- .../buffer/TestSynchronizedBuffer.java | 12 ------------ .../buffer/TestTransformedBuffer.java | 12 ------------ .../buffer/TestUnmodifiableBuffer.java | 12 ------------ .../collection/TestCompositeCollection.java | 12 ------------ .../collection/TestPredicatedCollection.java | 12 ------------ .../TestSynchronizedCollection.java | 12 ------------ .../collection/TestTransformedCollection.java | 12 ------------ .../TestUnmodifiableCollection.java | 12 ------------ .../comparators/TestBooleanComparator.java | 7 ------- .../comparators/TestComparableComparator.java | 7 ------- .../comparators/TestComparatorChain.java | 7 ------- .../comparators/TestFixedOrderComparator.java | 10 ---------- .../comparators/TestReverseComparator.java | 7 ------- .../functors/TestAllPredicate.java | 10 ---------- .../iterators/TestArrayIterator.java | 7 ------- .../iterators/TestArrayIterator2.java | 7 ------- .../iterators/TestArrayListIterator.java | 7 ------- .../iterators/TestArrayListIterator2.java | 7 ------- .../iterators/TestCollatingIterator.java | 7 ------- .../iterators/TestFilterIterator.java | 10 ---------- .../iterators/TestFilterListIterator.java | 12 ------------ .../iterators/TestIteratorChain.java | 7 ------- .../iterators/TestListIteratorWrapper.java | 6 ------ .../iterators/TestListIteratorWrapper2.java | 6 ------ .../iterators/TestLoopingIterator.java | 6 ------ .../iterators/TestLoopingListIterator.java | 6 ------ .../iterators/TestObjectArrayIterator.java | 7 ------- .../TestObjectArrayListIterator.java | 7 ------- .../TestObjectArrayListIterator2.java | 7 ------- .../iterators/TestObjectGraphIterator.java | 12 ------------ .../iterators/TestReverseListIterator.java | 13 ------------- .../iterators/TestSingletonIterator.java | 7 ------- .../iterators/TestSingletonIterator2.java | 7 ------- .../iterators/TestSingletonListIterator.java | 7 ------- .../iterators/TestUniqueFilterIterator.java | 7 ------- .../iterators/TestUnmodifiableIterator.java | 7 ------- .../TestUnmodifiableListIterator.java | 7 ------- .../TestUnmodifiableMapIterator.java | 7 ------- .../TestUnmodifiableOrderedMapIterator.java | 7 ------- .../keyvalue/TestDefaultKeyValue.java | 10 ---------- .../keyvalue/TestDefaultMapEntry.java | 11 ----------- .../collections/keyvalue/TestMultiKey.java | 11 ----------- .../keyvalue/TestTiedMapEntry.java | 11 ----------- .../keyvalue/TestUnmodifiableMapEntry.java | 11 ----------- .../list/TestCursorableLinkedList.java | 5 ----- .../collections/list/TestFixedSizeList.java | 12 ------------ .../collections/list/TestGrowthList.java | 12 ------------ .../list/TestNodeCachingLinkedList.java | 6 ------ .../collections/list/TestPredicatedList.java | 12 ------------ .../collections/list/TestSetUniqueList.java | 12 ------------ .../list/TestSynchronizedList.java | 12 ------------ .../collections/list/TestTransformedList.java | 12 ------------ .../list/TestUnmodifiableList.java | 12 ------------ .../map/TestCaseInsensitiveMap.java | 6 ------ .../collections/map/TestCompositeMap.java | 11 ----------- .../collections/map/TestDefaultedMap.java | 12 ------------ .../collections/map/TestFixedSizeMap.java | 12 ------------ .../map/TestFixedSizeSortedMap.java | 5 ----- .../commons/collections/map/TestFlat3Map.java | 6 ------ .../collections/map/TestHashedMap.java | 6 ------ .../collections/map/TestIdentityMap.java | 6 ------ .../commons/collections/map/TestLRUMap.java | 6 ------ .../commons/collections/map/TestLazyMap.java | 5 ----- .../collections/map/TestLazySortedMap.java | 5 ----- .../collections/map/TestLinkedMap.java | 6 ------ .../collections/map/TestListOrderedMap.java | 5 ----- .../collections/map/TestListOrderedMap2.java | 5 ----- .../collections/map/TestMultiKeyMap.java | 6 ------ .../collections/map/TestMultiValueMap.java | 12 ------------ .../collections/map/TestPredicatedMap.java | 12 ------------ .../map/TestPredicatedSortedMap.java | 12 ------------ .../map/TestReferenceIdentityMap.java | 5 ----- .../collections/map/TestReferenceMap.java | 5 ----- .../collections/map/TestSingletonMap.java | 6 ------ .../collections/map/TestStaticBucketMap.java | 5 ----- .../collections/map/TestTransformedMap.java | 12 ------------ .../map/TestTransformedSortedMap.java | 5 ----- .../collections/map/TestUnmodifiableMap.java | 12 ------------ .../map/TestUnmodifiableOrderedMap.java | 12 ------------ .../map/TestUnmodifiableSortedMap.java | 12 ------------ .../collections/set/TestCompositeSet.java | 7 ------- .../collections/set/TestListOrderedSet.java | 12 ------------ .../collections/set/TestListOrderedSet2.java | 12 ------------ .../collections/set/TestMapBackedSet.java | 12 ------------ .../collections/set/TestMapBackedSet2.java | 12 ------------ .../collections/set/TestPredicatedSet.java | 12 ------------ .../set/TestPredicatedSortedSet.java | 6 ------ .../collections/set/TestSynchronizedSet.java | 5 ----- .../set/TestSynchronizedSortedSet.java | 5 ----- .../collections/set/TestTransformedSet.java | 12 ------------ .../set/TestTransformedSortedSet.java | 5 ----- .../collections/set/TestUnmodifiableSet.java | 5 ----- .../set/TestUnmodifiableSortedSet.java | 5 ----- .../splitmap/TestSplitMapUtils.java | 12 ------------ .../splitmap/TestTransformedMap.java | 12 ------------ 121 files changed, 1062 deletions(-) diff --git a/src/test/org/apache/commons/collections/TestArrayList.java b/src/test/org/apache/commons/collections/TestArrayList.java index 85a59b6fe..2e0cc905b 100644 --- a/src/test/org/apache/commons/collections/TestArrayList.java +++ b/src/test/org/apache/commons/collections/TestArrayList.java @@ -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 extends AbstractTestList { 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} */ diff --git a/src/test/org/apache/commons/collections/TestArrayStack.java b/src/test/org/apache/commons/collections/TestArrayStack.java index 202ab89c8..d6df5644f 100644 --- a/src/test/org/apache/commons/collections/TestArrayStack.java +++ b/src/test/org/apache/commons/collections/TestArrayStack.java @@ -37,11 +37,6 @@ public class TestArrayStack extends TestArrayList { return BulkTest.makeSuite(TestArrayStack.class); } - public static void main(String args[]) { - String[] testCaseName = { TestArrayStack.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - @Override public ArrayStack makeObject() { return new ArrayStack(); diff --git a/src/test/org/apache/commons/collections/TestCollectionUtils.java b/src/test/org/apache/commons/collections/TestCollectionUtils.java index 26d09753f..acbdb1ce1 100644 --- a/src/test/org/apache/commons/collections/TestCollectionUtils.java +++ b/src/test/org/apache/commons/collections/TestCollectionUtils.java @@ -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 diff --git a/src/test/org/apache/commons/collections/TestExtendedProperties.java b/src/test/org/apache/commons/collections/TestExtendedProperties.java index 8416957e6..12a14453a 100644 --- a/src/test/org/apache/commons/collections/TestExtendedProperties.java +++ b/src/test/org/apache/commons/collections/TestExtendedProperties.java @@ -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 extends TestCase { 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 diff --git a/src/test/org/apache/commons/collections/TestIteratorUtils.java b/src/test/org/apache/commons/collections/TestIteratorUtils.java index 6b797b52a..9435159ab 100644 --- a/src/test/org/apache/commons/collections/TestIteratorUtils.java +++ b/src/test/org/apache/commons/collections/TestIteratorUtils.java @@ -44,10 +44,6 @@ public class TestIteratorUtils extends BulkTest { super(name); } - public static void main(String args[]) { - junit.textui.TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestIteratorUtils.class); } diff --git a/src/test/org/apache/commons/collections/TestTransformerUtils.java b/src/test/org/apache/commons/collections/TestTransformerUtils.java index 5e5e72f11..39e3991b1 100644 --- a/src/test/org/apache/commons/collections/TestTransformerUtils.java +++ b/src/test/org/apache/commons/collections/TestTransformerUtils.java @@ -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; @@ -59,21 +55,6 @@ public class TestTransformerUtils extends junit.framework.TestCase { super(name); } - /** - * 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. */ diff --git a/src/test/org/apache/commons/collections/TestTreeMap.java b/src/test/org/apache/commons/collections/TestTreeMap.java index dac5184f0..10335d21d 100644 --- a/src/test/org/apache/commons/collections/TestTreeMap.java +++ b/src/test/org/apache/commons/collections/TestTreeMap.java @@ -33,11 +33,6 @@ public abstract class TestTreeMap extends AbstractTestMap { super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestTreeMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public boolean isAllowNullKey() { return false; diff --git a/src/test/org/apache/commons/collections/bag/TestHashBag.java b/src/test/org/apache/commons/collections/bag/TestHashBag.java index c99540e61..de910d47a 100644 --- a/src/test/org/apache/commons/collections/bag/TestHashBag.java +++ b/src/test/org/apache/commons/collections/bag/TestHashBag.java @@ -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 extends AbstractTestBag { 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 makeObject() { return new HashBag(); diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java index 442f9f1ef..ba36c50d3 100644 --- a/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java @@ -18,9 +18,6 @@ package org.apache.commons.collections.bag; 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 extends AbstractTestBag { 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 stringPredicate() { diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java index 263f15005..34e9a2842 100644 --- a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java @@ -18,9 +18,6 @@ package org.apache.commons.collections.bag; 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 extends AbstractTestSortedBag { 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 stringPredicate() { diff --git a/src/test/org/apache/commons/collections/bag/TestTransformedBag.java b/src/test/org/apache/commons/collections/bag/TestTransformedBag.java index c7293ffa8..2e45cfef6 100644 --- a/src/test/org/apache/commons/collections/bag/TestTransformedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestTransformedBag.java @@ -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 extends AbstractTestBag { 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 makeObject() { diff --git a/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java index 4a911d6c0..71cca2a26 100644 --- a/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java @@ -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 extends AbstractTestSortedBag { 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 makeObject() { diff --git a/src/test/org/apache/commons/collections/bag/TestTreeBag.java b/src/test/org/apache/commons/collections/bag/TestTreeBag.java index b1c38295e..a482bef5c 100644 --- a/src/test/org/apache/commons/collections/bag/TestTreeBag.java +++ b/src/test/org/apache/commons/collections/bag/TestTreeBag.java @@ -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 extends AbstractTestSortedBag { 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 makeObject() { return new TreeBag(); diff --git a/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java b/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java index 32400270d..1533bb48c 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java +++ b/src/test/org/apache/commons/collections/bidimap/TestAbstractOrderedBidiMapDecorator.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.bidimap; 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 TestAbstractOrderedBidiMapDecorator super(testName); } - public static Test suite() { - return new TestSuite(TestAbstractOrderedBidiMapDecorator.class); - } - /** * {@inheritDoc} */ diff --git a/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java index 0149ab363..84085f28b 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestDualHashBidiMap.java @@ -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.BulkTest; */ public class TestDualHashBidiMap extends AbstractTestBidiMap { - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestDualHashBidiMap.class); } diff --git a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java index 631f64480..f225f5151 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap.java @@ -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.BulkTest; */ public class TestDualTreeBidiMap, V extends Comparable> extends AbstractTestSortedBidiMap { - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestDualTreeBidiMap.class); } diff --git a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java index b957b966f..f99677914 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java +++ b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java @@ -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.comparators.ReverseComparator; */ public class TestDualTreeBidiMap2, V extends Comparable> extends AbstractTestSortedBidiMap { - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestDualTreeBidiMap2.class); } diff --git a/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java index 0a0400ca8..0a27dbdb9 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestTreeBidiMap.java @@ -19,8 +19,6 @@ package org.apache.commons.collections.bidimap; 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.BulkTest; */ public class TestTreeBidiMap, V extends Comparable> extends AbstractTestOrderedBidiMap { - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestTreeBidiMap.class); } diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java index e56c85c74..e1600fcc2 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java @@ -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.BulkTest; */ public class TestUnmodifiableBidiMap extends AbstractTestBidiMap { - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestUnmodifiableBidiMap.class); } diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java index 0ebf7da8a..1ed372011 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java @@ -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.OrderedBidiMap; */ public class TestUnmodifiableOrderedBidiMap, V extends Comparable> extends AbstractTestOrderedBidiMap { - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestUnmodifiableOrderedBidiMap.class); } diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java index 108753bd7..2d7645a54 100644 --- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java +++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java @@ -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.SortedBidiMap; */ public class TestUnmodifiableSortedBidiMap, V extends Comparable> extends AbstractTestSortedBidiMap { - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestUnmodifiableSortedBidiMap.class); } diff --git a/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java index 337bab03c..1c8689f5b 100644 --- a/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java @@ -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 extends AbstractTestObject { 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 makeObject() { return BlockingBuffer.decorate(new MyBuffer()); diff --git a/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java index 0becf7b51..52e66ebbf 100644 --- a/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java @@ -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 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"; diff --git a/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java b/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java index 02fc32ef9..00fc4e769 100644 --- a/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestCircularFifoBuffer.java @@ -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 extends AbstractTestCollection { return BulkTest.makeSuite(TestCircularFifoBuffer.class); } - public static void main(String args[]) { - TestRunner.run(TestCircularFifoBuffer.class); - } - //----------------------------------------------------------------------- /** * Runs through the regular verifications, but also verifies that diff --git a/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java index ab5d16b40..0fe8f8b9e 100644 --- a/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java @@ -18,9 +18,6 @@ package org.apache.commons.collections.buffer; 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 extends TestPredicatedCollection { 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 decorateCollection(Buffer buffer, Predicate predicate) { diff --git a/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java b/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java index 53894315e..bf8c51aa8 100644 --- a/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java @@ -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.comparators.ReverseComparator; */ public class TestPriorityBuffer extends AbstractTestCollection { - 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); } diff --git a/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java index afc99b9eb..88f7aa5f8 100644 --- a/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.buffer; 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 extends AbstractTestCollection { 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 makeObject() { diff --git a/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java index 44f9cad6b..70f1e3eab 100644 --- a/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java @@ -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 extends TestCase { 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 buffer = TransformedBuffer.decorate(new ArrayStack(), TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER); assertEquals(0, buffer.size()); diff --git a/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java b/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java index 6a76ff2b7..55f105604 100644 --- a/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java +++ b/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.buffer; 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 extends AbstractTestCollection { 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 makeObject() { diff --git a/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java b/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java index 24026660d..38ab0761d 100644 --- a/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestCompositeCollection.java @@ -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 extends AbstractTestCollection { 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 diff --git a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java index be8ac09d1..705606f8f 100644 --- a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java @@ -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 extends AbstractTestCollection { 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 truePredicate = TruePredicate.truePredicate(); diff --git a/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java b/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java index 6315e300f..83656652c 100644 --- a/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java @@ -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 extends AbstractTestCollection { 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 makeObject() { diff --git a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java index 7363fd7b2..22ef478da 100644 --- a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java @@ -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 extends AbstractTestCollection { 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 makeConfirmedCollection() { diff --git a/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java b/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java index 8c0af1eef..844b7881e 100644 --- a/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java +++ b/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java @@ -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 extends AbstractTestCollection { 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 makeObject() { diff --git a/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java b/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java index dc9c2cb9e..35cd9c0ca 100644 --- a/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java +++ b/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java @@ -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 extends AbstractTestComparator { super(testName); } - public static Test suite() { - return new TestSuite(TestBooleanComparator.class); - } - // collections testing framework // ------------------------------------------------------------------------ diff --git a/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java b/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java index 375ff5d83..cf21f4981 100644 --- a/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java +++ b/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java @@ -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 extends AbstractTestComparator { super(testName); } - public static Test suite() { - return new TestSuite(TestComparableComparator.class); - } - @Override public Comparator makeObject() { return new ComparableComparator(); diff --git a/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java b/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java index e7ef5301d..5aed8deba 100644 --- a/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java +++ b/src/test/org/apache/commons/collections/comparators/TestComparatorChain.java @@ -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 AbstractTestComparator makeObject() { ComparatorChain chain = new ComparatorChain(new ColumnComparator(0)); diff --git a/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java b/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java index 9e5d10542..878456c0d 100644 --- a/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java +++ b/src/test/org/apache/commons/collections/comparators/TestFixedOrderComparator.java @@ -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 extends TestCase { 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 // diff --git a/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java b/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java index 7c049d909..75eac3487 100644 --- a/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java +++ b/src/test/org/apache/commons/collections/comparators/TestReverseComparator.java @@ -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 extends AbstractTestComparator { 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() diff --git a/src/test/org/apache/commons/collections/functors/TestAllPredicate.java b/src/test/org/apache/commons/collections/functors/TestAllPredicate.java index 2f3c14894..ad94df732 100644 --- a/src/test/org/apache/commons/collections/functors/TestAllPredicate.java +++ b/src/test/org/apache/commons/collections/functors/TestAllPredicate.java @@ -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; @@ -21,15 +20,6 @@ import java.util.Collections; */ public class TestAllPredicate extends TestAnyAllOnePredicate { - /** - * Creates a JUnit3 test suite. - * - * @return a JUnit3 test suite - */ - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(TestAllPredicate.class); - } - /** * Creates a new TestAllPredicate. */ diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java b/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java index 68c033e87..70b21adb9 100644 --- a/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestArrayIterator.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.iterators; 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 extends AbstractTestIterator { protected String[] testArray = { "One", "Two", "Three" }; - public static Test suite() { - return new TestSuite(TestArrayIterator.class); - } - public TestArrayIterator(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java b/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java index 83f6bc572..a89e3a5fd 100644 --- a/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java +++ b/src/test/org/apache/commons/collections/iterators/TestArrayIterator2.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.iterators; 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 extends AbstractTestIterator { protected int[] testArray = { 2, 4, 6, 8 }; - public static Test suite() { - return new TestSuite(TestArrayIterator2.class); - } - public TestArrayIterator2(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java index b5739d068..a0399859e 100644 --- a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator.java @@ -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 extends TestArrayIterator { super(testName); } - public static Test suite() { - return new TestSuite(TestArrayListIterator.class); - } - @Override public ArrayListIterator makeEmptyIterator() { return new ArrayListIterator(new Object[0]); diff --git a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java index 12e0e8612..efc207a17 100644 --- a/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java +++ b/src/test/org/apache/commons/collections/iterators/TestArrayListIterator2.java @@ -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 extends TestArrayIterator2 { super(testName); } - public static Test suite() { - return new TestSuite(TestArrayListIterator2.class); - } - @Override public ArrayListIterator makeEmptyIterator() { return new ArrayListIterator(new int[0]); diff --git a/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java b/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java index c32706380..5c82d0641 100644 --- a/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.iterators; 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 extends AbstractTestIterator { super(testName); } - public static Test suite() { - return new TestSuite(TestCollatingIterator.class); - } - //--------------------------------------------------------------- Lifecycle private Comparator comparator = null; diff --git a/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java b/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java index 75bd8492a..dd9e303b4 100644 --- a/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java @@ -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; @@ -68,13 +65,6 @@ public class TestFilterIterator extends AbstractTestIterator { iterator = null; } - /** - * 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 diff --git a/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java b/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java index 3e7097b26..8d1d24d4c 100644 --- a/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java @@ -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 extends TestCase { 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 list = null; private ArrayList odds = null; private ArrayList evens = null; diff --git a/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java b/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java index 198573410..f28c85c9f 100644 --- a/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java +++ b/src/test/org/apache/commons/collections/iterators/TestIteratorChain.java @@ -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 AbstractTestIterator { protected List list2 = null; protected List list3 = null; - public static Test suite() { - return new TestSuite(TestIteratorChain.class); - } - public TestIteratorChain(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java b/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java index 037e807bf..b4d542941 100644 --- a/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java +++ b/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper.java @@ -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 extends AbstractTestIterator { protected List list1 = null; - public static Test suite() { - return new TestSuite(TestListIteratorWrapper.class); - } - public TestListIteratorWrapper(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java b/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java index abe2d7bcb..3b024ce30 100644 --- a/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java +++ b/src/test/org/apache/commons/collections/iterators/TestListIteratorWrapper2.java @@ -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 extends AbstractTestIterator { protected List list1 = null; - public static Test suite() { - return new TestSuite(TestListIteratorWrapper2.class); - } - public TestListIteratorWrapper2(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java b/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java index 655e1cd48..cdb1a0b0a 100644 --- a/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestLoopingIterator.java @@ -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 TestCase { super(testName); } - public static Test suite() { - return new TestSuite(TestLoopingIterator.class); - } - /** * Tests constructor exception. */ diff --git a/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java b/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java index 954d519de..7098077fd 100644 --- a/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestLoopingListIterator.java @@ -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 extends TestCase { super(testName); } - public static Test suite() { - return new TestSuite(TestLoopingListIterator.class); - } - /** * Tests constructor exception. */ diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java b/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java index b040f618b..23ac62124 100644 --- a/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestObjectArrayIterator.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.iterators; 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 extends AbstractTestIterator { protected String[] testArray = { "One", "Two", "Three" }; - public static Test suite() { - return new TestSuite(TestObjectArrayIterator.class); - } - public TestObjectArrayIterator(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java index fdeb8c0aa..424202246 100644 --- a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator.java @@ -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 extends TestObjectArrayIterator { super(testName); } - public static Test suite() { - return new TestSuite(TestObjectArrayListIterator.class); - } - @Override @SuppressWarnings("unchecked") public ObjectArrayListIterator makeEmptyIterator() { diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java index 4b8196714..321b48e33 100644 --- a/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java +++ b/src/test/org/apache/commons/collections/iterators/TestObjectArrayListIterator2.java @@ -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 TestObjectArrayListIterator2 extends AbstractTestListIterator super(testName); } - public static Test suite() { - return new TestSuite(TestObjectArrayListIterator2.class); - } - @Override @SuppressWarnings("unchecked") public ObjectArrayListIterator makeEmptyIterator() { diff --git a/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java b/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java index b00233630..ce2ada356 100644 --- a/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestObjectGraphIterator.java @@ -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 extends AbstractTestIterator { 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(); diff --git a/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java b/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java index 5b567e86a..71073beea 100644 --- a/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestReverseListIterator.java @@ -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 extends AbstractTestListIterator { 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); } diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java index a09aa977a..2d314af5c 100644 --- a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.iterators; 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 extends AbstractTestIterator { private static final Object testValue = "foo"; - public static Test suite() { - return new TestSuite(TestSingletonIterator.class); - } - public TestSingletonIterator(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java index c67b700da..ced8e6e0c 100644 --- a/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java +++ b/src/test/org/apache/commons/collections/iterators/TestSingletonIterator2.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.iterators; 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 extends AbstractTestIterator { private static final Object testValue = "foo"; - public static Test suite() { - return new TestSuite(TestSingletonIterator2.class); - } - public TestSingletonIterator2(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java b/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java index 01d4fe1c0..486a092f1 100644 --- a/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.iterators; 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 extends AbstractTestListIterator { private static final Object testValue = "foo"; - public static Test suite() { - return new TestSuite(TestSingletonListIterator.class); - } - public TestSingletonListIterator(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java b/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java index 910558ce3..60230c73c 100644 --- a/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestUniqueFilterIterator.java @@ -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 extends AbstractTestIterator { protected List list1 = null; - public static Test suite() { - return new TestSuite(TestUniqueFilterIterator.class); - } - public TestUniqueFilterIterator(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java index c5fc373c6..c4a8199f6 100644 --- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java @@ -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 extends AbstractTestIterator { protected String[] testArray = { "One", "Two", "Three" }; protected List testList; - public static Test suite() { - return new TestSuite(TestUnmodifiableIterator.class); - } - public TestUnmodifiableIterator(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java index ef424e408..cc515b7ee 100644 --- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java @@ -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 TestUnmodifiableListIterator extends AbstractTestListIterator protected String[] testArray = { "One", "Two", "Three" }; protected List testList; - public static Test suite() { - return new TestSuite(TestUnmodifiableListIterator.class); - } - public TestUnmodifiableListIterator(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java index 9296e0892..658f14f85 100644 --- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.iterators; 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.bidimap.DualHashBidiMap; */ public class TestUnmodifiableMapIterator extends AbstractTestMapIterator { - public static Test suite() { - return new TestSuite(TestUnmodifiableMapIterator.class); - } - public TestUnmodifiableMapIterator(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java index 9f758d343..c46b5b130 100644 --- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java +++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java @@ -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.map.ListOrderedMap; */ public class TestUnmodifiableOrderedMapIterator extends AbstractTestOrderedMapIterator { - public static Test suite() { - return new TestSuite(TestUnmodifiableOrderedMapIterator.class); - } - public TestUnmodifiableOrderedMapIterator(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java b/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java index 71156137f..8e1bffd9e 100644 --- a/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java +++ b/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java @@ -19,9 +19,7 @@ package org.apache.commons.collections.keyvalue; 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 extends TestCase { } - 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. diff --git a/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java index d434436c3..89e3b7457 100644 --- a/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java +++ b/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java @@ -18,9 +18,6 @@ package org.apache.commons.collections.keyvalue; 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 extends AbstractTestMapEntry { 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. diff --git a/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java b/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java index f68b3e6cb..586d3d9b3 100644 --- a/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java +++ b/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java @@ -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 TestCase { 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(); diff --git a/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java index 764a8bf4f..e659c5eda 100644 --- a/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java +++ b/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.keyvalue; 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 extends AbstractTestMapEntry { 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 diff --git a/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java b/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java index fef0e087b..1d0ba1234 100644 --- a/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java +++ b/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java @@ -18,9 +18,6 @@ package org.apache.commons.collections.keyvalue; 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 extends AbstractTestMapEntry { 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. diff --git a/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java b/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java index f50dc167e..8bc5000ed 100644 --- a/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java +++ b/src/test/org/apache/commons/collections/list/TestCursorableLinkedList.java @@ -45,11 +45,6 @@ public class TestCursorableLinkedList extends TestAbstractLinkedList { return BulkTest.makeSuite(TestCursorableLinkedList.class); } - public static void main(String args[]) { - String[] testCaseName = { TestCursorableLinkedList.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - private CursorableLinkedList list; @Override diff --git a/src/test/org/apache/commons/collections/list/TestFixedSizeList.java b/src/test/org/apache/commons/collections/list/TestFixedSizeList.java index d97fe852e..640952c24 100644 --- a/src/test/org/apache/commons/collections/list/TestFixedSizeList.java +++ b/src/test/org/apache/commons/collections/list/TestFixedSizeList.java @@ -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 extends AbstractTestList { 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 makeObject() { return FixedSizeList.decorate(new ArrayList()); diff --git a/src/test/org/apache/commons/collections/list/TestGrowthList.java b/src/test/org/apache/commons/collections/list/TestGrowthList.java index fb14e8ddd..f21ed9963 100644 --- a/src/test/org/apache/commons/collections/list/TestGrowthList.java +++ b/src/test/org/apache/commons/collections/list/TestGrowthList.java @@ -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 extends AbstractTestList { 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 makeObject() { return new GrowthList(); diff --git a/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java b/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java index 32abfc05b..e50263bde 100644 --- a/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java +++ b/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java @@ -37,12 +37,6 @@ public class TestNodeCachingLinkedList extends TestAbstractLinkedList { 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); } diff --git a/src/test/org/apache/commons/collections/list/TestPredicatedList.java b/src/test/org/apache/commons/collections/list/TestPredicatedList.java index 91226c4ee..4c2fb6ea3 100644 --- a/src/test/org/apache/commons/collections/list/TestPredicatedList.java +++ b/src/test/org/apache/commons/collections/list/TestPredicatedList.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.list; 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 extends AbstractTestList { 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 truePredicate = TruePredicate.truePredicate(); diff --git a/src/test/org/apache/commons/collections/list/TestSetUniqueList.java b/src/test/org/apache/commons/collections/list/TestSetUniqueList.java index 5ce9eebe7..88db03738 100644 --- a/src/test/org/apache/commons/collections/list/TestSetUniqueList.java +++ b/src/test/org/apache/commons/collections/list/TestSetUniqueList.java @@ -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 extends AbstractTestList { - public static void main(String[] args) { - TestRunner.run(suite()); - } - - public static Test suite() { - return new TestSuite(TestSetUniqueList.class); - } - public TestSetUniqueList(String testName) { super(testName); } diff --git a/src/test/org/apache/commons/collections/list/TestSynchronizedList.java b/src/test/org/apache/commons/collections/list/TestSynchronizedList.java index 2f378985c..e2c12171b 100644 --- a/src/test/org/apache/commons/collections/list/TestSynchronizedList.java +++ b/src/test/org/apache/commons/collections/list/TestSynchronizedList.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.list; 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 extends AbstractTestList { 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 makeConfirmedCollection() { return new ArrayList(); diff --git a/src/test/org/apache/commons/collections/list/TestTransformedList.java b/src/test/org/apache/commons/collections/list/TestTransformedList.java index 138896ef1..413ee122c 100644 --- a/src/test/org/apache/commons/collections/list/TestTransformedList.java +++ b/src/test/org/apache/commons/collections/list/TestTransformedList.java @@ -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 extends AbstractTestList { 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 makeConfirmedCollection() { return new ArrayList(); diff --git a/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java b/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java index 12fd503fe..cff1771bc 100644 --- a/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java +++ b/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java @@ -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 extends AbstractTestList { 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 makeObject() { diff --git a/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java b/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java index 53abb69bb..1e9bf4714 100644 --- a/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java +++ b/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java @@ -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 extends AbstractTestIterableMap super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestCaseInsensitiveMap.class); } diff --git a/src/test/org/apache/commons/collections/map/TestCompositeMap.java b/src/test/org/apache/commons/collections/map/TestCompositeMap.java index 6bd78250c..3376513aa 100644 --- a/src/test/org/apache/commons/collections/map/TestCompositeMap.java +++ b/src/test/org/apache/commons/collections/map/TestCompositeMap.java @@ -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 extends AbstractTestIterableMap { 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 makeObject() { CompositeMap map = new CompositeMap(); diff --git a/src/test/org/apache/commons/collections/map/TestDefaultedMap.java b/src/test/org/apache/commons/collections/map/TestDefaultedMap.java index 52eef84df..60d535ebd 100644 --- a/src/test/org/apache/commons/collections/map/TestDefaultedMap.java +++ b/src/test/org/apache/commons/collections/map/TestDefaultedMap.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.map; 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 extends AbstractTestIterableMap { 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 makeObject() { diff --git a/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java b/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java index 5abab2bdd..8479d4b8a 100644 --- a/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java +++ b/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java @@ -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 extends AbstractTestIterableMap { 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 makeObject() { return FixedSizeMap.decorate(new HashMap()); diff --git a/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java b/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java index cbe45203d..2f25fe422 100644 --- a/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java +++ b/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java @@ -42,11 +42,6 @@ public class TestFixedSizeSortedMap extends AbstractTestSortedMap { return BulkTest.makeSuite(TestFixedSizeSortedMap.class); } - public static void main(String args[]) { - String[] testCaseName = { TestFixedSizeSortedMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //----------------------------------------------------------------------- @Override public SortedMap makeObject() { diff --git a/src/test/org/apache/commons/collections/map/TestFlat3Map.java b/src/test/org/apache/commons/collections/map/TestFlat3Map.java index d0eec9290..eb422dd0e 100644 --- a/src/test/org/apache/commons/collections/map/TestFlat3Map.java +++ b/src/test/org/apache/commons/collections/map/TestFlat3Map.java @@ -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 extends AbstractTestIterableMap { super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestFlat3Map.class); } diff --git a/src/test/org/apache/commons/collections/map/TestHashedMap.java b/src/test/org/apache/commons/collections/map/TestHashedMap.java index 9b9ea70d3..890daea2a 100644 --- a/src/test/org/apache/commons/collections/map/TestHashedMap.java +++ b/src/test/org/apache/commons/collections/map/TestHashedMap.java @@ -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 extends AbstractTestIterableMap { super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestHashedMap.class); } diff --git a/src/test/org/apache/commons/collections/map/TestIdentityMap.java b/src/test/org/apache/commons/collections/map/TestIdentityMap.java index d9f564850..58a1e9e51 100644 --- a/src/test/org/apache/commons/collections/map/TestIdentityMap.java +++ b/src/test/org/apache/commons/collections/map/TestIdentityMap.java @@ -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 extends AbstractTestObject { 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! diff --git a/src/test/org/apache/commons/collections/map/TestLRUMap.java b/src/test/org/apache/commons/collections/map/TestLRUMap.java index b14b8689a..da590b7c7 100644 --- a/src/test/org/apache/commons/collections/map/TestLRUMap.java +++ b/src/test/org/apache/commons/collections/map/TestLRUMap.java @@ -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 extends AbstractTestOrderedMap { super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestLRUMap.class); } diff --git a/src/test/org/apache/commons/collections/map/TestLazyMap.java b/src/test/org/apache/commons/collections/map/TestLazyMap.java index 4f3072b61..d6dc178cb 100644 --- a/src/test/org/apache/commons/collections/map/TestLazyMap.java +++ b/src/test/org/apache/commons/collections/map/TestLazyMap.java @@ -43,11 +43,6 @@ public class TestLazyMap extends AbstractTestIterableMap { super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestLazyMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public LazyMap makeObject() { return getLazyMap(new HashMap(), FactoryUtils.nullFactory()); diff --git a/src/test/org/apache/commons/collections/map/TestLazySortedMap.java b/src/test/org/apache/commons/collections/map/TestLazySortedMap.java index ca069e62b..5485b1609 100644 --- a/src/test/org/apache/commons/collections/map/TestLazySortedMap.java +++ b/src/test/org/apache/commons/collections/map/TestLazySortedMap.java @@ -46,11 +46,6 @@ public class TestLazySortedMap extends AbstractTestSortedMap { super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestLazySortedMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public SortedMap makeObject() { return getLazySortedMap(new TreeMap(), FactoryUtils.nullFactory()); diff --git a/src/test/org/apache/commons/collections/map/TestLinkedMap.java b/src/test/org/apache/commons/collections/map/TestLinkedMap.java index 01882c7fc..2c25bdc1a 100644 --- a/src/test/org/apache/commons/collections/map/TestLinkedMap.java +++ b/src/test/org/apache/commons/collections/map/TestLinkedMap.java @@ -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 extends AbstractTestOrderedMap { super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestLinkedMap.class); } diff --git a/src/test/org/apache/commons/collections/map/TestListOrderedMap.java b/src/test/org/apache/commons/collections/map/TestListOrderedMap.java index 027284564..ee0c422a7 100644 --- a/src/test/org/apache/commons/collections/map/TestListOrderedMap.java +++ b/src/test/org/apache/commons/collections/map/TestListOrderedMap.java @@ -47,11 +47,6 @@ public class TestListOrderedMap extends AbstractTestOrderedMap { return BulkTest.makeSuite(TestListOrderedMap.class); } - public static void main(String args[]) { - String[] testCaseName = { TestListOrderedMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public ListOrderedMap makeObject() { return (ListOrderedMap) ListOrderedMap.decorate(new HashMap()); diff --git a/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java b/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java index 584404b59..c0b06078d 100644 --- a/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java +++ b/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java @@ -44,11 +44,6 @@ public class TestListOrderedMap2 extends AbstractTestOrderedMap { return BulkTest.makeSuite(TestListOrderedMap2.class); } - public static void main(String args[]) { - String[] testCaseName = { TestListOrderedMap2.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public ListOrderedMap makeObject() { return new ListOrderedMap(); diff --git a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java index 7d845857c..ca3f35fea 100644 --- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java +++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java @@ -19,8 +19,6 @@ package org.apache.commons.collections.map; 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 extends AbstractTestIterableMap extends AbstractTestObject { 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 map = createTestMap(); assertNull(map.get("whatever")); diff --git a/src/test/org/apache/commons/collections/map/TestPredicatedMap.java b/src/test/org/apache/commons/collections/map/TestPredicatedMap.java index 322fe68d8..6026d0588 100644 --- a/src/test/org/apache/commons/collections/map/TestPredicatedMap.java +++ b/src/test/org/apache/commons/collections/map/TestPredicatedMap.java @@ -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 extends AbstractTestIterableMap { 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 decorateMap(Map map, Predicate keyPredicate, Predicate valuePredicate) { diff --git a/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java b/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java index 33adca3aa..584fd0f4c 100644 --- a/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java +++ b/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java @@ -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 extends AbstractTestSortedMap { 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 decorateMap(SortedMap map, Predicate keyPredicate, Predicate valuePredicate) { diff --git a/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java b/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java index 9b042f904..aff73768a 100644 --- a/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java +++ b/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java @@ -50,11 +50,6 @@ public class TestReferenceIdentityMap extends AbstractTestIterableMap makeObject() { return new ReferenceIdentityMap(ReferenceStrength.WEAK, ReferenceStrength.WEAK); diff --git a/src/test/org/apache/commons/collections/map/TestReferenceMap.java b/src/test/org/apache/commons/collections/map/TestReferenceMap.java index e47080370..21199fa5f 100644 --- a/src/test/org/apache/commons/collections/map/TestReferenceMap.java +++ b/src/test/org/apache/commons/collections/map/TestReferenceMap.java @@ -42,11 +42,6 @@ public class TestReferenceMap extends AbstractTestIterableMap { return BulkTest.makeSuite(TestReferenceMap.class); } - public static void main(String args[]) { - String[] testCaseName = { TestReferenceMap.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - @Override public ReferenceMap makeObject() { return new ReferenceMap(ReferenceStrength.WEAK, ReferenceStrength.WEAK); diff --git a/src/test/org/apache/commons/collections/map/TestSingletonMap.java b/src/test/org/apache/commons/collections/map/TestSingletonMap.java index 7d209a567..5f7683cca 100644 --- a/src/test/org/apache/commons/collections/map/TestSingletonMap.java +++ b/src/test/org/apache/commons/collections/map/TestSingletonMap.java @@ -19,8 +19,6 @@ package org.apache.commons.collections.map; 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 extends AbstractTestOrderedMap { super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestSingletonMap.class); } diff --git a/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java b/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java index 0900cbf31..3c018c15c 100644 --- a/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java +++ b/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java @@ -38,11 +38,6 @@ public class TestStaticBucketMap extends AbstractTestIterableMap { return BulkTest.makeSuite(TestStaticBucketMap.class); } - public static void main(String[] args) { - String[] testCaseName = { TestStaticBucketMap.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - @Override public StaticBucketMap makeObject() { return new StaticBucketMap(30); diff --git a/src/test/org/apache/commons/collections/map/TestTransformedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedMap.java index c7936fad4..f1acb563c 100644 --- a/src/test/org/apache/commons/collections/map/TestTransformedMap.java +++ b/src/test/org/apache/commons/collections/map/TestTransformedMap.java @@ -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 extends AbstractTestIterableMap { 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 makeObject() { diff --git a/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java index 6e8249ce2..9ec5a44f5 100644 --- a/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java +++ b/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java @@ -47,11 +47,6 @@ public class TestTransformedSortedMap extends AbstractTestSortedMap return BulkTest.makeSuite(TestTransformedSortedMap.class); } - public static void main(String args[]) { - String[] testCaseName = { TestTransformedSortedMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //----------------------------------------------------------------------- @Override @SuppressWarnings("unchecked") diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java index acf421fc7..9d2447412 100644 --- a/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java +++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.map; 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 extends AbstractTestIterableMap { 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 diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java index e632cbef4..8992136ce 100644 --- a/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java +++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java @@ -18,9 +18,6 @@ package org.apache.commons.collections.map; 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 extends AbstractTestOrderedMap extends AbstractTestSortedMap 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 diff --git a/src/test/org/apache/commons/collections/set/TestCompositeSet.java b/src/test/org/apache/commons/collections/set/TestCompositeSet.java index 1b885c098..0b96ec198 100644 --- a/src/test/org/apache/commons/collections/set/TestCompositeSet.java +++ b/src/test/org/apache/commons/collections/set/TestCompositeSet.java @@ -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 extends AbstractTestSet { super(name); } - public static Test suite() { - return new TestSuite(TestCompositeSet.class); - } - @Override public CompositeSet makeObject() { final HashSet contained = new HashSet(); diff --git a/src/test/org/apache/commons/collections/set/TestListOrderedSet.java b/src/test/org/apache/commons/collections/set/TestListOrderedSet.java index f09c12d98..6296785b6 100644 --- a/src/test/org/apache/commons/collections/set/TestListOrderedSet.java +++ b/src/test/org/apache/commons/collections/set/TestListOrderedSet.java @@ -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 extends AbstractTestSet { 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 makeObject() { return ListOrderedSet.decorate(new HashSet()); diff --git a/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java b/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java index f900a4013..d9dd4811b 100644 --- a/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java +++ b/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java @@ -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 extends AbstractTestSet { 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 makeObject() { return new ListOrderedSet(); diff --git a/src/test/org/apache/commons/collections/set/TestMapBackedSet.java b/src/test/org/apache/commons/collections/set/TestMapBackedSet.java index f008e83ec..cbf683c51 100644 --- a/src/test/org/apache/commons/collections/set/TestMapBackedSet.java +++ b/src/test/org/apache/commons/collections/set/TestMapBackedSet.java @@ -18,9 +18,6 @@ package org.apache.commons.collections.set; 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 extends AbstractTestSet { 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 makeObject() { return MapBackedSet.decorate(new HashedMap()); diff --git a/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java b/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java index 7805a8da7..c305ceb20 100644 --- a/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java +++ b/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.set; 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 extends AbstractTestSet { 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 makeObject() { return MapBackedSet.decorate(new LinkedMap()); diff --git a/src/test/org/apache/commons/collections/set/TestPredicatedSet.java b/src/test/org/apache/commons/collections/set/TestPredicatedSet.java index 6bf3f0b11..77d9eced7 100644 --- a/src/test/org/apache/commons/collections/set/TestPredicatedSet.java +++ b/src/test/org/apache/commons/collections/set/TestPredicatedSet.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.set; 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 extends AbstractTestSet { 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 truePredicate = TruePredicate.truePredicate(); diff --git a/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java b/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java index 74782c95b..042eb3c62 100644 --- a/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java +++ b/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java @@ -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 extends AbstractTestSortedSet { return BulkTest.makeSuite(TestPredicatedSortedSet.class); } - public static void main(String args[]) { - String[] testCaseName = { TestPredicatedSortedMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //------------------------------------------------------------------- protected Predicate truePredicate = TruePredicate.truePredicate(); diff --git a/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java b/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java index ef74c7fa9..561e67b79 100644 --- a/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java +++ b/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java @@ -42,11 +42,6 @@ public class TestSynchronizedSet extends AbstractTestSet { return BulkTest.makeSuite(TestSynchronizedSet.class); } - public static void main(String args[]) { - String[] testCaseName = { TestSynchronizedSet.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //------------------------------------------------------------------- @Override public Set makeObject() { diff --git a/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java b/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java index b4407990d..111142fe2 100644 --- a/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java +++ b/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java @@ -42,11 +42,6 @@ public class TestSynchronizedSortedSet extends AbstractTestSortedSet { return BulkTest.makeSuite(TestSynchronizedSortedSet.class); } - public static void main(String args[]) { - String[] testCaseName = { TestSynchronizedSortedSet.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //------------------------------------------------------------------- @Override public SortedSet makeObject() { diff --git a/src/test/org/apache/commons/collections/set/TestTransformedSet.java b/src/test/org/apache/commons/collections/set/TestTransformedSet.java index a65606fe6..e35e52725 100644 --- a/src/test/org/apache/commons/collections/set/TestTransformedSet.java +++ b/src/test/org/apache/commons/collections/set/TestTransformedSet.java @@ -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 extends AbstractTestSet { 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 makeConfirmedCollection() { return new HashSet(); diff --git a/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java b/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java index 32e91d693..0b52dc489 100644 --- a/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java +++ b/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java @@ -46,11 +46,6 @@ public class TestTransformedSortedSet extends AbstractTestSortedSet { return BulkTest.makeSuite(TestTransformedSortedSet.class); } - public static void main(String args[]) { - String[] testCaseName = { TestTransformedSortedSet.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //----------------------------------------------------------------------- @Override @SuppressWarnings("unchecked") diff --git a/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java b/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java index 1a814909b..67afdd702 100644 --- a/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java +++ b/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java @@ -43,11 +43,6 @@ public class TestUnmodifiableSet extends AbstractTestSet { return BulkTest.makeSuite(TestUnmodifiableSet.class); } - public static void main(String args[]) { - String[] testCaseName = { TestUnmodifiableSet.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //------------------------------------------------------------------- @Override public Set makeObject() { diff --git a/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java b/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java index 8b72e3c8c..4d6a417b1 100644 --- a/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java +++ b/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java @@ -48,11 +48,6 @@ public class TestUnmodifiableSortedSet extends AbstractTestSortedSet { return BulkTest.makeSuite(TestUnmodifiableSortedSet.class); } - public static void main(String args[]) { - String[] testCaseName = { TestUnmodifiableSortedSet.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //------------------------------------------------------------------- @Override public SortedSet makeObject() { diff --git a/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java b/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java index c09cb5fd0..0a6e59b67 100644 --- a/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java +++ b/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java @@ -19,9 +19,6 @@ package org.apache.commons.collections.splitmap; 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 BulkTest { } } - 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() { diff --git a/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java b/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java index 64e1880ea..26b3d8911 100644 --- a/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java +++ b/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java @@ -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 BulkTest { 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> map = TransformedMap.decorate(