--- jsr166/src/test/tck/ForkJoinPoolTest.java 2010/11/18 19:04:17 1.33 +++ jsr166/src/test/tck/ForkJoinPoolTest.java 2010/11/18 19:14:34 1.34 @@ -374,8 +374,9 @@ public class ForkJoinPoolTest extends JS TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS); assertFalse(task.isDone()); Future future = e.submit(task); - future.get(); + assertNull(future.get()); assertTrue(task.isDone()); + assertFalse(future.isCancelled()); } finally { joinPool(e); } @@ -389,8 +390,9 @@ public class ForkJoinPoolTest extends JS ExecutorService e = new ForkJoinPool(1); try { Future future = e.submit(new StringTask()); - String result = future.get(); - assertSame(TEST_STRING, result); + assertSame(TEST_STRING, future.get()); + assertTrue(future.isDone()); + assertFalse(future.isCancelled()); } finally { joinPool(e); } @@ -403,8 +405,9 @@ public class ForkJoinPoolTest extends JS ExecutorService e = new ForkJoinPool(1); try { Future future = e.submit(new NoOpRunnable()); - future.get(); + assertNull(future.get()); assertTrue(future.isDone()); + assertFalse(future.isCancelled()); } finally { joinPool(e); } @@ -417,8 +420,9 @@ public class ForkJoinPoolTest extends JS ExecutorService e = new ForkJoinPool(1); try { Future future = e.submit(new NoOpRunnable(), TEST_STRING); - String result = future.get(); - assertSame(TEST_STRING, result); + assertSame(TEST_STRING, future.get()); + assertTrue(future.isDone()); + assertFalse(future.isCancelled()); } finally { joinPool(e); }