--- jsr166/src/test/tck/ForkJoinTaskTest.java	2009/12/01 06:47:14	1.6
+++ jsr166/src/test/tck/ForkJoinTaskTest.java	2010/09/13 07:26:30	1.13
@@ -3,16 +3,23 @@
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
-import junit.framework.*;
-import java.util.concurrent.*;
+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.*;
 import java.util.*;
+import junit.framework.*;
 
 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);
     }
@@ -27,11 +34,9 @@ public class ForkJoinTaskTest extends JS
 
     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(); }
     }
@@ -209,20 +214,18 @@ 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);
-                }
-            };
+            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);
     }
 
@@ -233,16 +236,15 @@ public class ForkJoinTaskTest extends JS
      */
     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);
-                }
-            };
+            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);
     }
 
@@ -251,15 +253,14 @@ public class ForkJoinTaskTest extends JS
      */
     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);
-                }
-            };
+            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);
     }
 
@@ -268,18 +269,17 @@ public class ForkJoinTaskTest extends JS
      */
     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);
-                    }
+            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);
     }
 
@@ -288,87 +288,51 @@ public class ForkJoinTaskTest extends JS
      */
     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);
-    }
-
-    /**
-     * 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() {
+            public void compute() {
+                try {
                     AsyncFib f = new AsyncFib(8);
                     f.fork();
-                    f.helpJoin();
+                    f.get(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
                     threadAssertTrue(f.number == 21);
                     threadAssertTrue(f.isDone());
+                } catch (Exception ex) {
+                    unexpectedException(ex);
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
     /**
-     * quietlyJoin of a forked task returns when task completes
+     * timed get with null time unit throws NPE
      */
-    public void testForkQuietlyJoin() {
+    public void testForkTimedGetNPE() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
+            public void compute() {
+                try {
                     AsyncFib f = new AsyncFib(8);
                     f.fork();
-                    f.quietlyJoin();
-                    threadAssertTrue(f.number == 21);
-                    threadAssertTrue(f.isDone());
+                    f.get(5L, null);
+                    shouldThrow();
+                } catch (NullPointerException success) {
+                } catch (Exception ex) {
+                    unexpectedException(ex);
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
-
     /**
-     * quietlyHelpJoin of a forked task returns when task completes
+     * quietlyJoin of a forked task returns when task completes
      */
-    public void testForkQuietlyHelpJoin() {
+    public void testForkQuietlyJoin() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    f.fork();
-                    f.quietlyHelpJoin();
-                    threadAssertTrue(f.number == 21);
-                    threadAssertTrue(f.isDone());
-                }
-            };
+            public void compute() {
+                AsyncFib f = new AsyncFib(8);
+                f.fork();
+                f.quietlyJoin();
+                threadAssertTrue(f.number == 21);
+                threadAssertTrue(f.isDone());
+            }};
         mainPool.invoke(a);
     }
 
@@ -379,15 +343,14 @@ public class ForkJoinTaskTest extends JS
      */
     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);
-                }
-            };
+            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);
     }
 
@@ -397,15 +360,14 @@ public class ForkJoinTaskTest extends JS
      */
     public void testAbnormalInvoke() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        FailingAsyncFib f = new FailingAsyncFib(8);
-                        f.invoke();
-                        shouldThrow();
-                    } catch (FJException success) {
-                    }
+            public void compute() {
+                try {
+                    FailingAsyncFib f = new FailingAsyncFib(8);
+                    f.invoke();
+                    shouldThrow();
+                } catch (FJException success) {
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
@@ -414,12 +376,11 @@ public class ForkJoinTaskTest extends JS
      */
     public void testAbnormalQuietlyInvoke() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    FailingAsyncFib f = new FailingAsyncFib(8);
-                    f.quietlyInvoke();
-                    threadAssertTrue(f.isDone());
-                }
-            };
+            public void compute() {
+                FailingAsyncFib f = new FailingAsyncFib(8);
+                f.quietlyInvoke();
+                threadAssertTrue(f.isDone());
+            }};
         mainPool.invoke(a);
     }
 
@@ -428,16 +389,15 @@ public class ForkJoinTaskTest extends JS
      */
     public void testAbnormalForkJoin() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        FailingAsyncFib f = new FailingAsyncFib(8);
