--- jsr166/src/test/tck/RecursiveTaskTest.java	2010/11/21 08:25:10	1.20
+++ jsr166/src/test/tck/RecursiveTaskTest.java	2010/11/21 20:32:15	1.23
@@ -90,6 +90,8 @@ public class RecursiveTaskTest extends J
         assertNull(a.getException());
         assertSame(expected, a.getRawResult());
         assertSame(expected, a.join());
+        assertFalse(a.cancel(false));
+        assertFalse(a.cancel(true));
         try {
             assertSame(expected, a.get());
         } catch (Throwable fail) { threadUnexpectedException(fail); }
@@ -145,13 +147,15 @@ public class RecursiveTaskTest extends J
         } catch (Throwable fail) { threadUnexpectedException(fail); }
     }
 
-    void checkTaskThrew(RecursiveTask a, Throwable t) {
+    void checkCompletedAbnormally(RecursiveTask a, Throwable t) {
         assertTrue(a.isDone());
         assertFalse(a.isCancelled());
         assertFalse(a.isCompletedNormally());
         assertTrue(a.isCompletedAbnormally());
         assertSame(t, a.getException());
         assertNull(a.getRawResult());
+        assertFalse(a.cancel(false));
+        assertFalse(a.cancel(true));
 
         try {
             a.join();
@@ -344,7 +348,7 @@ public class RecursiveTaskTest extends J
                     f.invoke();
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(f, success);
+                    checkCompletedAbnormally(f, success);
                 }
                 return NoResult;
             }};
@@ -360,7 +364,7 @@ public class RecursiveTaskTest extends J
                 FailingFibTask f = new FailingFibTask(8);
                 f.quietlyInvoke();
                 assertTrue(f.getException() instanceof FJException);
-                checkTaskThrew(f, f.getException());
+                checkCompletedAbnormally(f, f.getException());
                 return NoResult;
             }};
         assertSame(NoResult, testInvokeOnPool(mainPool(), a));
@@ -378,7 +382,7 @@ public class RecursiveTaskTest extends J
                     Integer r = f.join();
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(f, success);
+                    checkCompletedAbnormally(f, success);
                 }
                 return NoResult;
             }};
@@ -397,7 +401,9 @@ public class RecursiveTaskTest extends J
                     Integer r = f.get();
                     shouldThrow();
                 } catch (ExecutionException success) {
-                    checkTaskThrew(f, success.getCause());
+                    Throwable cause = success.getCause();
+                    assertTrue(cause instanceof FJException);
+                    checkCompletedAbnormally(f, cause);
                 }
                 return NoResult;
             }};
@@ -416,7 +422,9 @@ public class RecursiveTaskTest extends J
                     Integer r = f.get(5L, SECONDS);
                     shouldThrow();
                 } catch (ExecutionException success) {
-                    checkTaskThrew(f, success.getCause());
+                    Throwable cause = success.getCause();
+                    assertTrue(cause instanceof FJException);
+                    checkCompletedAbnormally(f, cause);
                 }
                 return NoResult;
             }};
@@ -433,7 +441,7 @@ public class RecursiveTaskTest extends J
                 assertSame(f, f.fork());
                 f.quietlyJoin();
                 assertTrue(f.getException() instanceof FJException);
-                checkTaskThrew(f, f.getException());
+                checkCompletedAbnormally(f, f.getException());
                 return NoResult;
             }};
         assertSame(NoResult, testInvokeOnPool(mainPool(), a));
@@ -577,7 +585,7 @@ public class RecursiveTaskTest extends J
     public void testInForkJoinPool2() {
         RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
             public Integer realCompute() {
-                assertTrue(!inForkJoinPool());
+                assertFalse(inForkJoinPool());
                 return NoResult;
             }};
         assertSame(NoResult, a.invoke());
