--- jsr166/src/test/tck/RecursiveTaskTest.java	2010/08/11 19:50:02	1.9
+++ jsr166/src/test/tck/RecursiveTaskTest.java	2010/09/13 07:51:18	1.13
@@ -3,25 +3,41 @@
  * 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.*;
 
-
 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 +80,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 +94,7 @@ public class RecursiveTaskTest extends J
                 return r;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -100,7 +115,7 @@ public class RecursiveTaskTest extends J
                 return r;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -117,7 +132,7 @@ public class RecursiveTaskTest extends J
                 return r;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -139,7 +154,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -161,7 +176,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -179,7 +194,7 @@ public class RecursiveTaskTest extends J
                 return r;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
 
@@ -200,7 +215,7 @@ public class RecursiveTaskTest extends J
                 return r;
             }
         };
-        assertTrue(mainPool.invoke(a) == 21);
+        assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
     }
 
 
@@ -220,7 +235,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -235,7 +250,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -255,7 +270,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -277,7 +292,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -299,7 +314,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -317,7 +332,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -337,7 +352,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -358,7 +373,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -381,7 +396,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -404,7 +419,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -423,20 +438,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));
     }
 
     /**
@@ -462,7 +478,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -488,7 +504,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        assertEquals(a.invoke(), NoResult);
+        assertSame(NoResult, a.invoke());
     }
 
     /**
@@ -509,7 +525,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -529,7 +545,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -546,7 +562,7 @@ public class RecursiveTaskTest extends J
                 return r;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -565,7 +581,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -581,7 +597,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -603,7 +619,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -629,7 +645,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
 
@@ -650,7 +666,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -669,7 +685,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -690,7 +706,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -715,7 +731,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        mainPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(mainPool(), a));
     }
 
     /**
@@ -736,7 +752,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        singletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(singletonPool(), a));
     }
 
     /**
@@ -757,7 +773,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        singletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(singletonPool(), a));
     }
 
     /**
@@ -777,7 +793,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        singletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(singletonPool(), a));
     }
 
     /**
@@ -797,12 +813,11 @@ public class RecursiveTaskTest extends J
                 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>() {
@@ -818,7 +833,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        singletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(singletonPool(), a));
     }
 
     /**
@@ -838,7 +853,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        asyncSingletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(asyncSingletonPool(), a));
     }
 
     /**
@@ -859,7 +874,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        asyncSingletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(asyncSingletonPool(), a));
     }
 
     /**
@@ -880,7 +895,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        asyncSingletonPool.invoke(a);
+        assertSame(NoResult, testInvokeOnPool(asyncSingletonPool(), a));
     }
 
 }