--- jsr166/src/test/tck/RecursiveActionTest.java	2010/11/21 08:35:40	1.20
+++ jsr166/src/test/tck/RecursiveActionTest.java	2010/11/21 20:32:15	1.22
@@ -90,6 +90,8 @@ public class RecursiveActionTest extends
         assertNull(a.getException());
         assertNull(a.getRawResult());
         assertNull(a.join());
+        assertFalse(a.cancel(false));
+        assertFalse(a.cancel(true));
         try {
             assertNull(a.get());
         } catch (Throwable fail) { threadUnexpectedException(fail); }
@@ -125,13 +127,15 @@ public class RecursiveActionTest extends
         } catch (Throwable fail) { threadUnexpectedException(fail); }
     }
 
-    void checkTaskThrew(RecursiveAction a, Throwable t) {
+    void checkCompletedAbnormally(RecursiveAction 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();
@@ -333,7 +337,7 @@ public class RecursiveActionTest extends
                     f.invoke();
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(f, success);
+                    checkCompletedAbnormally(f, success);
                 }
             }};
         testInvokeOnPool(mainPool(), a);
@@ -348,7 +352,7 @@ public class RecursiveActionTest extends
                 FailingFibAction f = new FailingFibAction(8);
                 f.quietlyInvoke();
                 assertTrue(f.getException() instanceof FJException);
-                checkTaskThrew(f, f.getException());
+                checkCompletedAbnormally(f, f.getException());
             }};
         testInvokeOnPool(mainPool(), a);
     }
@@ -365,7 +369,7 @@ public class RecursiveActionTest extends
                     f.join();
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(f, success);
+                    checkCompletedAbnormally(f, success);
                 }
             }};
         testInvokeOnPool(mainPool(), a);
@@ -383,7 +387,9 @@ public class RecursiveActionTest extends
                     f.get();
                     shouldThrow();
                 } catch (ExecutionException success) {
-                    checkTaskThrew(f, success.getCause());
+                    Throwable cause = success.getCause();
+                    assertTrue(cause instanceof FJException);
+                    checkCompletedAbnormally(f, cause);
                 }
             }};
         testInvokeOnPool(mainPool(), a);
@@ -401,7 +407,9 @@ public class RecursiveActionTest extends
                     f.get(5L, TimeUnit.SECONDS);
                     shouldThrow();
                 } catch (ExecutionException success) {
-                    checkTaskThrew(f, success.getCause());
+                    Throwable cause = success.getCause();
+                    assertTrue(cause instanceof FJException);
+                    checkCompletedAbnormally(f, cause);
                 }
             }};
         testInvokeOnPool(mainPool(), a);
@@ -417,7 +425,7 @@ public class RecursiveActionTest extends
                 assertSame(f, f.fork());
                 f.quietlyJoin();
                 assertTrue(f.getException() instanceof FJException);
-                checkTaskThrew(f, f.getException());
+                checkCompletedAbnormally(f, f.getException());
             }};
         testInvokeOnPool(mainPool(), a);
     }
@@ -630,7 +638,7 @@ public class RecursiveActionTest extends
                     f.invoke();
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(f, success);
+                    checkCompletedAbnormally(f, success);
                 }
             }};
         testInvokeOnPool(mainPool(), a);
@@ -762,7 +770,7 @@ public class RecursiveActionTest extends
                     invokeAll(f, g);
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(g, success);
+                    checkCompletedAbnormally(g, success);
                 }
             }};
         testInvokeOnPool(mainPool(), a);
@@ -779,7 +787,7 @@ public class RecursiveActionTest extends
                     invokeAll(g);
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(g, success);
+                    checkCompletedAbnormally(g, success);
                 }
             }};
         testInvokeOnPool(mainPool(), a);
@@ -798,7 +806,7 @@ public class RecursiveActionTest extends
                     invokeAll(f, g, h);
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(g, success);
+                    checkCompletedAbnormally(g, success);
                 }
             }};
         testInvokeOnPool(mainPool(), a);
@@ -821,7 +829,7 @@ public class RecursiveActionTest extends
                     invokeAll(set);
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(f, success);
+                    checkCompletedAbnormally(f, success);
                 }
             }};
         testInvokeOnPool(mainPool(), a);
@@ -861,6 +869,7 @@ public class RecursiveActionTest extends
                 assertSame(f, f.fork());
                 assertTrue(getSurplusQueuedTaskCount() > 0);
                 helpQuiesce();
+                assertEquals(0, getSurplusQueuedTaskCount());
                 checkCompletedNormally(f);
                 checkCompletedNormally(g);
                 checkCompletedNormally(h);