--- jsr166/src/test/tck/ForkJoinTaskTest.java 2010/11/21 19:06:53 1.24 +++ jsr166/src/test/tck/ForkJoinTaskTest.java 2010/11/22 07:40:24 1.26 @@ -94,6 +94,8 @@ public class ForkJoinTaskTest extends JS 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); } @@ -109,6 +111,8 @@ public class ForkJoinTaskTest extends JS assertTrue(a.isCompletedAbnormally()); assertTrue(a.getException() instanceof CancellationException); assertNull(a.getRawResult()); + assertTrue(a.cancel(false)); + assertTrue(a.cancel(true)); try { a.join(); @@ -136,6 +140,8 @@ public class ForkJoinTaskTest extends JS assertTrue(a.isCompletedAbnormally()); assertSame(t, a.getException()); assertNull(a.getRawResult()); + assertFalse(a.cancel(false)); + assertFalse(a.cancel(true)); try { a.join(); @@ -343,7 +349,7 @@ public class ForkJoinTaskTest extends JS /** * invoke returns when task completes normally. * isCompletedAbnormally and isCancelled return false for normally - * completed tasks. getRawResult of a RecursiveAction returns null; + * completed tasks; getRawResult returns null. */ public void testInvoke() { RecursiveAction a = new CheckedRecursiveAction() { @@ -1069,7 +1075,7 @@ public class ForkJoinTaskTest extends JS /** * invoke returns when task completes normally. * isCompletedAbnormally and isCancelled return false for normally - * completed tasks. getRawResult of a RecursiveAction returns null; + * completed tasks; getRawResult returns null. */ public void testInvokeSingleton() { RecursiveAction a = new CheckedRecursiveAction() {