--- jsr166/src/test/tck/ForkJoinTaskTest.java	2009/08/04 09:35:31	1.4
+++ jsr166/src/test/tck/ForkJoinTaskTest.java	2010/10/24 17:52:23	1.21
@@ -3,21 +3,67 @@
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinTask;
+import java.util.concurrent.ForkJoinWorkerThread;
+import java.util.concurrent.RecursiveAction;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import java.util.HashSet;
 import junit.framework.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.*;
 
 public class ForkJoinTaskTest 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(ForkJoinTaskTest.class);
+        return new TestSuite(ForkJoinTaskTest.class);
     }
 
-    /**
+    // Runs with "mainPool" use > 1 thread. singletonPool tests use 1
+    static final int mainPoolSize =
+        Math.max(2, Runtime.getRuntime().availableProcessors());
+
+    private static ForkJoinPool mainPool() {
+        return new ForkJoinPool(mainPoolSize);
+    }
+
+    private static ForkJoinPool singletonPool() {
+        return new ForkJoinPool(1);
+    }
+
+    private static ForkJoinPool asyncSingletonPool() {
+        return new ForkJoinPool(1,
+                                ForkJoinPool.defaultForkJoinWorkerThreadFactory,
+                                null, true);
+    }
+
+    private void testInvokeOnPool(ForkJoinPool pool, RecursiveAction a) {
+        try {
+            assertFalse(a.isDone());
+            assertFalse(a.isCompletedNormally());
+            assertFalse(a.isCompletedAbnormally());
+            assertFalse(a.isCancelled());
+            assertNull(a.getException());
+
+            assertNull(pool.invoke(a));
+
+            assertTrue(a.isDone());
+            assertTrue(a.isCompletedNormally());
+            assertFalse(a.isCompletedAbnormally());
+            assertFalse(a.isCancelled());
+            assertNull(a.getException());
+        } finally {
+            joinPool(pool);
+        }
+    }
+
+    /*
      * Testing coverage notes:
      *
      * To test extension methods and overrides, most tests use
@@ -25,18 +71,11 @@ public class ForkJoinTaskTest extends JS
      * differently than supplied Recursive forms.
      */
 
-    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 class FJException extends RuntimeException {
         FJException() { super(); }
     }
 
