--- jsr166/src/test/tck/RecursiveTaskTest.java	2010/11/21 08:35:40	1.21
+++ jsr166/src/test/tck/RecursiveTaskTest.java	2011/02/22 01:18:59	1.26
@@ -8,6 +8,7 @@ import junit.framework.*;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.concurrent.RecursiveTask;
 import java.util.concurrent.TimeUnit;
@@ -59,7 +60,7 @@ public class RecursiveTaskTest extends J
         assertNull(a.getException());
         assertNull(a.getRawResult());
 
-        if (! (Thread.currentThread() instanceof ForkJoinWorkerThread)) {
+        if (! ForkJoinTask.inForkJoinPool()) {
             Thread.currentThread().interrupt();
             try {
                 a.get();
@@ -90,6 +91,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,38 +148,40 @@ 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());
+        assertSame(t.getClass(), a.getException().getClass());
         assertNull(a.getRawResult());
+        assertFalse(a.cancel(false));
+        assertFalse(a.cancel(true));
 
         try {
             a.join();
             shouldThrow();
         } catch (Throwable expected) {
-            assertSame(t, expected);
+            assertSame(t.getClass(), expected.getClass());
         }
 
         try {
             a.get();
             shouldThrow();
         } catch (ExecutionException success) {
-            assertSame(t, success.getCause());
+            assertSame(t.getClass(), success.getCause().getClass());
         } catch (Throwable fail) { threadUnexpectedException(fail); }
 
         try {
             a.get(5L, SECONDS);
             shouldThrow();
         } catch (ExecutionException success) {
-            assertSame(t, success.getCause());
+            assertSame(t.getClass(), success.getCause().getClass());
         } catch (Throwable fail) { threadUnexpectedException(fail); }
     }
 
-    static final class FJException extends RuntimeException {
-        FJException() { super(); }
+    public static final class FJException extends RuntimeException {
+        public FJException() { super(); }
     }
 
     // An invalid return value for Fib
@@ -344,7 +349,7 @@ public class RecursiveTaskTest extends J
                     f.invoke();
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(f, success);
+                    checkCompletedAbnormally(f, success);
                 }
                 return NoResult;
             }};
@@ -360,7 +365,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 +383,7 @@ public class RecursiveTaskTest extends J
                     Integer r = f.join();
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(f, success);
+                    checkCompletedAbnormally(f, success);
                 }
                 return NoResult;
             }};
@@ -397,7 +402,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 +423,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 +442,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 +586,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());
@@ -594,7 +603,7 @@ public class RecursiveTaskTest extends J
                 return NoResult;
             }
         };
-        a.invoke();
+        assertSame(NoResult, a.invoke());
     }
 
     /**
@@ -633,7 +642,7 @@ public class RecursiveTaskTest extends J
                         f.invoke();
                         shouldThrow();
                     } catch (FJException success) {
-                        checkTaskThrew(f, success);
+                        checkCompletedAbnormally(f, success);
                     }
                     f.reinitialize();
                     checkNotDone(f);
@@ -655,7 +664,7 @@ public class RecursiveTaskTest extends J
                     Integer r = f.invoke();
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(f, success);
+                    checkCompletedAbnormally(f, success);
                 }
                 return NoResult;
             }};
@@ -785,7 +794,7 @@ public class RecursiveTaskTest extends J
                     invokeAll(f, g);
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(g, success);
+                    checkCompletedAbnormally(g, success);
                 }
                 return NoResult;
             }};
@@ -803,7 +812,7 @@ public class RecursiveTaskTest extends J
                     invokeAll(g);
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(g, success);
+                    checkCompletedAbnormally(g, success);
                 }
                 return NoResult;
             }};
@@ -823,7 +832,7 @@ public class RecursiveTaskTest extends J
                     invokeAll(f, g, h);
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(g, success);
+                    checkCompletedAbnormally(g, success);
                 }
                 return NoResult;
             }};
@@ -847,7 +856,7 @@ public class RecursiveTaskTest extends J
                     invokeAll(set);
                     shouldThrow();
                 } catch (FJException success) {
-                    checkTaskThrew(f, success);
+                    checkCompletedAbnormally(f, success);
                 }
                 return NoResult;
             }};
@@ -889,6 +898,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);