Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 96771 invoked from network); 18 Oct 2010 11:37:36 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 18 Oct 2010 11:37:36 -0000 Received: (qmail 69759 invoked by uid 500); 18 Oct 2010 11:37:36 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 69603 invoked by uid 500); 18 Oct 2010 11:37:34 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 69595 invoked by uid 99); 18 Oct 2010 11:37:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Oct 2010 11:37:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Oct 2010 11:37:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 355962388A39; Mon, 18 Oct 2010 11:36:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1023744 [2/2] - in /commons/proper/collections/trunk/src/test/org/apache/commons/collections: ./ bag/ bidimap/ buffer/ collection/ comparators/ functors/ iterators/ keyvalue/ list/ map/ set/ splitmap/ Date: Mon, 18 Oct 2010 11:36:24 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101018113626.355962388A39@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java Mon Oct 18 11:36:20 2010 @@ -19,9 +19,6 @@ package org.apache.commons.collections.i import java.util.ListIterator; import java.util.NoSuchElementException; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.ResettableListIterator; /** @@ -35,10 +32,6 @@ public class TestSingletonListIterator protected List list1 = null; - public static Test suite() { - return new TestSuite(TestUniqueFilterIterator.class); - } - public TestUniqueFilterIterator(String testName) { super(testName); } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java Mon Oct 18 11:36:20 2010 @@ -22,9 +22,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.Unmodifiable; /** @@ -39,10 +36,6 @@ public class TestUnmodifiableIterator protected String[] testArray = { "One", "Two", "Three" }; protected List testList; - public static Test suite() { - return new TestSuite(TestUnmodifiableIterator.class); - } - public TestUnmodifiableIterator(String testName) { super(testName); } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java Mon Oct 18 11:36:20 2010 @@ -22,9 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.ListIterator; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.Unmodifiable; /** @@ -39,10 +36,6 @@ public class TestUnmodifiableListIterato protected String[] testArray = { "One", "Two", "Three" }; protected List testList; - public static Test suite() { - return new TestSuite(TestUnmodifiableListIterator.class); - } - public TestUnmodifiableListIterator(String testName) { super(testName); } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java Mon Oct 18 11:36:20 2010 @@ -19,9 +19,6 @@ package org.apache.commons.collections.i import java.util.HashMap; import java.util.Map; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.IterableMap; import org.apache.commons.collections.MapIterator; import org.apache.commons.collections.Unmodifiable; @@ -36,10 +33,6 @@ import org.apache.commons.collections.bi */ public class TestUnmodifiableMapIterator extends AbstractTestMapIterator { - public static Test suite() { - return new TestSuite(TestUnmodifiableMapIterator.class); - } - public TestUnmodifiableMapIterator(String testName) { super(testName); } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java Mon Oct 18 11:36:20 2010 @@ -20,9 +20,6 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.OrderedMap; import org.apache.commons.collections.OrderedMapIterator; import org.apache.commons.collections.Unmodifiable; @@ -37,10 +34,6 @@ import org.apache.commons.collections.ma */ public class TestUnmodifiableOrderedMapIterator extends AbstractTestOrderedMapIterator { - public static Test suite() { - return new TestSuite(TestUnmodifiableOrderedMapIterator.class); - } - public TestUnmodifiableOrderedMapIterator(String testName) { super(testName); } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultKeyValue.java Mon Oct 18 11:36:20 2010 @@ -19,9 +19,7 @@ package org.apache.commons.collections.k import java.util.HashMap; import java.util.Map; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Test the DefaultKeyValue class. @@ -46,14 +44,6 @@ public class TestDefaultKeyValue e } - public static void main(String[] args) { - junit.textui.TestRunner.run(TestDefaultKeyValue.class); - } - - public static Test suite() { - return new TestSuite(TestDefaultKeyValue.class); - } - //----------------------------------------------------------------------- /** * Make an instance of DefaultKeyValue with the default (null) key and value. Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestDefaultMapEntry.java Mon Oct 18 11:36:20 2010 @@ -18,9 +18,6 @@ package org.apache.commons.collections.k import java.util.Map; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.KeyValue; /** @@ -37,14 +34,6 @@ public class TestDefaultMapEntry e super(testName); } - public static void main(String[] args) { - junit.textui.TestRunner.run(TestDefaultMapEntry.class); - } - - public static Test suite() { - return new TestSuite(TestDefaultMapEntry.class); - } - //----------------------------------------------------------------------- /** * Make an instance of Map.Entry with the default (null) key and value. Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java Mon Oct 18 11:36:20 2010 @@ -27,9 +27,7 @@ import java.util.HashMap; import java.util.Map; import junit.framework.Assert; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Unit tests for {@link org.apache.commons.collections.keyvalue.MultiKey}. @@ -50,15 +48,6 @@ public class TestMultiKey extends TestCa super(name); } - public static Test suite() { - return new TestSuite(TestMultiKey.class); - } - - public static void main(String[] args) { - String[] testCaseName = { TestMultiKey.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - @Override public void setUp() throws Exception { super.setUp(); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestTiedMapEntry.java Mon Oct 18 11:36:20 2010 @@ -19,9 +19,6 @@ package org.apache.commons.collections.k import java.util.HashMap; import java.util.Map; -import junit.framework.Test; -import junit.framework.TestSuite; - /** * Test the TiedMapEntry class. * @@ -36,14 +33,6 @@ public class TestTiedMapEntry exte super(testName); } - public static void main(String[] args) { - junit.textui.TestRunner.run(TestTiedMapEntry.class); - } - - public static Test suite() { - return new TestSuite(TestTiedMapEntry.class); - } - //----------------------------------------------------------------------- /** * Gets the instance to test Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestUnmodifiableMapEntry.java Mon Oct 18 11:36:20 2010 @@ -18,9 +18,6 @@ package org.apache.commons.collections.k import java.util.Map; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.KeyValue; import org.apache.commons.collections.Unmodifiable; @@ -38,14 +35,6 @@ public class TestUnmodifiableMapEntry 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 Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java Mon Oct 18 11:36:20 2010 @@ -20,9 +20,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - /** * Extension of {@link AbstractTestList} for exercising the {@link FixedSizeList} * implementation. @@ -38,15 +35,6 @@ public class TestFixedSizeList extend super(testName); } - public static Test suite() { - return new TestSuite(TestFixedSizeList.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestFixedSizeList.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public List makeObject() { return FixedSizeList.decorate(new ArrayList()); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java Mon Oct 18 11:36:20 2010 @@ -21,9 +21,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - /** * Extension of {@link AbstractTestList} for exercising the {@link GrowthList}. * @@ -38,15 +35,6 @@ public class TestGrowthList extends A super(testName); } - public static Test suite() { - return new TestSuite(TestGrowthList.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestGrowthList.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public List makeObject() { return new GrowthList(); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestNodeCachingLinkedList.java Mon Oct 18 11:36:20 2010 @@ -37,12 +37,6 @@ public class TestNodeCachingLinkedList exten super(testName); } - public static Test suite() { - return new TestSuite(TestPredicatedList.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestPredicatedList.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //------------------------------------------------------------------- protected Predicate truePredicate = TruePredicate.truePredicate(); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSetUniqueList.java Mon Oct 18 11:36:20 2010 @@ -25,10 +25,6 @@ import java.util.List; import java.util.ListIterator; import java.util.Set; -import junit.framework.Test; -import junit.framework.TestSuite; -import junit.textui.TestRunner; - /** * JUnit tests. * @@ -40,14 +36,6 @@ import junit.textui.TestRunner; */ public class TestSetUniqueList 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); } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSynchronizedList.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSynchronizedList.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSynchronizedList.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSynchronizedList.java Mon Oct 18 11:36:20 2010 @@ -19,9 +19,6 @@ package org.apache.commons.collections.l import java.util.ArrayList; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - /** * Extension of {@link AbstractTestList} for exercising the {@link SynchronizedList} * implementation. @@ -37,15 +34,6 @@ public class TestSynchronizedList ext super(testName); } - public static Test suite() { - return new TestSuite(TestSynchronizedList.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestSynchronizedList.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public List makeConfirmedCollection() { return new ArrayList(); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTransformedList.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTransformedList.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTransformedList.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTransformedList.java Mon Oct 18 11:36:20 2010 @@ -21,9 +21,6 @@ import java.util.Arrays; import java.util.List; import java.util.ListIterator; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.Transformer; import org.apache.commons.collections.collection.TestTransformedCollection; @@ -42,15 +39,6 @@ public class TestTransformedList exte super(testName); } - public static Test suite() { - return new TestSuite(TestTransformedList.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestTransformedList.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public List makeConfirmedCollection() { return new ArrayList(); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestUnmodifiableList.java Mon Oct 18 11:36:20 2010 @@ -21,9 +21,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - /** * Extension of {@link AbstractTestList} for exercising the * {@link UnmodifiableList} implementation. @@ -39,15 +36,6 @@ public class TestUnmodifiableList ext super(testName); } - public static Test suite() { - return new TestSuite(TestUnmodifiableList.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestUnmodifiableList.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //----------------------------------------------------------------------- @Override public UnmodifiableList makeObject() { Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestCaseInsensitiveMap.java Mon Oct 18 11:36:20 2010 @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Set; import junit.framework.Test; -import junit.textui.TestRunner; - import org.apache.commons.collections.BulkTest; /** @@ -39,10 +37,6 @@ public class TestCaseInsensitiveMap exte super(testName); } - public static Test suite() { - return new TestSuite(TestCompositeMap.class); - } - @Override public void setUp() throws Exception { super.setUp(); this.pass = false; } - public static void main(String args[]) { - String[] testCaseName = {TestCompositeMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public CompositeMap makeObject() { CompositeMap map = new CompositeMap(); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java Mon Oct 18 11:36:20 2010 @@ -19,9 +19,6 @@ package org.apache.commons.collections.m import java.util.HashMap; import java.util.Map; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.Factory; import org.apache.commons.collections.FactoryUtils; import org.apache.commons.collections.IterableMap; @@ -45,15 +42,6 @@ public class TestDefaultedMap exte super(testName); } - public static Test suite() { - return new TestSuite(TestDefaultedMap.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestDefaultedMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //----------------------------------------------------------------------- @Override public IterableMap makeObject() { Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java Mon Oct 18 11:36:20 2010 @@ -21,9 +21,6 @@ import java.util.Map; import org.apache.commons.collections.IterableMap; -import junit.framework.Test; -import junit.framework.TestSuite; - /** * Extension of {@link AbstractTestMap} for exercising the {@link FixedSizeMap} * implementation. @@ -39,15 +36,6 @@ public class TestFixedSizeMap exte super(testName); } - public static Test suite() { - return new TestSuite(TestFixedSizeMap.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestFixedSizeMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public IterableMap makeObject() { return FixedSizeMap.decorate(new HashMap()); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java Mon Oct 18 11:36:20 2010 @@ -42,11 +42,6 @@ public class TestFixedSizeSortedMap makeObject() { Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFlat3Map.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFlat3Map.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFlat3Map.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFlat3Map.java Mon Oct 18 11:36:20 2010 @@ -24,8 +24,6 @@ import java.util.Iterator; import java.util.Map; import junit.framework.Test; -import junit.textui.TestRunner; - import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.IterableMap; import org.apache.commons.collections.MapIterator; @@ -51,10 +49,6 @@ public class TestFlat3Map extends super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestFlat3Map.class); } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestHashedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestHashedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestHashedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestHashedMap.java Mon Oct 18 11:36:20 2010 @@ -17,8 +17,6 @@ package org.apache.commons.collections.map; import junit.framework.Test; -import junit.textui.TestRunner; - import org.apache.commons.collections.BulkTest; /** @@ -34,10 +32,6 @@ public class TestHashedMap extends super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestHashedMap.class); } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestIdentityMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestIdentityMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestIdentityMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestIdentityMap.java Mon Oct 18 11:36:20 2010 @@ -23,8 +23,6 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestSuite; -import junit.textui.TestRunner; - import org.apache.commons.collections.AbstractTestObject; import org.apache.commons.collections.IterableMap; @@ -46,10 +44,6 @@ public class TestIdentityMap exten super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return new TestSuite(TestIdentityMap.class); // return BulkTest.makeSuite(TestIdentityMap.class); // causes race condition! Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLRUMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLRUMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLRUMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLRUMap.java Mon Oct 18 11:36:20 2010 @@ -23,8 +23,6 @@ import java.util.List; import java.util.Map; import junit.framework.Test; -import junit.textui.TestRunner; - import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.MapIterator; import org.apache.commons.collections.OrderedMap; @@ -43,10 +41,6 @@ public class TestLRUMap extends Ab super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestLRUMap.class); } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java Mon Oct 18 11:36:20 2010 @@ -43,11 +43,6 @@ public class TestLazyMap extends A 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()); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java Mon Oct 18 11:36:20 2010 @@ -46,11 +46,6 @@ public class TestLazySortedMap ext 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()); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLinkedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLinkedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLinkedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLinkedMap.java Mon Oct 18 11:36:20 2010 @@ -22,8 +22,6 @@ import java.util.List; import java.util.Map; import junit.framework.Test; -import junit.textui.TestRunner; - import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.MapIterator; import org.apache.commons.collections.OrderedMap; @@ -43,10 +41,6 @@ public class TestLinkedMap extends super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestLinkedMap.class); } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java Mon Oct 18 11:36:20 2010 @@ -47,11 +47,6 @@ public class TestListOrderedMap ex return BulkTest.makeSuite(TestListOrderedMap.class); } - public static void main(String args[]) { - String[] testCaseName = { TestListOrderedMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public ListOrderedMap makeObject() { return (ListOrderedMap) ListOrderedMap.decorate(new HashMap()); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java Mon Oct 18 11:36:20 2010 @@ -44,11 +44,6 @@ public class TestListOrderedMap2 e return BulkTest.makeSuite(TestListOrderedMap2.class); } - public static void main(String args[]) { - String[] testCaseName = { TestListOrderedMap2.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public ListOrderedMap makeObject() { return new ListOrderedMap(); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java Mon Oct 18 11:36:20 2010 @@ -19,8 +19,6 @@ package org.apache.commons.collections.m import java.util.Map; import junit.framework.Test; -import junit.textui.TestRunner; - import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.MapIterator; import org.apache.commons.collections.keyvalue.MultiKey; @@ -47,10 +45,6 @@ public class TestMultiKeyMap exten super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestMultiKeyMap.class); } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java Mon Oct 18 11:36:20 2010 @@ -25,9 +25,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.Map; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.IteratorUtils; import org.apache.commons.collections.MultiMap; @@ -46,15 +43,6 @@ public class TestMultiValueMap ext super(testName); } - public static Test suite() { - return new TestSuite(TestMultiValueMap.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestMultiValueMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - public void testNoMappingReturnsNull() { final MultiValueMap map = createTestMap(); assertNull(map.get("whatever")); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java Mon Oct 18 11:36:20 2010 @@ -20,9 +20,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.IterableMap; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.functors.TruePredicate; @@ -50,15 +47,6 @@ public class TestPredicatedMap ext super(testName); } - public static Test suite() { - return new TestSuite(TestPredicatedMap.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestPredicatedMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //----------------------------------------------------------------------- protected IterableMap decorateMap(Map map, Predicate keyPredicate, Predicate valuePredicate) { Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java Mon Oct 18 11:36:20 2010 @@ -23,9 +23,6 @@ import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.Predicate; import org.apache.commons.collections.functors.TruePredicate; @@ -52,15 +49,6 @@ public class TestPredicatedSortedMap decorateMap(SortedMap map, Predicate keyPredicate, Predicate valuePredicate) { Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestReferenceIdentityMap.java Mon Oct 18 11:36:20 2010 @@ -50,11 +50,6 @@ public class TestReferenceIdentityMap makeObject() { return new ReferenceIdentityMap(ReferenceStrength.WEAK, ReferenceStrength.WEAK); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestReferenceMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestReferenceMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestReferenceMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestReferenceMap.java Mon Oct 18 11:36:20 2010 @@ -42,11 +42,6 @@ public class TestReferenceMap exte return BulkTest.makeSuite(TestReferenceMap.class); } - public static void main(String args[]) { - String[] testCaseName = { TestReferenceMap.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - @Override public ReferenceMap makeObject() { return new ReferenceMap(ReferenceStrength.WEAK, ReferenceStrength.WEAK); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestSingletonMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestSingletonMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestSingletonMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestSingletonMap.java Mon Oct 18 11:36:20 2010 @@ -19,8 +19,6 @@ package org.apache.commons.collections.m import java.util.HashMap; import junit.framework.Test; -import junit.textui.TestRunner; - import org.apache.commons.collections.BoundedMap; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.KeyValue; @@ -43,10 +41,6 @@ public class TestSingletonMap exte super(testName); } - public static void main(String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(TestSingletonMap.class); } Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestStaticBucketMap.java Mon Oct 18 11:36:20 2010 @@ -38,11 +38,6 @@ public class TestStaticBucketMap e return BulkTest.makeSuite(TestStaticBucketMap.class); } - public static void main(String[] args) { - String[] testCaseName = { TestStaticBucketMap.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - @Override public StaticBucketMap makeObject() { return new StaticBucketMap(30); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java Mon Oct 18 11:36:20 2010 @@ -20,9 +20,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.IterableMap; import org.apache.commons.collections.Transformer; import org.apache.commons.collections.TransformerUtils; @@ -43,15 +40,6 @@ public class TestTransformedMap ex super(testName); } - public static Test suite() { - return new TestSuite(TestTransformedMap.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestTransformedMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //----------------------------------------------------------------------- @Override public IterableMap makeObject() { Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java Mon Oct 18 11:36:20 2010 @@ -47,11 +47,6 @@ public class TestTransformedSortedMap e super(testName); } - public static Test suite() { - return new TestSuite(TestUnmodifiableMap.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestUnmodifiableMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //------------------------------------------------------------------- @Override Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java Mon Oct 18 11:36:20 2010 @@ -18,9 +18,6 @@ package org.apache.commons.collections.m import java.util.HashMap; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.OrderedMap; import org.apache.commons.collections.Unmodifiable; @@ -39,15 +36,6 @@ public class TestUnmodifiableOrderedMap< super(testName); } - public static Test suite() { - return new TestSuite(TestUnmodifiableOrderedMap.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestUnmodifiableOrderedMap.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //------------------------------------------------------------------- @Override Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java Mon Oct 18 11:36:20 2010 @@ -19,9 +19,6 @@ package org.apache.commons.collections.m import java.util.SortedMap; import java.util.TreeMap; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.Unmodifiable; /** @@ -39,15 +36,6 @@ public class TestUnmodifiableSortedMap extends super(name); } - public static Test suite() { - return new TestSuite(TestCompositeSet.class); - } - @Override public CompositeSet makeObject() { final HashSet contained = new HashSet(); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet.java Mon Oct 18 11:36:20 2010 @@ -22,9 +22,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import junit.framework.Test; -import junit.framework.TestSuite; - /** * Extension of {@link AbstractTestSet} for exercising the {@link ListOrderedSet} * implementation. @@ -46,15 +43,6 @@ public class TestListOrderedSet exten super(testName); } - public static Test suite() { - return new TestSuite(TestListOrderedSet.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestListOrderedSet.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public ListOrderedSet makeObject() { return ListOrderedSet.decorate(new HashSet()); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java Mon Oct 18 11:36:20 2010 @@ -20,9 +20,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - /** * Extension of {@link AbstractTestSet} for exercising the {@link ListOrderedSet} * implementation. @@ -44,15 +41,6 @@ public class TestListOrderedSet2 exte super(testName); } - public static Test suite() { - return new TestSuite(TestListOrderedSet2.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestListOrderedSet2.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public ListOrderedSet makeObject() { return new ListOrderedSet(); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet.java Mon Oct 18 11:36:20 2010 @@ -18,9 +18,6 @@ package org.apache.commons.collections.s import java.util.Set; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.map.HashedMap; /** @@ -37,15 +34,6 @@ public class TestMapBackedSet extends super(testName); } - public static Test suite() { - return new TestSuite(TestMapBackedSet.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestMapBackedSet.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public Set makeObject() { return MapBackedSet.decorate(new HashedMap()); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java Mon Oct 18 11:36:20 2010 @@ -19,9 +19,6 @@ package org.apache.commons.collections.s import java.util.Iterator; import java.util.Set; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.map.LinkedMap; /** @@ -38,15 +35,6 @@ public class TestMapBackedSet2 extend super(testName); } - public static Test suite() { - return new TestSuite(TestMapBackedSet2.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestMapBackedSet2.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public Set makeObject() { return MapBackedSet.decorate(new LinkedMap()); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java Mon Oct 18 11:36:20 2010 @@ -19,9 +19,6 @@ package org.apache.commons.collections.s import java.util.HashSet; import java.util.Set; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.Predicate; import org.apache.commons.collections.functors.TruePredicate; @@ -40,15 +37,6 @@ public class TestPredicatedSet extend super(testName); } - public static Test suite() { - return new TestSuite(TestPredicatedSet.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestPredicatedSet.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //------------------------------------------------------------------- protected Predicate truePredicate = TruePredicate.truePredicate(); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java Mon Oct 18 11:36:20 2010 @@ -27,7 +27,6 @@ import junit.framework.Test; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.Predicate; import org.apache.commons.collections.functors.TruePredicate; -import org.apache.commons.collections.map.TestPredicatedSortedMap; /** * Extension of {@link AbstractTestSortedSet} for exercising the @@ -48,11 +47,6 @@ public class TestPredicatedSortedSet 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(); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java Mon Oct 18 11:36:20 2010 @@ -42,11 +42,6 @@ public class TestSynchronizedSet exte return BulkTest.makeSuite(TestSynchronizedSet.class); } - public static void main(String args[]) { - String[] testCaseName = { TestSynchronizedSet.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //------------------------------------------------------------------- @Override public Set makeObject() { Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java Mon Oct 18 11:36:20 2010 @@ -42,11 +42,6 @@ public class TestSynchronizedSortedSet makeObject() { Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSet.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSet.java Mon Oct 18 11:36:20 2010 @@ -20,9 +20,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.Transformer; import org.apache.commons.collections.collection.TestTransformedCollection; @@ -41,15 +38,6 @@ public class TestTransformedSet exten super(testName); } - public static Test suite() { - return new TestSuite(TestTransformedSet.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestTransformedSet.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - @Override public Set makeConfirmedCollection() { return new HashSet(); Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java Mon Oct 18 11:36:20 2010 @@ -46,11 +46,6 @@ public class TestTransformedSortedSet return BulkTest.makeSuite(TestTransformedSortedSet.class); } - public static void main(String args[]) { - String[] testCaseName = { TestTransformedSortedSet.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //----------------------------------------------------------------------- @Override @SuppressWarnings("unchecked") Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java Mon Oct 18 11:36:20 2010 @@ -43,11 +43,6 @@ public class TestUnmodifiableSet exte return BulkTest.makeSuite(TestUnmodifiableSet.class); } - public static void main(String args[]) { - String[] testCaseName = { TestUnmodifiableSet.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } - //------------------------------------------------------------------- @Override public Set makeObject() { Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java Mon Oct 18 11:36:20 2010 @@ -48,11 +48,6 @@ public class TestUnmodifiableSortedSet makeObject() { Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java Mon Oct 18 11:36:20 2010 @@ -19,9 +19,6 @@ package org.apache.commons.collections.s import java.util.HashMap; import java.util.Map; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.IterableMap; import org.apache.commons.collections.MapIterator; @@ -66,15 +63,6 @@ public class TestSplitMapUtils extends B } } - public static Test suite() { - return new TestSuite(TestSplitMapUtils.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestSplitMapUtils.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ----------------------------------------------------------------------- public void testReadableMap() { Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java?rev=1023744&r1=1023743&r2=1023744&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java Mon Oct 18 11:36:20 2010 @@ -23,9 +23,6 @@ import java.io.ObjectOutputStream; import java.math.BigInteger; import java.util.HashMap; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.MapIterator; import org.apache.commons.collections.Transformer; @@ -65,15 +62,6 @@ public class TestTransformedMap extends super(testName); } - public static Test suite() { - return new TestSuite(TestTransformedMap.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestTransformedMap.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ----------------------------------------------------------------------- public void testTransformedMap() { TransformedMap> map = TransformedMap.decorate(