svn commit: r815124 - /commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestAll.java

[ba...@apache.org]

Author: bayard
Date: Tue Sep 15 05:57:22 2009
New Revision: 815124

URL: http://svn.apache.org/viewvc?rev=815124&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:

    ------------------------------------------------------------------------
    r571381 | skestle | 2007-08-30 22:13:56 -0700 (Thu, 30 Aug 2007) | 1 line
    
    Generified LazyMap
    ------------------------------------------------------------------------

Modified:
    commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestAll.java

Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestAll.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestAll.java?rev=815124&r1=815123&r2=815124&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestAll.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestAll.java Tue Sep 15 05:57:22 2009
@@ -16,9 +16,11 @@
  */
 package org.apache.commons.collections.map;
 
-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 tests.
@@ -27,51 +29,38 @@
  * @version $Revision$ $Date$
  *
  * @author Stephen Colebourne
+ * @author Stephen Kestle
  */
-public class TestAll extends TestCase {
-    
-    public TestAll(String testName) {
-        super(testName);
-    }
-
-    public static void main(String args[]) {
-        String[] testCaseName = { TestAll.class.getName() };
-        junit.textui.TestRunner.main(testCaseName);
-    }
+@RunWith(Suite.class)
+@SuiteClasses({
+    TestCaseInsensitiveMap.class,
+    TestCompositeMap.class,
+    TestDefaultedMap.class,
+    TestFlat3Map.class,
+    TestHashedMap.class,
+    TestIdentityMap.class,
+    TestLinkedMap.class,
+    TestLRUMap.class,
+    TestMultiKeyMap.class,
+    TestReferenceMap.class,
+    TestReferenceIdentityMap.class,
+    TestStaticBucketMap.class,
+    TestSingletonMap.class,
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite();
-        
-        suite.addTest(TestCaseInsensitiveMap.suite());
-        suite.addTest(TestCompositeMap.suite());
-        suite.addTest(TestDefaultedMap.suite());
-        suite.addTest(TestFlat3Map.suite());
-        suite.addTest(TestHashedMap.suite());
-        suite.addTest(TestIdentityMap.suite());
-        suite.addTest(TestLinkedMap.suite());
-        suite.addTest(TestLRUMap.suite());
-        suite.addTest(TestMultiKeyMap.suite());
-        suite.addTest(TestReferenceMap.suite());
-        suite.addTest(TestReferenceIdentityMap.suite());
-        suite.addTest(TestStaticBucketMap.suite());
-        suite.addTest(TestSingletonMap.suite());
-        
-        suite.addTest(TestFixedSizeMap.suite());
-        suite.addTest(TestFixedSizeSortedMap.suite());
-        suite.addTest(TestLazyMap.suite());
-        suite.addTest(TestLazySortedMap.suite());
-        suite.addTest(TestListOrderedMap.suite());
-        suite.addTest(TestListOrderedMap2.suite());
-        suite.addTest(TestMultiValueMap.suite());
-        suite.addTest(TestPredicatedMap.suite());
-        suite.addTest(TestPredicatedSortedMap.suite());
-        suite.addTest(TestTransformedMap.suite());
-        suite.addTest(TestTransformedSortedMap.suite());
-        suite.addTest(TestUnmodifiableMap.suite());
-        suite.addTest(TestUnmodifiableOrderedMap.suite());
-        suite.addTest(TestUnmodifiableSortedMap.suite());
-        
-        return suite;
-    }
-
+    TestFixedSizeMap.class,
+    TestFixedSizeSortedMap.class,
+    TestLazyMap.class,
+    TestLazySortedMap.class,
+    TestListOrderedMap.class,
+    TestListOrderedMap2.class,
+    TestMultiValueMap.class,
+    TestPredicatedMap.class,
+    TestPredicatedSortedMap.class,
+    TestTransformedMap.class,
+    TestTransformedSortedMap.class,
+    TestUnmodifiableMap.class,
+    TestUnmodifiableOrderedMap.class,
+    TestUnmodifiableSortedMap.class
+})
+public class TestAll extends TestCase {
 }