@@ -633,7 +641,7 @@ public class RecursiveTaskTest extends J
                         f.invoke();
                         shouldThrow();
                     } catch (FJException success) {
-                        checkTaskThrew(f, success);
+                        checkCompletedAbnormally(f, success);
                     }
                     f.reinitialize();
                     checkNotDone(f);
@@ -655,7 +663,7 @@ public class RecursiveTaskTest extends J
                     Integer r = f.invoke();
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(f, success);
+                    checkCompletedAbnormally(f, success);
                 }
                 return NoResult;
             }};
@@ -687,8 +695,8 @@ public class RecursiveTaskTest extends J
                 FibTask f = new FibTask(8);
                 FibTask g = new FibTask(9);
                 invokeAll(f, g);
-                checkCompletesNormally(f, 21);
-                checkCompletesNormally(g, 34);
+                checkCompletedNormally(f, 21);
+                checkCompletedNormally(g, 34);
                 return NoResult;
             }};
         assertSame(NoResult, testInvokeOnPool(mainPool(), a));
@@ -702,7 +710,7 @@ public class RecursiveTaskTest extends J
             public Integer realCompute() {
                 FibTask f = new FibTask(8);
                 invokeAll(f);
-                checkCompletesNormally(f, 21);
+                checkCompletedNormally(f, 21);
                 return NoResult;
             }};
         assertSame(NoResult, testInvokeOnPool(mainPool(), a));
@@ -718,9 +726,12 @@ public class RecursiveTaskTest extends J
                 FibTask g = new FibTask(9);
                 FibTask h = new FibTask(7);
                 invokeAll(f, g, h);
-                checkCompletesNormally(f, 21);
-                checkCompletesNormally(g, 34);
-                checkCompletesNormally(h, 13);
+                assertTrue(f.isDone());
+                assertTrue(g.isDone());
+                assertTrue(h.isDone());
+                checkCompletedNormally(f, 21);
+                checkCompletedNormally(g, 34);
+                checkCompletedNormally(h, 13);
                 return NoResult;
             }};
         assertSame(NoResult, testInvokeOnPool(mainPool(), a));
@@ -740,9 +751,12 @@ public class RecursiveTaskTest extends J
                 set.add(g);
                 set.add(h);
                 invokeAll(set);
-                checkCompletesNormally(f, 21);
-                checkCompletesNormally(g, 34);
-                checkCompletesNormally(h, 13);
+                assertTrue(f.isDone());
+                assertTrue(g.isDone());
+                assertTrue(h.isDone());
+                checkCompletedNormally(f, 21);
+                checkCompletedNormally(g, 34);
+                checkCompletedNormally(h, 13);
                 return NoResult;
             }};
         assertSame(NoResult, testInvokeOnPool(mainPool(), a));
@@ -779,7 +793,7 @@ public class RecursiveTaskTest extends J
                     invokeAll(f, g);
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(g, success);
+                    checkCompletedAbnormally(g, success);
                 }
                 return NoResult;
             }};
@@ -797,7 +811,7 @@ public class RecursiveTaskTest extends J
                     invokeAll(g);
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(g, success);
+                    checkCompletedAbnormally(g, success);
                 }
                 return NoResult;
             }};
@@ -817,7 +831,7 @@ public class RecursiveTaskTest extends J
                     invokeAll(f, g, h);
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(g, success);
+                    checkCompletedAbnormally(g, success);
                 }
                 return NoResult;
             }};
@@ -841,7 +855,7 @@ public class RecursiveTaskTest extends J
                     invokeAll(set);
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(f, success);
+                    checkCompletedAbnormally(f, success);
                 }
                 return NoResult;
             }};
@@ -883,6 +897,7 @@ public class RecursiveTaskTest extends J
                 assertSame(f, f.fork());
                 assertTrue(getSurplusQueuedTaskCount() > 0);
                 helpQuiesce();
+                assertEquals(0, getSurplusQueuedTaskCount());
                 checkCompletedNormally(f, 21);
                 checkCompletedNormally(g, 34);
                 checkCompletedNormally(h, 13);