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.28 by jsr166, Wed Dec 31 16:44:01 2014 UTC vs.
Revision 1.31 by jsr166, Sun Oct 4 07:26:09 2015 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 < import junit.framework.*;
7 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
8 > import static java.util.concurrent.TimeUnit.SECONDS;
9 >
10 > import java.util.HashSet;
11   import java.util.concurrent.CancellationException;
12 + import java.util.concurrent.CountedCompleter;
13   import java.util.concurrent.ExecutionException;
14   import java.util.concurrent.ForkJoinPool;
15   import java.util.concurrent.ForkJoinTask;
16   import java.util.concurrent.RecursiveAction;
13 – import java.util.concurrent.CountedCompleter;
17   import java.util.concurrent.TimeoutException;
18 < import static java.util.concurrent.TimeUnit.SECONDS;
19 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
20 < import java.util.HashSet;
18 >
19 > import junit.framework.Test;
20 > import junit.framework.TestSuite;
21  
22   public class ForkJoinPool8Test extends JSR166TestCase {
23      public static void main(String[] args) {
24 <        junit.textui.TestRunner.run(suite());
24 >        main(suite(), args);
25      }
26  
27      public static Test suite() {
# Line 1486 | 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 1527 | Line 1530 | public class ForkJoinPool8Test extends J
1530              assertFalse(p.isShutdown());
1531              assertFalse(p.isTerminating());
1532              assertFalse(p.isTerminated());
1530 –        } finally {
1531 –            joinPool(p);
1533          }
1534      }
1535  
# Line 1546 | Line 1547 | public class ForkJoinPool8Test extends J
1547               "java.util.concurrent.ForkJoinPool.common.parallelism")))
1548              return;
1549          final ForkJoinPool p = new ForkJoinPool();
1550 <        try {
1550 >        try (PoolCleaner cleaner = cleaner(p)) {
1551              assertTrue(p.isQuiescent());
1552              final long startTime = System.nanoTime();
1553              ForkJoinTask a = new CheckedRecursiveAction() {
# Line 1579 | Line 1580 | public class ForkJoinPool8Test extends J
1580              assertFalse(p.isShutdown());
1581              assertFalse(p.isTerminating());
1582              assertFalse(p.isTerminated());
1582 –        } finally {
1583 –            joinPool(p);
1583          }
1584      }
1585  

Diff Legend

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