-    static abstract class BinaryAsyncAction extends ForkJoinTask<Void> {
+    abstract static class BinaryAsyncAction extends ForkJoinTask<Void> {
         private volatile int controlState;
 
         static final AtomicIntegerFieldUpdater<BinaryAsyncAction> controlStateUpdater =
@@ -148,7 +187,7 @@ public class ForkJoinTaskTest extends JS
 
     }
 
-    static final class AsyncFib  extends BinaryAsyncAction {
+    static final class AsyncFib extends BinaryAsyncAction {
         int number;
         public AsyncFib(int n) {
             this.number = n;
@@ -177,7 +216,7 @@ public class ForkJoinTaskTest extends JS
     }
 
 
-    static final class FailingAsyncFib  extends BinaryAsyncAction {
+    static final class FailingAsyncFib extends BinaryAsyncAction {
         int number;
         public FailingAsyncFib(int n) {
             this.number = n;
@@ -209,21 +248,19 @@ public class ForkJoinTaskTest extends JS
      * invoke returns when task completes normally.
      * isCompletedAbnormally and isCancelled return false for normally
      * completed tasks. getRawResult of a RecursiveAction returns null;
-     *
      */
     public void testInvoke() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    f.invoke();
-                    threadAssertTrue(f.number == 21);
-                    threadAssertTrue(f.isDone());
-                    threadAssertFalse(f.isCancelled());
-                    threadAssertFalse(f.isCompletedAbnormally());
-                    threadAssertTrue(f.getRawResult() == null);
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertNull(f.invoke());
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+                assertFalse(f.isCancelled());
+                assertFalse(f.isCompletedAbnormally());
+                assertNull(f.getRawResult());
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
@@ -232,144 +269,94 @@ public class ForkJoinTaskTest extends JS
      * completed tasks
      */
     public void testQuietlyInvoke() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    f.quietlyInvoke();
-                    threadAssertTrue(f.number == 21);
-                    threadAssertTrue(f.isDone());
-                    threadAssertFalse(f.isCancelled());
-                    threadAssertFalse(f.isCompletedAbnormally());
-                    threadAssertTrue(f.getRawResult() == null);
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                f.quietlyInvoke();
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+                assertFalse(f.isCancelled());
+                assertFalse(f.isCompletedAbnormally());
+                assertNull(f.getRawResult());
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * join of a forked task returns when task completes
      */
     public void testForkJoin() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    f.join();
-                    threadAssertTrue(f.number == 21);
-                    threadAssertTrue(f.isDone());
-                    threadAssertTrue(f.getRawResult() == null);
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertNull(f.join());
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+                assertNull(f.getRawResult());
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * get of a forked task returns when task completes
      */
     public void testForkGet() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        AsyncFib f = new AsyncFib(8);
-                        f.fork();
-                        f.get();
-                        threadAssertTrue(f.number == 21);
-                        threadAssertTrue(f.isDone());
-                    } catch (Exception ex) {
-                        unexpectedException(ex);
-                    }
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertNull(f.get());
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * timed get of a forked task returns when task completes
      */
     public void testForkTimedGet() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        AsyncFib f = new AsyncFib(8);
-                        f.fork();
-                        f.get(5L, TimeUnit.SECONDS);
-                        threadAssertTrue(f.number == 21);
-                        threadAssertTrue(f.isDone());
-                    } catch (Exception ex) {
-                        unexpectedException(ex);
-                    }
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * timed get with null time unit throws NPE
      */
     public void testForkTimedGetNPE() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        AsyncFib f = new AsyncFib(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() {
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    f.helpJoin();
-                    threadAssertTrue(f.number == 21);
-                    threadAssertTrue(f.isDone());
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                try {
+                    f.get(5L, null);
+                    shouldThrow();
+                } catch (NullPointerException success) {}
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * quietlyJoin of a forked task returns when task completes
      */
     public void testForkQuietlyJoin() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    f.quietlyJoin();
-                    threadAssertTrue(f.number == 21);
-                    threadAssertTrue(f.isDone());
-                }
-            };
-        mainPool.invoke(a);
-    }
-
-
-    /**
-     * quietlyHelpJoin of a forked task returns when task completes
-     */
-    public void testForkQuietlyHelpJoin() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    f.quietlyHelpJoin();
-                    threadAssertTrue(f.number == 21);
-                    threadAssertTrue(f.isDone());
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                f.quietlyJoin();
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
 
@@ -378,17 +365,16 @@ public class ForkJoinTaskTest extends JS
      * getQueuedTaskCount returns 0 when quiescent
      */
     public void testForkHelpQuiesce() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    f.helpQuiesce();
-                    threadAssertTrue(f.number == 21);
-                    threadAssertTrue(f.isDone());
-                    threadAssertTrue(getQueuedTaskCount() == 0);
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                f.helpQuiesce();
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+                assertEquals(0, getQueuedTaskCount());
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
 
@@ -396,440 +382,356 @@ public class ForkJoinTaskTest extends JS
      * invoke task throws exception when task completes abnormally
      */
     public void testAbnormalInvoke() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        FailingAsyncFib f = new FailingAsyncFib(8);
-                        f.invoke();
-                        shouldThrow();
-                    } catch (FJException success) {
-                    }
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                try {
+                    f.invoke();
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * quietlyInvoke task returns when task completes abnormally
      */
     public void testAbnormalQuietlyInvoke() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    FailingAsyncFib f = new FailingAsyncFib(8);
-                    f.quietlyInvoke();
-                    threadAssertTrue(f.isDone());
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                f.quietlyInvoke();
+                assertTrue(f.isDone());
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * join of a forked task throws exception when task completes abnormally
      */
     public void testAbnormalForkJoin() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        FailingAsyncFib f = new FailingAsyncFib(8);
-                        f.fork();
-                        f.join();
-                        shouldThrow();
-                    } catch (FJException success) {
-                    }
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                assertSame(f, f.fork());
+                try {
+                    f.join();
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * get of a forked task throws exception when task completes abnormally
      */
     public void testAbnormalForkGet() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        FailingAsyncFib f = new FailingAsyncFib(8);
-                        f.fork();
-                        f.get();
-                        shouldThrow();
-                    } catch (ExecutionException success) {
-                    } catch (Exception ex) {
-                        unexpectedException(ex);
-                    }
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                assertSame(f, f.fork());
+                try {
+                    f.get();
+                    shouldThrow();
+                } catch (ExecutionException success) {
+                    Throwable cause = success.getCause();
+                    assertTrue(cause instanceof FJException);
+                    assertTrue(f.isDone());
+                    assertTrue(f.isCompletedAbnormally());
+                    assertSame(cause, f.getException());
                 }
-            };
-        mainPool.invoke(a);
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * timed get of a forked task throws exception when task completes abnormally
      */
     public void testAbnormalForkTimedGet() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        FailingAsyncFib f = new FailingAsyncFib(8);
-                        f.fork();
-                        f.get(5L, TimeUnit.SECONDS);
-                        shouldThrow();
-                    } catch (ExecutionException success) {
-                    } catch (Exception ex) {
-                        unexpectedException(ex);
-                    }
-                }
-            };
-        mainPool.invoke(a);
-    }
-
-    /**
-     * join of a forked task throws exception when task completes abnormally
-     */
-    public void testAbnormalForkHelpJoin() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        FailingAsyncFib f = new FailingAsyncFib(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() {
-                    FailingAsyncFib f = new FailingAsyncFib(8);
-                    f.fork();
-                    f.quietlyHelpJoin();
-                    threadAssertTrue(f.isDone());
-                    threadAssertTrue(f.isCompletedAbnormally());
-                    threadAssertFalse(f.isCancelled());
-                    threadAssertTrue(f.getException() instanceof FJException);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                assertSame(f, f.fork());
+                try {
+                    f.get(LONG_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (ExecutionException success) {
+                    Throwable cause = success.getCause();
+                    assertTrue(cause instanceof FJException);
+                    assertTrue(f.isDone());
+                    assertTrue(f.isCompletedAbnormally());
+                    assertSame(cause, f.getException());
                 }
-            };
-        mainPool.invoke(a);
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * quietlyJoin of a forked task returns when task completes abnormally
      */
     public void testAbnormalForkQuietlyJoin() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    FailingAsyncFib f = new FailingAsyncFib(8);
-                    f.fork();
-                    f.quietlyJoin();
-                    threadAssertTrue(f.isDone());
-                    threadAssertTrue(f.isCompletedAbnormally());
-                    threadAssertTrue(f.getException() instanceof FJException);
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                assertSame(f, f.fork());
+                f.quietlyJoin();
+                assertTrue(f.isDone());
+                assertTrue(f.isCompletedAbnormally());
+                assertTrue(f.getException() instanceof FJException);
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * invoke task throws exception when task cancelled
      */
     public void testCancelledInvoke() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        AsyncFib f = new AsyncFib(8);
-                        f.cancel(true);
-                        f.invoke();
-                        shouldThrow();
-                    } catch (CancellationException success) {
-                    }
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertTrue(f.cancel(true));
+                try {
+                    f.invoke();
+                    shouldThrow();
+                } catch (CancellationException success) {
+                    assertTrue(f.isDone());
+                    assertTrue(f.isCancelled());
+                    assertTrue(f.isCompletedAbnormally());
+                    assertTrue(f.getException() instanceof CancellationException);
                 }
-            };
-        mainPool.invoke(a);
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * join of a forked task throws exception when task cancelled
      */
     public void testCancelledForkJoin() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        AsyncFib f = new AsyncFib(8);
-                        f.cancel(true);
-                        f.fork();
-                        f.join();
-                        shouldThrow();
-                    } catch (CancellationException success) {
-                    }
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertTrue(f.cancel(true));
+                assertSame(f, f.fork());
+                try {
+                    f.join();
+                    shouldThrow();
+                } catch (CancellationException success) {
+                    assertTrue(f.isDone());
+                    assertTrue(f.isCancelled());
+                    assertTrue(f.isCompletedAbnormally());
+                    assertTrue(f.getException() instanceof CancellationException);
                 }
