You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ba...@apache.org on 2009/09/15 07:57:55 UTC
svn commit: r815142 -
/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestAll.java
Author: bayard
Date: Tue Sep 15 05:57:55 2009
New Revision: 815142
URL: http://svn.apache.org/viewvc?rev=815142&view=rev
Log:
Merging from -r468106:814127 of collections_jdk5_branch - namely where this code was generified; mostly in r738956.
Also see the following revisions:
------------------------------------------------------------------------
r593347 | skestle | 2007-11-08 14:49:02 -0800 (Thu, 08 Nov 2007) | 3 lines
Added initial IndexedCollection - still needs quite a bit of work - see TODO comments
JIRA: COLLECTIONS-275
------------------------------------------------------------------------
r570382 | skestle | 2007-08-28 04:24:46 -0700 (Tue, 28 Aug 2007) | 1 line
Generified InstantiateFactory (missed commit file!)
------------------------------------------------------------------------
r471163 | scolebourne | 2006-11-04 02:56:39 -0800 (Sat, 04 Nov 2006) | 1 line
Remove FastArrayList, FastHashMap, FastTreeMap
------------------------------------------------------------------------
r468687 | scolebourne | 2006-10-28 05:53:28 -0700 (Sat, 28 Oct 2006) | 1 line
COLLECTIONS-229 - Remove deprecated classes and code
------------------------------------------------------------------------
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestAll.java
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestAll.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestAll.java?rev=815142&r1=815141&r2=815142&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestAll.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestAll.java Tue Sep 15 05:57:55 2009
@@ -16,9 +16,11 @@
*/
package org.apache.commons.collections;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
/**
* Entry point for all Collections package tests.
@@ -28,53 +30,21 @@
* @author Rodney Waldhoff
* @author Stephen Colebourne
*/
+@RunWith(Suite.class)
+@SuiteClasses({TestBagUtils.class,
+ TestClosureUtils.class,
+ TestCollectionUtils.class,
+ TestBufferUtils.class,
+ TestEnumerationUtils.class,
+ TestFactoryUtils.class,
+ TestIteratorUtils.class,
+ TestListUtils.class,
+ TestMapUtils.class,
+ TestPredicateUtils.class,
+ TestSetUtils.class,
+ TestTransformerUtils.class,
+ TestArrayStack.class,
+ TestExtendedProperties.class,
+ TestIndexedCollection.class})
public class TestAll extends TestCase {
- public TestAll(String testName) {
- super(testName);
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(TestBagUtils.suite());
- suite.addTest(TestClosureUtils.suite());
- suite.addTest(TestCollectionUtils.suite());
- suite.addTest(TestBufferUtils.suite());
- suite.addTest(TestEnumerationUtils.suite());
- suite.addTest(TestFactoryUtils.suite());
- suite.addTest(TestListUtils.suite());
- suite.addTest(TestMapUtils.suite());
- suite.addTest(TestPredicateUtils.suite());
- suite.addTest(TestSetUtils.suite());
- suite.addTest(TestTransformerUtils.suite());
-
- suite.addTest(TestArrayStack.suite());
- suite.addTest(TestBeanMap.suite());
- suite.addTest(TestBinaryHeap.suite());
- suite.addTest(TestBoundedFifoBuffer.suite());
- suite.addTest(TestBoundedFifoBuffer2.suite());
- suite.addTest(TestCursorableLinkedList.suite());
- suite.addTest(TestDoubleOrderedMap.suite());
- suite.addTest(TestExtendedProperties.suite());
- suite.addTest(TestFastArrayList.suite());
- suite.addTest(TestFastArrayList1.suite());
- suite.addTest(TestFastHashMap.suite());
- suite.addTest(TestFastHashMap1.suite());
- suite.addTest(TestFastTreeMap.suite());
- suite.addTest(TestFastTreeMap1.suite());
- suite.addTest(TestHashBag.suite());
- suite.addTest(TestIteratorUtils.suite());
- suite.addTest(TestLRUMap.suite());
- suite.addTest(TestMultiHashMap.suite());
- suite.addTest(TestReferenceMap.suite());
- suite.addTest(TestSequencedHashMap.suite());
- suite.addTest(TestStaticBucketMap.suite());
- suite.addTest(TestTreeBag.suite());
- suite.addTest(TestUnboundedFifoBuffer.suite());
- return suite;
- }
-
- public static void main(String args[]) {
- String[] testCaseName = { TestAll.class.getName() };
- junit.textui.TestRunner.main(testCaseName);
- }
}