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

Comparing jsr166/src/test/tck/RecursiveActionTest.java (file contents):
Revision 1.39 by jsr166, Mon Jun 3 17:55:49 2013 UTC vs.
Revision 1.46 by jsr166, Sun Oct 18 04:48:32 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.SECONDS;
8 >
9 > import java.util.Arrays;
10 > import java.util.HashSet;
11   import java.util.concurrent.CancellationException;
9 – import java.util.concurrent.SynchronousQueue;
12   import java.util.concurrent.ExecutionException;
13   import java.util.concurrent.ForkJoinPool;
14   import java.util.concurrent.ForkJoinTask;
15   import java.util.concurrent.ForkJoinWorkerThread;
16   import java.util.concurrent.RecursiveAction;
17 + import java.util.concurrent.SynchronousQueue;
18   import java.util.concurrent.ThreadLocalRandom;
16 – import java.util.concurrent.TimeUnit;
19   import java.util.concurrent.TimeoutException;
20 < import static java.util.concurrent.TimeUnit.SECONDS;
21 < import java.util.Arrays;
22 < import java.util.HashSet;
20 >
21 > import junit.framework.Test;
22 > import junit.framework.TestSuite;
23  
24   public class RecursiveActionTest extends JSR166TestCase {
25  
26      public static void main(String[] args) {
27 <        junit.textui.TestRunner.run(suite());
27 >        main(suite(), args);
28      }
29  
30      public static Test suite() {
# Line 44 | Line 46 | public class RecursiveActionTest extends
46      }
47  
48      private void testInvokeOnPool(ForkJoinPool pool, RecursiveAction a) {
49 <        try {
49 >        try (PoolCleaner cleaner = cleaner(pool)) {
50              checkNotDone(a);
51  
52              assertNull(pool.invoke(a));
53  
54              checkCompletedNormally(a);
53 –        } finally {
54 –            joinPool(pool);
55          }
56      }
57  
# Line 423 | Line 423 | public class RecursiveActionTest extends
423  
424          t = newStartedThread(r);
425          testInvokeOnPool(mainPool(), a);
426 <        awaitTermination(t, LONG_DELAY_MS);
426 >        awaitTermination(t);
427  
428          a.reinitialize();
429          t = newStartedThread(r);
430          testInvokeOnPool(singletonPool(), a);
431 <        awaitTermination(t, LONG_DELAY_MS);
431 >        awaitTermination(t);
432      }
433  
434      /**
# Line 502 | Line 502 | public class RecursiveActionTest extends
502                  FibAction f = new FibAction(8);
503                  assertSame(f, f.fork());
504                  helpQuiesce();
505 +                while (!f.isDone()) // wait out race
506 +                    ;
507                  assertEquals(21, f.result);
508                  assertEquals(0, getQueuedTaskCount());
509                  checkCompletedNormally(f);
# Line 587 | Line 589 | public class RecursiveActionTest extends
589                  FailingFibAction f = new FailingFibAction(8);
590                  assertSame(f, f.fork());
591                  try {
592 <                    f.get(5L, TimeUnit.SECONDS);
592 >                    f.get(5L, SECONDS);
593                      shouldThrow();
594                  } catch (ExecutionException success) {
595                      Throwable cause = success.getCause();

Diff Legend

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