--- jsr166/src/test/tck/RecursiveTaskTest.java	2010/08/11 19:50:02	1.9
+++ jsr166/src/test/tck/RecursiveTaskTest.java	2010/09/14 10:24:07	1.17
@@ -3,25 +3,45 @@
  * 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.*;
 
+import junit.framework.*;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.RecursiveTask;
+import java.util.concurrent.TimeUnit;
+import java.util.HashSet;
 
 public class RecursiveTaskTest 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(RecursiveTaskTest.class);
     }
 
-    static final ForkJoinPool mainPool = new ForkJoinPool();
-    static final ForkJoinPool singletonPool = new ForkJoinPool(1);
-    static final ForkJoinPool asyncSingletonPool = 
-        new ForkJoinPool(1, ForkJoinPool.defaultForkJoinWorkerThreadFactory, 
-                         null, true);
+    private static ForkJoinPool mainPool() {
+        return new ForkJoinPool();
+    }
+
+    private static ForkJoinPool singletonPool() {
+        return new ForkJoinPool(1);
+    }
+
+    private static ForkJoinPool asyncSingletonPool() {
+        return new ForkJoinPool(1,
+                                ForkJoinPool.defaultForkJoinWorkerThreadFactory,
+                                null, true);
+    }
+
+    private <T> T testInvokeOnPool(ForkJoinPool pool, RecursiveTask<T> a) {
+        try {
+            return pool.invoke(a);
+        } finally {
+            joinPool(pool);
+        }
+    }
 
     static final class FJException extends RuntimeException {
         FJException() { super(); }
@@ -64,7 +84,6 @@ public class RecursiveTaskTest extends J
      * isCompletedAbnormally and isCancelled return false for normally
      * completed tasks. getRawResult of a completed non-null task
      * returns value;
-     *
      */
     public void testInvoke() {
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
@@ -79,7 +98,7 @@ public class RecursiveTaskTest extends J
                 return r;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -100,7 +119,7 @@ public class RecursiveTaskTest extends J
                 return r;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -110,14 +129,14 @@ public class RecursiveTaskTest extends J
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FibTask f = new FibTask(8);
-                f.fork();
+                threadAssertSame(f, f.fork());
                 Integer r = f.join();
                 threadAssertTrue(r == 21);
                 threadAssertTrue(f.isDone());
                 return r;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -128,7 +147,7 @@ public class RecursiveTaskTest extends J
             public Integer compute() {
                 try {
                     FibTask f = new FibTask(8);
-                    f.fork();
+                    threadAssertSame(f, f.fork());
                     Integer r = f.get();
                     threadAssertTrue(r == 21);
                     threadAssertTrue(f.isDone());
@@ -139,7 +158,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -150,7 +169,7 @@ public class RecursiveTaskTest extends J
             public Integer compute() {
                 try {
                     FibTask f = new FibTask(8);
-                    f.fork();
+                    threadAssertSame(f, f.fork());
                     Integer r = f.get(5L, TimeUnit.SECONDS);
                     threadAssertTrue(r == 21);
                     threadAssertTrue(f.isDone());
@@ -161,7 +180,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -171,7 +190,7 @@ public class RecursiveTaskTest extends J
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FibTask f = new FibTask(8);
-                f.fork();
+                threadAssertSame(f, f.fork());
                 f.quietlyJoin();
                 Integer r = f.getRawResult();
                 threadAssertTrue(r == 21);
@@ -179,7 +198,7 @@ public class RecursiveTaskTest extends J
                 return r;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
 
@@ -191,7 +210,7 @@ public class RecursiveTaskTest extends J
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FibTask f = new FibTask(8);
-                f.fork();
+                threadAssertSame(f, f.fork());
                 f.helpQuiesce();
                 Integer r = f.getRawResult();
                 threadAssertTrue(r == 21);
@@ -200,7 +219,7 @@ public class RecursiveTaskTest extends J
                 return r;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
 
@@ -220,7 +239,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -235,7 +254,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -246,7 +265,7 @@ public class RecursiveTaskTest extends J
             public Integer compute() {
                 try {
                     FailingFibTask f = new FailingFibTask(8);
-                    f.fork();
+                    threadAssertSame(f, f.fork());
                     Integer r = f.join();
                     shouldThrow();
                     return r;
@@ -255,7 +274,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -266,7 +285,7 @@ public class RecursiveTaskTest extends J
             public Integer compute() {
                 try {
                     FailingFibTask f = new FailingFibTask(8);
-                    f.fork();
+                    threadAssertSame(f, f.fork());
                     Integer r = f.get();
                     shouldThrow();
                     return r;
@@ -277,7 +296,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -288,7 +307,7 @@ public class RecursiveTaskTest extends J
             public Integer compute() {
                 try {
                     FailingFibTask f = new FailingFibTask(8);
-                    f.fork();
+                    threadAssertSame(f, f.fork());
                     Integer r = f.get(5L, TimeUnit.SECONDS);
                     shouldThrow();
                     return r;
@@ -299,7 +318,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -309,7 +328,7 @@ public class RecursiveTaskTest extends J
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FailingFibTask f = new FailingFibTask(8);
-                f.fork();
+                threadAssertSame(f, f.fork());
                 f.quietlyJoin();
                 threadAssertTrue(f.isDone());
                 threadAssertTrue(f.isCompletedAbnormally());
@@ -317,7 +336,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -328,7 +347,7 @@ public class RecursiveTaskTest extends J
             public Integer compute() {
                 try {
                     FibTask f = new FibTask(8);
-                    f.cancel(true);
+                    threadAssertTrue(f.cancel(true));
                     Integer r = f.invoke();
                     shouldThrow();
                     return r;
@@ -337,7 +356,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -348,8 +367,8 @@ public class RecursiveTaskTest extends J
             public Integer compute() {
                 try {
                     FibTask f = new FibTask(8);
-                    f.cancel(true);
-                    f.fork();
+                    threadAssertTrue(f.cancel(true));
+                    threadAssertSame(f, f.fork());
                     Integer r = f.join();
                     shouldThrow();
                     return r;
@@ -358,7 +377,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -369,8 +388,8 @@ public class RecursiveTaskTest extends J
             public Integer compute() {
                 try {
                     FibTask f = new FibTask(8);
-                    f.cancel(true);
-                    f.fork();
+                    threadAssertTrue(f.cancel(true));
+                    threadAssertSame(f, f.fork());
                     Integer r = f.get();
                     shouldThrow();
                     return r;
@@ -381,7 +400,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -392,8 +411,8 @@ public class RecursiveTaskTest extends J
             public Integer compute() {
                 try {
                     FibTask f = new FibTask(8);
-                    f.cancel(true);
-                    f.fork();
+                    threadAssertTrue(f.cancel(true));
+                    threadAssertSame(f, f.fork());
                     Integer r = f.get(5L, TimeUnit.SECONDS);
                     shouldThrow();
                     return r;
@@ -404,7 +423,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -414,8 +433,8 @@ public class RecursiveTaskTest extends J
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FibTask f = new FibTask(8);
-                f.cancel(true);
-                f.fork();
+                threadAssertTrue(f.cancel(true));
+                threadAssertSame(f, f.fork());
                 f.quietlyJoin();
                 threadAssertTrue(f.isDone());
                 threadAssertTrue(f.isCompletedAbnormally());
@@ -423,20 +442,21 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
      * getPool of executing task returns its pool
      */
     public void testGetPool() {
+        final ForkJoinPool mainPool = mainPool();
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 threadAssertTrue(getPool() == mainPool);
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool, a));
     }
 
     /**
@@ -449,7 +469,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        a.invoke();
+        assertSame(NoResult, a.invoke());
     }
 
     /**
@@ -462,7 +482,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -475,20 +495,21 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        a.invoke();
+        assertSame(NoResult, a.invoke());
     }
 
     /**
-     * setRawResult(null) succeeds
+     * The value set by setRawResult is returned by getRawResult
      */
     public void testSetRawResult() {
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 setRawResult(NoResult);
+                threadAssertSame(getRawResult(), NoResult);
                 return NoResult;
             }
         };
-        assertEquals(a.invoke(), NoResult);
+        a.invoke();
     }
 
     /**
@@ -509,7 +530,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -529,7 +550,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -546,7 +567,7 @@ public class RecursiveTaskTest extends J
                 return r;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -565,7 +586,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -581,7 +602,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -603,7 +624,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -629,7 +650,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
 
@@ -650,7 +671,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -669,7 +690,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -690,7 +711,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -715,7 +736,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -726,9 +747,9 @@ public class RecursiveTaskTest extends J
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FibTask g = new FibTask(9);
-                g.fork();
+                threadAssertSame(g, g.fork());
                 FibTask f = new FibTask(8);
-                f.fork();
+                threadAssertSame(f, f.fork());
                 threadAssertTrue(f.tryUnfork());
                 helpQuiesce();
                 threadAssertFalse(f.isDone());
@@ -736,7 +757,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        singletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(singletonPool(), a));
     }
 
     /**
@@ -747,17 +768,17 @@ public class RecursiveTaskTest extends J
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FibTask h = new FibTask(7);
-                h.fork();
+                threadAssertSame(h, h.fork());
                 FibTask g = new FibTask(9);
-                g.fork();
+                threadAssertSame(g, g.fork());
                 FibTask f = new FibTask(8);
-                f.fork();
+                threadAssertSame(f, f.fork());
                 threadAssertTrue(getSurplusQueuedTaskCount() > 0);
                 helpQuiesce();
                 return NoResult;
             }
         };
-        singletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(singletonPool(), a));
     }
 
     /**
@@ -767,17 +788,17 @@ public class RecursiveTaskTest extends J
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FibTask g = new FibTask(9);
-                g.fork();
+                threadAssertSame(g, g.fork());
                 FibTask f = new FibTask(8);
-                f.fork();
+                threadAssertSame(f, f.fork());
                 threadAssertTrue(peekNextLocalTask() == f);
-                f.join();
+                threadAssertTrue(f.join() == 21);
                 threadAssertTrue(f.isDone());
                 helpQuiesce();
                 return NoResult;
             }
         };
-        singletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(singletonPool(), a));
     }
 
     /**
@@ -788,29 +809,28 @@ public class RecursiveTaskTest extends J
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FibTask g = new FibTask(9);
-                g.fork();
+                threadAssertSame(g, g.fork());
                 FibTask f = new FibTask(8);
-                f.fork();
+                threadAssertSame(f, f.fork());
                 threadAssertTrue(pollNextLocalTask() == f);
                 helpQuiesce();
                 threadAssertFalse(f.isDone());
                 return NoResult;
             }
         };
-        singletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(singletonPool(), a));
     }
 
     /**
-     * pollTask returns an unexecuted task
-     * without executing it
+     * pollTask returns an unexecuted task without executing it
      */
     public void testPollTask() {
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FibTask g = new FibTask(9);
-                g.fork();
+                threadAssertSame(g, g.fork());
                 FibTask f = new FibTask(8);
-                f.fork();
+                threadAssertSame(f, f.fork());
                 threadAssertTrue(pollTask() == f);
                 helpQuiesce();
                 threadAssertFalse(f.isDone());
@@ -818,7 +838,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        singletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(singletonPool(), a));
     }
 
     /**
@@ -828,17 +848,17 @@ public class RecursiveTaskTest extends J
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FibTask g = new FibTask(9);
-                g.fork();
+                threadAssertSame(g, g.fork());
                 FibTask f = new FibTask(8);
-                f.fork();
+                threadAssertSame(f, f.fork());
                 threadAssertTrue(peekNextLocalTask() == g);
-                f.join();
+                threadAssertEquals(21, (int) f.join());
                 helpQuiesce();
                 threadAssertTrue(f.isDone());
                 return NoResult;
             }
         };
-        asyncSingletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(asyncSingletonPool(), a));
     }
 
     /**
@@ -849,9 +869,9 @@ public class RecursiveTaskTest extends J
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FibTask g = new FibTask(9);
-                g.fork();
+                threadAssertSame(g, g.fork());
                 FibTask f = new FibTask(8);
-                f.fork();
+                threadAssertSame(f, f.fork());
                 threadAssertTrue(pollNextLocalTask() == g);
                 helpQuiesce();
                 threadAssertTrue(f.isDone());
@@ -859,7 +879,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        asyncSingletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(asyncSingletonPool(), a));
     }
 
     /**
@@ -870,9 +890,9 @@ public class RecursiveTaskTest extends J
         RecursiveTask<Integer> a = new RecursiveTask<Integer>() {
             public Integer compute() {
                 FibTask g = new FibTask(9);
-                g.fork();
+                threadAssertSame(g, g.fork());
                 FibTask f = new FibTask(8);
-                f.fork();
+                threadAssertSame(f, f.fork());
                 threadAssertTrue(pollTask() == g);
                 helpQuiesce();
                 threadAssertTrue(f.isDone());
@@ -880,7 +900,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        asyncSingletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(asyncSingletonPool(), a));
     }
 
 }