--- jsr166/src/test/tck/ForkJoinPool8Test.java 2013/09/17 02:17:11 1.22 +++ jsr166/src/test/tck/ForkJoinPool8Test.java 2013/09/22 01:42:44 1.23 @@ -1502,26 +1502,26 @@ public class ForkJoinPool8Test extends J assertTrue(quiescent); assertFalse(p.isQuiescent()); while (!f.isDone()) { - assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); assertFalse(p.getAsyncMode()); assertFalse(p.isShutdown()); assertFalse(p.isTerminating()); assertFalse(p.isTerminated()); Thread.yield(); } + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); assertFalse(p.isQuiescent()); assertEquals(0, ForkJoinTask.getQueuedTaskCount()); assertEquals(21, f.result); }}; p.execute(a); while (!a.isDone() || !p.isQuiescent()) { - assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); assertFalse(p.getAsyncMode()); assertFalse(p.isShutdown()); assertFalse(p.isTerminating()); assertFalse(p.isTerminated()); Thread.yield(); } + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); assertEquals(0, p.getQueuedTaskCount()); assertFalse(p.getAsyncMode()); assertEquals(0, p.getActiveThreadCount()); @@ -1552,13 +1552,13 @@ public class ForkJoinPool8Test extends J assertSame(f, f.fork()); ForkJoinTask.helpQuiesce(); while (!f.isDone()) { - assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); assertFalse(p.getAsyncMode()); assertFalse(p.isShutdown()); assertFalse(p.isTerminating()); assertFalse(p.isTerminated()); Thread.yield(); } + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); assertEquals(0, ForkJoinTask.getQueuedTaskCount()); assertEquals(21, f.result); }}; @@ -1566,13 +1566,13 @@ public class ForkJoinPool8Test extends J if (a.isDone() || p.isQuiescent()) continue; // Already done so cannot test; retry while (!p.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS)) { - assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); assertFalse(p.getAsyncMode()); assertFalse(p.isShutdown()); assertFalse(p.isTerminating()); assertFalse(p.isTerminated()); Thread.yield(); } + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); assertTrue(p.isQuiescent()); assertTrue(a.isDone()); assertEquals(0, p.getQueuedTaskCount());