-                        f.fork();
-                        f.join();
-                        shouldThrow();
-                    } catch (FJException success) {
-                    }
+            public void compute() {
+                try {
+                    FailingAsyncFib f = new FailingAsyncFib(8);
+                    f.fork();
+                    f.join();
+                    shouldThrow();
+                } catch (FJException success) {
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
@@ -446,18 +406,17 @@ public class ForkJoinTaskTest extends JS
      */
     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);
-                    }
+            public void compute() {
+                try {
+                    FailingAsyncFib f = new FailingAsyncFib(8);
+                    f.fork();
+                    f.get();
+                    shouldThrow();
+                } catch (ExecutionException success) {
+                } catch (Exception ex) {
+                    unexpectedException(ex);
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
@@ -466,57 +425,17 @@ public class ForkJoinTaskTest extends JS
      */
     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() {
+            public void compute() {
+                try {
                     FailingAsyncFib f = new FailingAsyncFib(8);
                     f.fork();
-                    f.quietlyHelpJoin();
-                    threadAssertTrue(f.isDone());
-                    threadAssertTrue(f.isCompletedAbnormally());
-                    threadAssertFalse(f.isCancelled());
-                    threadAssertTrue(f.getException() instanceof FJException);
+                    f.get(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
+                    shouldThrow();
+                } catch (ExecutionException success) {
+                } catch (Exception ex) {
+                    unexpectedException(ex);
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
@@ -525,15 +444,14 @@ public class ForkJoinTaskTest extends JS
      */
     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);
-                }
-            };
+            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);
     }
 
@@ -542,16 +460,15 @@ public class ForkJoinTaskTest extends JS
      */
     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) {
-                    }
+            public void compute() {
+                try {
+                    AsyncFib f = new AsyncFib(8);
+                    f.cancel(true);
+                    f.invoke();
+                    shouldThrow();
+                } catch (CancellationException success) {
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
@@ -560,17 +477,16 @@ public class ForkJoinTaskTest extends JS
      */
     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) {
-                    }
+            public void compute() {
+                try {
+                    AsyncFib f = new AsyncFib(8);
+                    f.cancel(true);
+                    f.fork();
+                    f.join();
+                    shouldThrow();
+                } catch (CancellationException success) {
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
@@ -579,19 +495,18 @@ public class ForkJoinTaskTest extends JS
      */
     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);
-                    }
+            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);
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
@@ -600,60 +515,18 @@ public class ForkJoinTaskTest extends JS
      */
     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() {
+            public void compute() {
+                try {
                     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);
+                    f.get(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
+                    shouldThrow();
+                } catch (CancellationException success) {
+                } catch (Exception ex) {
+                    unexpectedException(ex);
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
@@ -662,16 +535,15 @@ public class ForkJoinTaskTest extends JS
      */
     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);
-                }
-            };
+            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);
     }
 
@@ -680,10 +552,9 @@ public class ForkJoinTaskTest extends JS
      */
     public void testGetPool() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    threadAssertTrue(getPool() == mainPool);
-                }
-            };
+            public void compute() {
+                threadAssertTrue(getPool() == mainPool);
+            }};
         mainPool.invoke(a);
     }
 
@@ -692,10 +563,9 @@ public class ForkJoinTaskTest extends JS
      */
     public void testGetPool2() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    threadAssertTrue(getPool() == null);
-                }
-            };
+            public void compute() {
+                threadAssertTrue(getPool() == null);
+            }};
         a.invoke();
     }
 
@@ -704,10 +574,9 @@ public class ForkJoinTaskTest extends JS
      */
     public void testInForkJoinPool() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    threadAssertTrue(inForkJoinPool());
-                }
-            };
+            public void compute() {
+                threadAssertTrue(inForkJoinPool());
+            }};
         mainPool.invoke(a);
     }
 
@@ -716,10 +585,9 @@ public class ForkJoinTaskTest extends JS
      */
     public void testInForkJoinPool2() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    threadAssertTrue(!inForkJoinPool());
-                }
-            };
+            public void compute() {
+                threadAssertTrue(!inForkJoinPool());
+            }};
         a.invoke();
     }
 
@@ -728,10 +596,9 @@ public class ForkJoinTaskTest extends JS
      */
     public void testSetRawResult() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    setRawResult(null);