-            };
-        mainPool.invoke(a);
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * get of a forked task throws exception when task cancelled
      */
     public void testCancelledForkGet() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        AsyncFib f = new AsyncFib(8);
-                        f.cancel(true);
-                        f.fork();
-                        f.get();
-                        shouldThrow();
-                    } catch (CancellationException success) {
-                    } catch (Exception ex) {
-                        unexpectedException(ex);
-                    }
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                AsyncFib f = new AsyncFib(8);
+                assertTrue(f.cancel(true));
+                assertSame(f, f.fork());
+                try {
+                    f.get();
+                    shouldThrow();
+                } catch (CancellationException success) {
+                    assertTrue(f.isDone());
+                    assertTrue(f.isCancelled());
+                    assertTrue(f.isCompletedAbnormally());
+                    assertTrue(f.getException() instanceof CancellationException);
                 }
-            };
-        mainPool.invoke(a);
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * timed get of a forked task throws exception when task cancelled
      */
-    public void testCancelledForkTimedGet() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        AsyncFib f = new AsyncFib(8);
-                        f.cancel(true);
-                        f.fork();
-                        f.get(5L, TimeUnit.SECONDS);
-                        shouldThrow();
-                    } catch (CancellationException success) {
-                    } catch (Exception ex) {
-                        unexpectedException(ex);
-                    }
-                }
-            };
-        mainPool.invoke(a);
-    }
-
-    /**
-     * join of a forked task throws exception when task cancelled
-     */
-    public void testCancelledForkHelpJoin() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        AsyncFib f = new AsyncFib(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() {
-                    AsyncFib f = new AsyncFib(8);
-                    f.cancel(true);
-                    f.fork();
-                    f.quietlyHelpJoin();
-                    threadAssertTrue(f.isDone());
-                    threadAssertTrue(f.isCompletedAbnormally());
-                    threadAssertTrue(f.isCancelled());
-                    threadAssertTrue(f.getException() instanceof CancellationException);
+    public void testCancelledForkTimedGet() throws Exception {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                AsyncFib f = new AsyncFib(8);
+                assertTrue(f.cancel(true));
+                assertSame(f, f.fork());
+                try {
+                    f.get(LONG_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (CancellationException success) {
+                    assertTrue(f.isDone());
+                    assertTrue(f.isCancelled());
+                    assertTrue(f.isCompletedAbnormally());
+                    assertTrue(f.getException() instanceof CancellationException);
                 }
-            };
-        mainPool.invoke(a);
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * quietlyJoin of a forked task returns when task cancelled
      */
     public void testCancelledForkQuietlyJoin() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    f.cancel(true);
-                    f.fork();
-                    f.quietlyJoin();
-                    threadAssertTrue(f.isDone());
-                    threadAssertTrue(f.isCompletedAbnormally());
-                    threadAssertTrue(f.getException() instanceof CancellationException);
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertTrue(f.cancel(true));
+                assertSame(f, f.fork());
+                f.quietlyJoin();
+                assertTrue(f.isDone());
+                assertTrue(f.isCompletedAbnormally());
+                assertTrue(f.isCancelled());
+                assertTrue(f.getException() instanceof CancellationException);
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * getPool of executing task returns its pool
      */
     public void testGetPool() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    threadAssertTrue(getPool() == mainPool);
-                }
-            };
-        mainPool.invoke(a);
+        final ForkJoinPool mainPool = mainPool();
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                assertSame(mainPool, getPool());
+            }};
+        testInvokeOnPool(mainPool, a);
     }
 
     /**
      * getPool of non-FJ task returns null
      */
     public void testGetPool2() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    threadAssertTrue(getPool() == null);
