--- jsr166/src/test/tck/RecursiveActionTest.java	2015/01/20 17:02:26	1.41
+++ jsr166/src/test/tck/RecursiveActionTest.java	2015/10/04 18:18:48	1.45
@@ -17,7 +17,6 @@ import java.util.concurrent.RecursiveAct
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeoutException;
-import java.util.concurrent.TimeUnit;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -25,7 +24,7 @@ import junit.framework.TestSuite;
 public class RecursiveActionTest extends JSR166TestCase {
 
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
 
     public static Test suite() {
@@ -47,14 +46,12 @@ public class RecursiveActionTest extends
     }
 
     private void testInvokeOnPool(ForkJoinPool pool, RecursiveAction a) {
-        try {
+        try (PoolCleaner cleaner = cleaner(pool)) {
             checkNotDone(a);
 
             assertNull(pool.invoke(a));
 
             checkCompletedNormally(a);
-        } finally {
-            joinPool(pool);
         }
     }
 
@@ -592,7 +589,7 @@ public class RecursiveActionTest extends
                 FailingFibAction f = new FailingFibAction(8);
                 assertSame(f, f.fork());
                 try {
-                    f.get(5L, TimeUnit.SECONDS);
+                    f.get(5L, SECONDS);
                     shouldThrow();
                 } catch (ExecutionException success) {
                     Throwable cause = success.getCause();