-                }
-            };
+            public void compute() {
+                setRawResult(null);
+            }};
         a.invoke();
     }
 
@@ -740,16 +607,15 @@ public class ForkJoinTaskTest extends JS
      */
     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) {
-                    }
+            public void compute() {
+                try {
+                    AsyncFib f = new AsyncFib(8);
+                    f.completeExceptionally(new FJException());
+                    f.invoke();
+                    shouldThrow();
+                } catch (FJException success) {
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
@@ -758,16 +624,15 @@ public class ForkJoinTaskTest extends JS
      */
     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);
-                }
-            };
+            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);
     }
 
@@ -776,13 +641,12 @@ public class ForkJoinTaskTest extends JS
      */
     public void testInvokeAll1() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    AsyncFib f = new AsyncFib(8);
-                    invokeAll(f);
-                    threadAssertTrue(f.isDone());
-                    threadAssertTrue(f.number == 21);
-                }
-            };
+            public void compute() {
+                AsyncFib f = new AsyncFib(8);
+                invokeAll(f);
+                threadAssertTrue(f.isDone());
+                threadAssertTrue(f.number == 21);
+            }};
         mainPool.invoke(a);
     }
 
@@ -791,19 +655,18 @@ public class ForkJoinTaskTest extends JS
      */
     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);
-                }
-            };
+            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);
     }
 
@@ -812,23 +675,22 @@ public class ForkJoinTaskTest extends JS
      */
     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);
-                }
-            };
+            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);
     }
 
@@ -838,17 +700,16 @@ public class ForkJoinTaskTest extends JS
      */
     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) {
-                    }
+            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);
     }
 
@@ -857,16 +718,15 @@ public class ForkJoinTaskTest extends JS
      */
     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) {
-                    }
+            public void compute() {
+                try {
+                    AsyncFib f = new AsyncFib(8);
+                    FailingAsyncFib g = new FailingAsyncFib(9);
+                    invokeAll(f, g);
+                    shouldThrow();
+                } catch (FJException success) {
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
@@ -875,15 +735,14 @@ public class ForkJoinTaskTest extends JS
      */
     public void testAbnormalInvokeAll1() {
         RecursiveAction a = new RecursiveAction() {
-                public void compute() {
-                    try {
-                        FailingAsyncFib g = new FailingAsyncFib(9);
-                        invokeAll(g);
-                        shouldThrow();
-                    } catch (FJException success) {
-                    }
+            public void compute() {
+                try {
+                    FailingAsyncFib g = new FailingAsyncFib(9);
+                    invokeAll(g);
+                    shouldThrow();
+                } catch (FJException success) {
                 }
-            };
+            }};
         mainPool.invoke(a);
     }
 
@@ -892,17 +751,16 @@ public class ForkJoinTaskTest extends JS
      */
     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) {
-                    }
+            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);
     }
 
@@ -911,21 +769,20 @@ public class ForkJoinTaskTest extends JS
      */
     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) {
-                    }
+            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);
     }
 
@@ -935,17 +792,16 @@ public class ForkJoinTaskTest extends JS
      */
     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());
-                }
-            };
+            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);
     }
 
@@ -955,17 +811,16 @@ public class ForkJoinTaskTest extends JS
      */
     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();
-                }
-            };
+            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);
     }
 
@@ -974,17 +829,16 @@ public class ForkJoinTaskTest extends JS
      */
     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();
-                }
-            };
+            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);
     }
 
@@ -994,16 +848,15 @@ public class ForkJoinTaskTest extends JS
      */
     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());
-                }
-            };
+            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);
     }
 
@@ -1013,17 +866,16 @@ public class ForkJoinTaskTest extends JS
      */
     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());
-                }
-            };
+            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);
     }
 
@@ -1032,17 +884,16 @@ public class ForkJoinTaskTest extends JS
      */
     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());
-                }
-            };
+            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);
     }
 
@@ -1052,17 +903,16 @@ public class ForkJoinTaskTest extends JS
      */
     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());
-                }
-            };
+            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);
     }
 
@@ -1072,17 +922,16 @@ public class ForkJoinTaskTest extends JS
      */
     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());
-                }
-            };
+            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());
+            }};
         asyncSingletonPool.invoke(a);
     }
 }