-                }
-            };
-        a.invoke();
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                assertNull(getPool());
+            }};
+        assertNull(a.invoke());
     }
 
     /**
      * inForkJoinPool of executing task returns true
      */
     public void testInForkJoinPool() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    threadAssertTrue(inForkJoinPool());
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                assertTrue(inForkJoinPool());
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * inForkJoinPool of non-FJ task returns false
      */
     public void testInForkJoinPool2() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    threadAssertTrue(!inForkJoinPool());
-                }
-            };
-        a.invoke();
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                assertTrue(!inForkJoinPool());
+            }};
+        assertNull(a.invoke());
     }
 
     /**
      * setRawResult(null) succeeds
      */
     public void testSetRawResult() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    setRawResult(null);
-                }
-            };
-        a.invoke();
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                setRawResult(null);
+            }};
+        assertNull(a.invoke());
     }
 
     /**
      * invoke task throws exception after invoking completeExceptionally
      */
     public void testCompleteExceptionally() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        AsyncFib f = new AsyncFib(8);
-                        f.completeExceptionally(new FJException());
-                        f.invoke();
-                        shouldThrow();
-                    } catch (FJException success) {
-                    }
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                f.completeExceptionally(new FJException());
+                try {
+                    f.invoke();
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * invokeAll(t1, t2) invokes all task arguments
      */
     public void testInvokeAll2() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    AsyncFib g = new AsyncFib(9);
-                    invokeAll(f, g);
-                    threadAssertTrue(f.isDone());
-                    threadAssertTrue(f.number == 21);
-                    threadAssertTrue(g.isDone());
-                    threadAssertTrue(g.number == 34);
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                AsyncFib g = new AsyncFib(9);
+                invokeAll(f, g);
+                assertTrue(f.isDone());
+                assertEquals(21, f.number);
+                assertTrue(g.isDone());
+                assertEquals(34, g.number);
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * invokeAll(tasks) with 1 argument invokes task
      */
     public void testInvokeAll1() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    invokeAll(f);
-                    threadAssertTrue(f.isDone());
-                    threadAssertTrue(f.number == 21);
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                invokeAll(f);
+                assertTrue(f.isDone());
+                assertEquals(21, f.number);
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * invokeAll(tasks) with > 2 argument invokes tasks
      */
     public void testInvokeAll3() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    AsyncFib g = new AsyncFib(9);
-                    AsyncFib h = new AsyncFib(7);
-                    invokeAll(f, g, h);
-                    threadAssertTrue(f.isDone());
-                    threadAssertTrue(f.number == 21);
-                    threadAssertTrue(g.isDone());
-                    threadAssertTrue(g.number == 34);
-                    threadAssertTrue(h.isDone());
-                    threadAssertTrue(h.number == 13);
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                AsyncFib g = new AsyncFib(9);
+                AsyncFib h = new AsyncFib(7);
+                invokeAll(f, g, h);
+                assertTrue(f.isDone());
+                assertEquals(21, f.number);
+                assertTrue(g.isDone());
+                assertEquals(34, g.number);
+                assertTrue(h.isDone());
+                assertEquals(13, h.number);
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * invokeAll(collection) invokes all tasks in the collection
      */
     public void testInvokeAllCollection() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    AsyncFib g = new AsyncFib(9);
-                    AsyncFib h = new AsyncFib(7);
-                    HashSet set = new HashSet();
-                    set.add(f);
-                    set.add(g);
-                    set.add(h);
-                    invokeAll(set);
-                    threadAssertTrue(f.isDone());
-                    threadAssertTrue(f.number == 21);
-                    threadAssertTrue(g.isDone());
-                    threadAssertTrue(g.number == 34);
-                    threadAssertTrue(h.isDone());
-                    threadAssertTrue(h.number == 13);
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                AsyncFib g = new AsyncFib(9);
+                AsyncFib h = new AsyncFib(7);
+                HashSet set = new HashSet();
+                set.add(f);
+                set.add(g);
+                set.add(h);
+                invokeAll(set);
+                assertTrue(f.isDone());
+                assertEquals(21, f.number);
+                assertTrue(g.isDone());
+                assertEquals(34, g.number);
+                assertTrue(h.isDone());
+                assertEquals(13, h.number);
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
 
@@ -837,96 +739,86 @@ public class ForkJoinTaskTest extends JS
      * invokeAll(tasks) with any null task throws NPE
      */
     public void testInvokeAllNPE() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        AsyncFib f = new AsyncFib(8);
-                        AsyncFib g = new AsyncFib(9);
-                        AsyncFib h = null;
-                        invokeAll(f, g, h);
-                        shouldThrow();
-                    } catch (NullPointerException success) {
-                    }
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                AsyncFib g = new AsyncFib(9);
+                AsyncFib h = null;
+                try {
+                    invokeAll(f, g, h);
+                    shouldThrow();
+                } catch (NullPointerException success) {}
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * invokeAll(t1, t2) throw exception if any task does
      */
     public void testAbnormalInvokeAll2() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        AsyncFib f = new AsyncFib(8);
-                        FailingAsyncFib g = new FailingAsyncFib(9);
-                        invokeAll(f, g);
-                        shouldThrow();
-                    } catch (FJException success) {
-                    }
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                FailingAsyncFib g = new FailingAsyncFib(9);
+                try {
+                    invokeAll(f, g);
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * invokeAll(tasks) with 1 argument throws exception if task does
      */
     public void testAbnormalInvokeAll1() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        FailingAsyncFib g = new FailingAsyncFib(9);
-                        invokeAll(g);
-                        shouldThrow();
-                    } catch (FJException success) {
-                    }
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                FailingAsyncFib g = new FailingAsyncFib(9);
+                try {
+                    invokeAll(g);
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * invokeAll(tasks) with > 2 argument throws exception if any task does
      */
     public void testAbnormalInvokeAll3() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        AsyncFib f = new AsyncFib(8);
-                        FailingAsyncFib g = new FailingAsyncFib(9);
-                        AsyncFib h = new AsyncFib(7);
-                        invokeAll(f, g, h);
-                        shouldThrow();
-                    } catch (FJException success) {
-                    }
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                FailingAsyncFib g = new FailingAsyncFib(9);
+                AsyncFib h = new AsyncFib(7);
+                try {
+                    invokeAll(f, g, h);
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
      * invokeAll(collection)  throws exception if any task does
      */
     public void testAbnormalInvokeAllCollection() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        FailingAsyncFib f = new FailingAsyncFib(8);
-                        AsyncFib g = new AsyncFib(9);
-                        AsyncFib h = new AsyncFib(7);
-                        HashSet set = new HashSet();
-                        set.add(f);
-                        set.add(g);
-                        set.add(h);
-                        invokeAll(set);
-                        shouldThrow();
-                    } catch (FJException success) {
-                    }
-                }
-            };
-        mainPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                AsyncFib g = new AsyncFib(9);
+                AsyncFib h = new AsyncFib(7);
+                HashSet set = new HashSet();
+                set.add(f);
+                set.add(g);
+                set.add(h);
+                try {
+                    invokeAll(set);
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(mainPool(), a);
     }
 
     /**
@@ -934,19 +826,18 @@ public class ForkJoinTaskTest extends JS
      * and suppresses execution
      */
     public void testTryUnfork() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib g = new AsyncFib(9);
-                    g.fork();
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    threadAssertTrue(f.tryUnfork());
-                    helpQuiesce();
-                    threadAssertFalse(f.isDone());
-                    threadAssertTrue(g.isDone());
-                }
-            };
-        singletonPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib g = new AsyncFib(9);
+                assertSame(g, g.fork());
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertTrue(f.tryUnfork());
+                helpQuiesce();
+                assertFalse(f.isDone());
+                assertTrue(g.isDone());
+            }};
+        testInvokeOnPool(singletonPool(), a);
     }
 
     /**
@@ -954,38 +845,36 @@ public class ForkJoinTaskTest extends JS
      * there are more tasks than threads
      */
     public void testGetSurplusQueuedTaskCount() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib h = new AsyncFib(7);
