ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ForkJoinPool8Test.java
(Generate patch)

Comparing jsr166/src/test/tck/ForkJoinPool8Test.java (file contents):
Revision 1.30 by jsr166, Sat Apr 25 04:55:30 2015 UTC vs.
Revision 1.32 by jsr166, Tue Oct 13 21:07:54 2015 UTC

# Line 1489 | Line 1489 | public class ForkJoinPool8Test extends J
1489       */
1490      public void testAwaitQuiescence1() throws Exception {
1491          final ForkJoinPool p = new ForkJoinPool();
1492 <        try {
1492 >        try (PoolCleaner cleaner = cleaner(p)) {
1493              final long startTime = System.nanoTime();
1494              assertTrue(p.isQuiescent());
1495              ForkJoinTask a = new CheckedRecursiveAction() {
# Line 1520 | Line 1520 | public class ForkJoinPool8Test extends J
1520                  assertFalse(p.isTerminated());
1521                  Thread.yield();
1522              }
1523 –            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1523              assertEquals(0, p.getQueuedTaskCount());
1524              assertFalse(p.getAsyncMode());
1526 –            assertEquals(0, p.getActiveThreadCount());
1527 –            assertEquals(0, p.getQueuedTaskCount());
1525              assertEquals(0, p.getQueuedSubmissionCount());
1526              assertFalse(p.hasQueuedSubmissions());
1527 +            while (p.getActiveThreadCount() != 0
1528 +                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
1529 +                Thread.yield();
1530              assertFalse(p.isShutdown());
1531              assertFalse(p.isTerminating());
1532              assertFalse(p.isTerminated());
1533 <        } finally {
1534 <            joinPool(p);
1533 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1534          }
1535      }
1536  
# Line 1549 | Line 1548 | public class ForkJoinPool8Test extends J
1548               "java.util.concurrent.ForkJoinPool.common.parallelism")))
1549              return;
1550          final ForkJoinPool p = new ForkJoinPool();
1551 <        try {
1551 >        try (PoolCleaner cleaner = cleaner(p)) {
1552              assertTrue(p.isQuiescent());
1553              final long startTime = System.nanoTime();
1554              ForkJoinTask a = new CheckedRecursiveAction() {
# Line 1570 | Line 1569 | public class ForkJoinPool8Test extends J
1569                  }};
1570              p.execute(a);
1571              assertTrue(p.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS));
1573 –            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1572              assertTrue(p.isQuiescent());
1573              assertTrue(a.isDone());
1574              assertEquals(0, p.getQueuedTaskCount());
1575              assertFalse(p.getAsyncMode());
1578 –            assertEquals(0, p.getActiveThreadCount());
1579 –            assertEquals(0, p.getQueuedTaskCount());
1576              assertEquals(0, p.getQueuedSubmissionCount());
1577              assertFalse(p.hasQueuedSubmissions());
1578 +            while (p.getActiveThreadCount() != 0
1579 +                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
1580 +                Thread.yield();
1581              assertFalse(p.isShutdown());
1582              assertFalse(p.isTerminating());
1583              assertFalse(p.isTerminated());
1584 <        } finally {
1586 <            joinPool(p);
1584 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1585          }
1586      }
1587  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines