--- jsr166/src/test/tck/RecursiveActionTest.java	2009/08/05 01:17:30	1.7
+++ jsr166/src/test/tck/RecursiveActionTest.java	2010/09/01 06:41:55	1.12
@@ -11,18 +11,17 @@ import java.util.*;
 public class RecursiveActionTest extends JSR166TestCase {
 
     public static void main(String[] args) {
-	junit.textui.TestRunner.run (suite());
+        junit.textui.TestRunner.run(suite());
     }
     public static Test suite() {
-	return new TestSuite(RecursiveActionTest.class);
+        return new TestSuite(RecursiveActionTest.class);
     }
 
     static final ForkJoinPool mainPool = new ForkJoinPool();
     static final ForkJoinPool singletonPool = new ForkJoinPool(1);
-    static final ForkJoinPool asyncSingletonPool = new ForkJoinPool(1);
-    static {
-        asyncSingletonPool.setAsyncMode(true);
-    }
+    static final ForkJoinPool asyncSingletonPool =
+        new ForkJoinPool(1, ForkJoinPool.defaultForkJoinWorkerThreadFactory,
+                         null, true);
 
     static final class FJException extends RuntimeException {
         FJException() { super(); }
@@ -162,32 +161,16 @@ public class RecursiveActionTest extends
      */
     public void testForkTimedGetNPE() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        FibAction f = new FibAction(8);
-                        f.fork();
-                        f.get(5L, null);
-                        shouldThrow();
-                    } catch (NullPointerException success) {
-                    } catch (Exception ex) {
-                        unexpectedException(ex);
-                    }
-                }
-            };
-        mainPool.invoke(a);
-    }
-
-    /**
-     * helpJoin of a forked task returns when task completes
-     */
-    public void testForkHelpJoin() {
-        RecursiveAction a = new RecursiveAction() {
             public void compute() {
-                FibAction f = new FibAction(8);
-                f.fork();
-                f.helpJoin();
-                threadAssertTrue(f.result == 21);
-                threadAssertTrue(f.isDone());
+                try {
+                    FibAction f = new FibAction(8);
+                    f.fork();
+                    f.get(5L, null);
+                    shouldThrow();
+                } catch (NullPointerException success) {
+                } catch (Exception ex) {
+                    unexpectedException(ex);
+                }
             }};
         mainPool.invoke(a);
     }
@@ -209,22 +192,6 @@ public class RecursiveActionTest extends
 
 
     /**
-     * quietlyHelpJoin of a forked task returns when task completes
-     */
-    public void testForkQuietlyHelpJoin() {
-        RecursiveAction a = new RecursiveAction() {
-            public void compute() {
-                FibAction f = new FibAction(8);
-                f.fork();
-                f.quietlyHelpJoin();
-                threadAssertTrue(f.result == 21);
-                threadAssertTrue(f.isDone());
-            }};
-        mainPool.invoke(a);
-    }
-
-
-    /**
      * helpQuiesce returns when tasks are complete.
      * getQueuedTaskCount returns 0 when quiescent
      */
@@ -327,43 +294,6 @@ public class RecursiveActionTest extends
     }
 
     /**
-     * join of a forked task throws exception when task completes abnormally
-     */
-    public void testAbnormalForkHelpJoin() {
-        RecursiveAction a = new RecursiveAction() {
-            public void compute() {
-                try {
-                    FailingFibAction f = new FailingFibAction(8);
-                    f.fork();
-                    f.helpJoin();
-                    shouldThrow();
-                } catch (FJException success) {
-                }
-            }};
-        mainPool.invoke(a);
-    }
-
-    /**
-     * quietlyHelpJoin of a forked task returns when task completes abnormally.
-     * getException of failed task returns its exception.
-     * isCompletedAbnormally of a failed task returns true.
-     * isCancelled of a failed uncancelled task returns false
-     */
-    public void testAbnormalForkQuietlyHelpJoin() {
-        RecursiveAction a = new RecursiveAction() {
-            public void compute() {
-                FailingFibAction f = new FailingFibAction(8);
-                f.fork();
-                f.quietlyHelpJoin();
-                threadAssertTrue(f.isDone());
-                threadAssertTrue(f.isCompletedAbnormally());
-                threadAssertFalse(f.isCancelled());
-                threadAssertTrue(f.getException() instanceof FJException);
-            }};
-        mainPool.invoke(a);
-    }
-
-    /**
      * quietlyJoin of a forked task returns when task completes abnormally
      */
     public void testAbnormalForkQuietlyJoin() {
@@ -453,45 +383,6 @@ public class RecursiveActionTest extends
             }};
         mainPool.invoke(a);
     }
-
-    /**
-     * join of a forked task throws exception when task cancelled
-     */
-    public void testCancelledForkHelpJoin() {
-        RecursiveAction a = new RecursiveAction() {
-            public void compute() {
-                try {
-                    FibAction f = new FibAction(8);
-                    f.cancel(true);
-                    f.fork();
-                    f.helpJoin();
-                    shouldThrow();
-                } catch (CancellationException success) {
-                }
-            }};
-        mainPool.invoke(a);
-    }
-
-    /**
-     * quietlyHelpJoin of a forked task returns when task cancelled.
-     * getException of cancelled task returns its exception.
-     * isCompletedAbnormally of a cancelled task returns true.
-     * isCancelled of a cancelled task returns true
-     */
-    public void testCancelledForkQuietlyHelpJoin() {
-        RecursiveAction a = new RecursiveAction() {
-            public void compute() {
-                FibAction f = new FibAction(8);
-                f.cancel(true);
-                f.fork();
-                f.quietlyHelpJoin();
-                threadAssertTrue(f.isDone());
-                threadAssertTrue(f.isCompletedAbnormally());
-                threadAssertTrue(f.isCancelled());
-                threadAssertTrue(f.getException() instanceof CancellationException);
-            }};
-        mainPool.invoke(a);
-    }
 
     /**
      * quietlyJoin of a forked task returns when task cancelled