-                    h.fork();
-                    AsyncFib g = new AsyncFib(9);
-                    g.fork();
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    threadAssertTrue(getSurplusQueuedTaskCount() > 0);
-                    helpQuiesce();
-                }
-            };
-        singletonPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib h = new AsyncFib(7);
+                assertSame(h, h.fork());
+                AsyncFib g = new AsyncFib(9);
+                assertSame(g, g.fork());
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertTrue(getSurplusQueuedTaskCount() > 0);
+                helpQuiesce();
+            }};
+        testInvokeOnPool(singletonPool(), a);
     }
 
     /**
      * peekNextLocalTask returns most recent unexecuted task.
      */
     public void testPeekNextLocalTask() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib g = new AsyncFib(9);
-                    g.fork();
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    threadAssertTrue(peekNextLocalTask() == f);
-                    f.join();
-                    threadAssertTrue(f.isDone());
-                    helpQuiesce();
-                }
-            };
-        singletonPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib g = new AsyncFib(9);
+                assertSame(g, g.fork());
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertSame(f, peekNextLocalTask());
+                assertNull(f.join());
+                assertTrue(f.isDone());
+                helpQuiesce();
+            }};
+        testInvokeOnPool(singletonPool(), a);
     }
 
     /**
@@ -993,18 +882,17 @@ public class ForkJoinTaskTest extends JS
      * without executing it
      */
     public void testPollNextLocalTask() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib g = new AsyncFib(9);
-                    g.fork();
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    threadAssertTrue(pollNextLocalTask() == f);
-                    helpQuiesce();
-                    threadAssertFalse(f.isDone());
-                }
-            };
-        singletonPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib g = new AsyncFib(9);
+                assertSame(g, g.fork());
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertSame(f, pollNextLocalTask());
+                helpQuiesce();
+                assertFalse(f.isDone());
+            }};
+        testInvokeOnPool(singletonPool(), a);
     }
 
     /**
@@ -1012,38 +900,36 @@ public class ForkJoinTaskTest extends JS
      * without executing it
      */
     public void testPollTask() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib g = new AsyncFib(9);
-                    g.fork();
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    threadAssertTrue(pollTask() == f);
-                    helpQuiesce();
-                    threadAssertFalse(f.isDone());
-                    threadAssertTrue(g.isDone());
-                }
-            };
-        singletonPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib g = new AsyncFib(9);
+                assertSame(g, g.fork());
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertSame(f, pollTask());
+                helpQuiesce();
+                assertFalse(f.isDone());
+                assertTrue(g.isDone());
+            }};
+        testInvokeOnPool(singletonPool(), a);
     }
 
     /**
      * peekNextLocalTask returns least recent unexecuted task in async mode
      */
     public void testPeekNextLocalTaskAsync() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib g = new AsyncFib(9);
-                    g.fork();
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    threadAssertTrue(peekNextLocalTask() == g);
-                    f.join();
-                    helpQuiesce();
-                    threadAssertTrue(f.isDone());
-                }
-            };
-        asyncSingletonPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib g = new AsyncFib(9);
+                assertSame(g, g.fork());
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertSame(g, peekNextLocalTask());
+                assertNull(f.join());
+                helpQuiesce();
+                assertTrue(f.isDone());
+            }};
+        testInvokeOnPool(asyncSingletonPool(), a);
     }
 
     /**
@@ -1051,19 +937,18 @@ public class ForkJoinTaskTest extends JS
      * without executing it, in async mode
      */
     public void testPollNextLocalTaskAsync() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib g = new AsyncFib(9);
