--- jsr166/src/test/tck/RecursiveTaskTest.java	2011/02/22 01:18:59	1.26
+++ jsr166/src/test/tck/RecursiveTaskTest.java	2015/04/25 04:55:31	1.32
@@ -1,25 +1,26 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import junit.framework.*;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.util.HashSet;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
-import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.concurrent.RecursiveTask;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import java.util.HashSet;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class RecursiveTaskTest extends JSR166TestCase {
 
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(RecursiveTaskTest.class);
@@ -319,7 +320,6 @@ public class RecursiveTaskTest extends J
         assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
-
     /**
      * helpQuiesce returns when tasks are complete.
      * getQueuedTaskCount returns 0 when quiescent
@@ -329,7 +329,7 @@ public class RecursiveTaskTest extends J
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 assertSame(f, f.fork());
-                f.helpQuiesce();
+                helpQuiesce();
                 assertEquals(0, getQueuedTaskCount());
                 checkCompletedNormally(f, 21);
                 return NoResult;
@@ -337,7 +337,6 @@ public class RecursiveTaskTest extends J
         assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
-
     /**
      * invoke task throws exception when task completes abnormally
      */
@@ -763,7 +762,6 @@ public class RecursiveTaskTest extends J
         assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
-
     /**
      * invokeAll(tasks) with any null task throws NPE
      */