--- jsr166/src/test/tck/JSR166TestCase.java	2010/09/20 20:42:37	1.55
+++ jsr166/src/test/tck/JSR166TestCase.java	2010/10/03 23:59:05	1.56
@@ -105,9 +105,8 @@ public class JSR166TestCase extends Test
             Policy.setPolicy(permissivePolicy());
             System.setSecurityManager(new SecurityManager());
         }
-        int iters = 1;
-        if (args.length > 0)
-            iters = Integer.parseInt(args[0]);
+        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
+
         Test s = suite();
         for (int i = 0; i < iters; ++i) {
             junit.textui.TestRunner.run(s);
@@ -123,70 +122,70 @@ public class JSR166TestCase extends Test
     public static Test suite() {
         TestSuite suite = new TestSuite("JSR166 Unit Tests");
 
-        suite.addTest(new TestSuite(ForkJoinPoolTest.class));
-        suite.addTest(new TestSuite(ForkJoinTaskTest.class));
-        suite.addTest(new TestSuite(RecursiveActionTest.class));
-        suite.addTest(new TestSuite(RecursiveTaskTest.class));
-        suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
-        suite.addTest(new TestSuite(PhaserTest.class));
-        suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
-        suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
-        suite.addTest(new TestSuite(AbstractQueueTest.class));
-        suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
-        suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
-        suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
-        suite.addTest(new TestSuite(ArrayDequeTest.class));
-        suite.addTest(new TestSuite(AtomicBooleanTest.class));
-        suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
-        suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
-        suite.addTest(new TestSuite(AtomicIntegerTest.class));
-        suite.addTest(new TestSuite(AtomicLongArrayTest.class));
-        suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
-        suite.addTest(new TestSuite(AtomicLongTest.class));
-        suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
-        suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
-        suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
-        suite.addTest(new TestSuite(AtomicReferenceTest.class));
-        suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
-        suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
-        suite.addTest(new TestSuite(ConcurrentLinkedDequeTest.class));
-        suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
-        suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
-        suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
-        suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
-        suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
-        suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
-        suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
-        suite.addTest(new TestSuite(CountDownLatchTest.class));
-        suite.addTest(new TestSuite(CyclicBarrierTest.class));
-        suite.addTest(new TestSuite(DelayQueueTest.class));
-        suite.addTest(new TestSuite(EntryTest.class));
-        suite.addTest(new TestSuite(ExchangerTest.class));
-        suite.addTest(new TestSuite(ExecutorsTest.class));
-        suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
-        suite.addTest(new TestSuite(FutureTaskTest.class));
-        suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
-        suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
-        suite.addTest(new TestSuite(LinkedListTest.class));
-        suite.addTest(new TestSuite(LockSupportTest.class));
-        suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
-        suite.addTest(new TestSuite(PriorityQueueTest.class));
-        suite.addTest(new TestSuite(ReentrantLockTest.class));
-        suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
-        suite.addTest(new TestSuite(ScheduledExecutorTest.class));
-        suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
-        suite.addTest(new TestSuite(SemaphoreTest.class));
-        suite.addTest(new TestSuite(SynchronousQueueTest.class));
-        suite.addTest(new TestSuite(SystemTest.class));
-        suite.addTest(new TestSuite(ThreadLocalTest.class));
-        suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
-        suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
-        suite.addTest(new TestSuite(ThreadTest.class));
-        suite.addTest(new TestSuite(TimeUnitTest.class));
-        suite.addTest(new TestSuite(TreeMapTest.class));
-        suite.addTest(new TestSuite(TreeSetTest.class));
-        suite.addTest(new TestSuite(TreeSubMapTest.class));
-        suite.addTest(new TestSuite(TreeSubSetTest.class));
+        suite.addTest(ForkJoinPoolTest.suite());
+        suite.addTest(ForkJoinTaskTest.suite());
+        suite.addTest(RecursiveActionTest.suite());
+        suite.addTest(RecursiveTaskTest.suite());
+        suite.addTest(LinkedTransferQueueTest.suite());
+        suite.addTest(PhaserTest.suite());
+        suite.addTest(ThreadLocalRandomTest.suite());
+        suite.addTest(AbstractExecutorServiceTest.suite());
+        suite.addTest(AbstractQueueTest.suite());
+        suite.addTest(AbstractQueuedSynchronizerTest.suite());
+        suite.addTest(AbstractQueuedLongSynchronizerTest.suite());
+        suite.addTest(ArrayBlockingQueueTest.suite());
+        suite.addTest(ArrayDequeTest.suite());
+        suite.addTest(AtomicBooleanTest.suite());
+        suite.addTest(AtomicIntegerArrayTest.suite());
+        suite.addTest(AtomicIntegerFieldUpdaterTest.suite());
+        suite.addTest(AtomicIntegerTest.suite());
+        suite.addTest(AtomicLongArrayTest.suite());
+        suite.addTest(AtomicLongFieldUpdaterTest.suite());
+        suite.addTest(AtomicLongTest.suite());
+        suite.addTest(AtomicMarkableReferenceTest.suite());
+        suite.addTest(AtomicReferenceArrayTest.suite());
+        suite.addTest(AtomicReferenceFieldUpdaterTest.suite());
+        suite.addTest(AtomicReferenceTest.suite());
+        suite.addTest(AtomicStampedReferenceTest.suite());
+        suite.addTest(ConcurrentHashMapTest.suite());
+        suite.addTest(ConcurrentLinkedDequeTest.suite());
+        suite.addTest(ConcurrentLinkedQueueTest.suite());
+        suite.addTest(ConcurrentSkipListMapTest.suite());
+        suite.addTest(ConcurrentSkipListSubMapTest.suite());
+        suite.addTest(ConcurrentSkipListSetTest.suite());
+        suite.addTest(ConcurrentSkipListSubSetTest.suite());
+        suite.addTest(CopyOnWriteArrayListTest.suite());
+        suite.addTest(CopyOnWriteArraySetTest.suite());
+        suite.addTest(CountDownLatchTest.suite());
+        suite.addTest(CyclicBarrierTest.suite());
+        suite.addTest(DelayQueueTest.suite());
+        suite.addTest(EntryTest.suite());
+        suite.addTest(ExchangerTest.suite());
+        suite.addTest(ExecutorsTest.suite());
+        suite.addTest(ExecutorCompletionServiceTest.suite());
+        suite.addTest(FutureTaskTest.suite());
+        suite.addTest(LinkedBlockingDequeTest.suite());
+        suite.addTest(LinkedBlockingQueueTest.suite());
+        suite.addTest(LinkedListTest.suite());
+        suite.addTest(LockSupportTest.suite());
+        suite.addTest(PriorityBlockingQueueTest.suite());
+        suite.addTest(PriorityQueueTest.suite());
+        suite.addTest(ReentrantLockTest.suite());
+        suite.addTest(ReentrantReadWriteLockTest.suite());
+        suite.addTest(ScheduledExecutorTest.suite());
+        suite.addTest(ScheduledExecutorSubclassTest.suite());
+        suite.addTest(SemaphoreTest.suite());
+        suite.addTest(SynchronousQueueTest.suite());
+        suite.addTest(SystemTest.suite());
+        suite.addTest(ThreadLocalTest.suite());
+        suite.addTest(ThreadPoolExecutorTest.suite());
+        suite.addTest(ThreadPoolExecutorSubclassTest.suite());
+        suite.addTest(ThreadTest.suite());
+        suite.addTest(TimeUnitTest.suite());
+        suite.addTest(TreeMapTest.suite());
+        suite.addTest(TreeSetTest.suite());
+        suite.addTest(TreeSubMapTest.suite());
+        suite.addTest(TreeSubSetTest.suite());
 
         return suite;
     }