-                    g.fork();
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    threadAssertTrue(pollNextLocalTask() == g);
-                    helpQuiesce();
-                    threadAssertTrue(f.isDone());
-                    threadAssertFalse(g.isDone());
-                }
-            };
-        asyncSingletonPool.invoke(a);
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib g = new AsyncFib(9);
+                assertSame(g, g.fork());
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertSame(g, pollNextLocalTask());
+                helpQuiesce();
+                assertTrue(f.isDone());
+                assertFalse(g.isDone());
+            }};
+        testInvokeOnPool(asyncSingletonPool(), a);
     }
 
     /**
@@ -1071,18 +956,541 @@ public class ForkJoinTaskTest extends JS
      * without executing it, in async mode
      */
     public void testPollTaskAsync() {
-        RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib g = new AsyncFib(9);
-                    g.fork();
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    threadAssertTrue(pollTask() == g);
-                    helpQuiesce();
-                    threadAssertTrue(f.isDone());
-                    threadAssertFalse(g.isDone());
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib g = new AsyncFib(9);
+                assertSame(g, g.fork());
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertSame(g, pollTask());
+                helpQuiesce();
+                assertTrue(f.isDone());
+                assertFalse(g.isDone());
+            }};
+        testInvokeOnPool(asyncSingletonPool(), a);
+    }
+
+    // versions for singleton pools
+
+    /**
+     * invoke returns when task completes normally.
+     * isCompletedAbnormally and isCancelled return false for normally
+     * completed tasks. getRawResult of a RecursiveAction returns null;
+     */
+    public void testInvokeSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertNull(f.invoke());
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+                assertFalse(f.isCancelled());
+                assertFalse(f.isCompletedAbnormally());
+                assertNull(f.getRawResult());
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * quietlyInvoke task returns when task completes normally.
+     * isCompletedAbnormally and isCancelled return false for normally
+     * completed tasks
+     */
+    public void testQuietlyInvokeSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                f.quietlyInvoke();
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+                assertFalse(f.isCancelled());
+                assertFalse(f.isCompletedAbnormally());
+                assertNull(f.getRawResult());
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * join of a forked task returns when task completes
+     */
+    public void testForkJoinSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertNull(f.join());
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+                assertNull(f.getRawResult());
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * get of a forked task returns when task completes
+     */
+    public void testForkGetSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertNull(f.get());
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * timed get of a forked task returns when task completes
+     */
+    public void testForkTimedGetSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * timed get with null time unit throws NPE
+     */
+    public void testForkTimedGetNPESingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                try {
+                    f.get(5L, null);
+                    shouldThrow();
+                } catch (NullPointerException success) {}
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * quietlyJoin of a forked task returns when task completes
+     */
+    public void testForkQuietlyJoinSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                f.quietlyJoin();
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+
+    /**
+     * helpQuiesce returns when tasks are complete.
+     * getQueuedTaskCount returns 0 when quiescent
+     */
+    public void testForkHelpQuiesceSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertSame(f, f.fork());
+                f.helpQuiesce();
+                assertEquals(21, f.number);
+                assertTrue(f.isDone());
+                assertEquals(0, getQueuedTaskCount());
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+
+    /**
+     * invoke task throws exception when task completes abnormally
+     */
+    public void testAbnormalInvokeSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                try {
+                    f.invoke();
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * quietlyInvoke task returns when task completes abnormally
+     */
+    public void testAbnormalQuietlyInvokeSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                f.quietlyInvoke();
+                assertTrue(f.isDone());
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * join of a forked task throws exception when task completes abnormally
+     */
+    public void testAbnormalForkJoinSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                assertSame(f, f.fork());
+                try {
+                    f.join();
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * get of a forked task throws exception when task completes abnormally
+     */
+    public void testAbnormalForkGetSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                assertSame(f, f.fork());
+                try {
+                    f.get();
+                    shouldThrow();
+                } catch (ExecutionException success) {
+                    Throwable cause = success.getCause();
+                    assertTrue(cause instanceof FJException);
+                    assertTrue(f.isDone());
+                    assertTrue(f.isCompletedAbnormally());
+                    assertSame(cause, f.getException());
+                }
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * timed get of a forked task throws exception when task completes abnormally
+     */
+    public void testAbnormalForkTimedGetSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                assertSame(f, f.fork());
+                try {
+                    f.get(LONG_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (ExecutionException success) {
+                    Throwable cause = success.getCause();
+                    assertTrue(cause instanceof FJException);
+                    assertTrue(f.isDone());
+                    assertTrue(f.isCompletedAbnormally());
+                    assertSame(cause, f.getException());
                 }
-            };
-        asyncSingletonPool.invoke(a);
+            }};
+        testInvokeOnPool(singletonPool(), a);
     }
+
+    /**
+     * quietlyJoin of a forked task returns when task completes abnormally
+     */
+    public void testAbnormalForkQuietlyJoinSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                assertSame(f, f.fork());
+                f.quietlyJoin();
+                assertTrue(f.isDone());
+                assertTrue(f.isCompletedAbnormally());
+                assertTrue(f.getException() instanceof FJException);
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * invoke task throws exception when task cancelled
+     */
+    public void testCancelledInvokeSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertTrue(f.cancel(true));
+                try {
+                    f.invoke();
+                    shouldThrow();
+                } catch (CancellationException success) {
+                    assertTrue(f.isDone());
+                    assertTrue(f.isCancelled());
+                    assertTrue(f.isCompletedAbnormally());
+                    assertTrue(f.getException() instanceof CancellationException);
+                }
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * join of a forked task throws exception when task cancelled
+     */
+    public void testCancelledForkJoinSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertTrue(f.cancel(true));
+                assertSame(f, f.fork());
+                try {
+                    f.join();
+                    shouldThrow();
+                } catch (CancellationException success) {
+                    assertTrue(f.isDone());
+                    assertTrue(f.isCancelled());
+                    assertTrue(f.isCompletedAbnormally());
+                    assertTrue(f.getException() instanceof CancellationException);
+                }
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * get of a forked task throws exception when task cancelled
+     */
+    public void testCancelledForkGetSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                AsyncFib f = new AsyncFib(8);
+                assertTrue(f.cancel(true));
+                assertSame(f, f.fork());
+                try {
+                    f.get();
+                    shouldThrow();
+                } catch (CancellationException success) {
+                    assertTrue(f.isDone());
+                    assertTrue(f.isCancelled());
+                    assertTrue(f.isCompletedAbnormally());
+                    assertTrue(f.getException() instanceof CancellationException);
+                }
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * timed get of a forked task throws exception when task cancelled
+     */
+    public void testCancelledForkTimedGetSingleton() throws Exception {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() throws Exception {
+                AsyncFib f = new AsyncFib(8);
+                assertTrue(f.cancel(true));
+                assertSame(f, f.fork());
+                try {
+                    f.get(LONG_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (CancellationException success) {
+                    assertTrue(f.isDone());
+                    assertTrue(f.isCancelled());
+                    assertTrue(f.isCompletedAbnormally());
+                    assertTrue(f.getException() instanceof CancellationException);
+                }
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * quietlyJoin of a forked task returns when task cancelled
+     */
+    public void testCancelledForkQuietlyJoinSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                assertTrue(f.cancel(true));
+                assertSame(f, f.fork());
+                f.quietlyJoin();
+                assertTrue(f.isDone());
+                assertTrue(f.isCompletedAbnormally());
+                assertTrue(f.isCancelled());
+                assertTrue(f.getException() instanceof CancellationException);
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * invoke task throws exception after invoking completeExceptionally
+     */
+    public void testCompleteExceptionallySingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                f.completeExceptionally(new FJException());
+                try {
+                    f.invoke();
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * invokeAll(t1, t2) invokes all task arguments
+     */
+    public void testInvokeAll2Singleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                AsyncFib g = new AsyncFib(9);
+                invokeAll(f, g);
+                assertTrue(f.isDone());
+                assertEquals(21, f.number);
+                assertTrue(g.isDone());
+                assertEquals(34, g.number);
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * invokeAll(tasks) with 1 argument invokes task
+     */
+    public void testInvokeAll1Singleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                invokeAll(f);
+                assertTrue(f.isDone());
+                assertEquals(21, f.number);
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * invokeAll(tasks) with > 2 argument invokes tasks
+     */
+    public void testInvokeAll3Singleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                AsyncFib g = new AsyncFib(9);
+                AsyncFib h = new AsyncFib(7);
+                invokeAll(f, g, h);
+                assertTrue(f.isDone());
+                assertEquals(21, f.number);
+                assertTrue(g.isDone());
+                assertEquals(34, g.number);
+                assertTrue(h.isDone());
+                assertEquals(13, h.number);
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * invokeAll(collection) invokes all tasks in the collection
+     */
+    public void testInvokeAllCollectionSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                AsyncFib g = new AsyncFib(9);
+                AsyncFib h = new AsyncFib(7);
+                HashSet set = new HashSet();
+                set.add(f);
+                set.add(g);
+                set.add(h);
+                invokeAll(set);
+                assertTrue(f.isDone());
+                assertEquals(21, f.number);
+                assertTrue(g.isDone());
+                assertEquals(34, g.number);
+                assertTrue(h.isDone());
+                assertEquals(13, h.number);
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+
+    /**
+     * invokeAll(tasks) with any null task throws NPE
+     */
+    public void testInvokeAllNPESingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                AsyncFib g = new AsyncFib(9);
+                AsyncFib h = null;
+                try {
+                    invokeAll(f, g, h);
+                    shouldThrow();
+                } catch (NullPointerException success) {}
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * invokeAll(t1, t2) throw exception if any task does
+     */
+    public void testAbnormalInvokeAll2Singleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                FailingAsyncFib g = new FailingAsyncFib(9);
+                try {
+                    invokeAll(f, g);
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * invokeAll(tasks) with 1 argument throws exception if task does
+     */
+    public void testAbnormalInvokeAll1Singleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                FailingAsyncFib g = new FailingAsyncFib(9);
+                try {
+                    invokeAll(g);
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * invokeAll(tasks) with > 2 argument throws exception if any task does
+     */
+    public void testAbnormalInvokeAll3Singleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                AsyncFib f = new AsyncFib(8);
+                FailingAsyncFib g = new FailingAsyncFib(9);
+                AsyncFib h = new AsyncFib(7);
+                try {
+                    invokeAll(f, g, h);
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
+    /**
+     * invokeAll(collection)  throws exception if any task does
+     */
+    public void testAbnormalInvokeAllCollectionSingleton() {
+        RecursiveAction a = new CheckedRecursiveAction() {
+            public void realCompute() {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                AsyncFib g = new AsyncFib(9);
+                AsyncFib h = new AsyncFib(7);
+                HashSet set = new HashSet();
+                set.add(f);
+                set.add(g);
+                set.add(h);
+                try {
+                    invokeAll(set);
+                    shouldThrow();
+                } catch (FJException success) {}
+            }};
+        testInvokeOnPool(singletonPool(), a);
+    }
+
 }