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.40 by jsr166, Wed Dec 31 19:05:43 2014 UTC vs.
Revision 1.43 by jsr166, Sun Feb 22 19:16:38 2015 UTC

# Line 17 | Line 17 | import java.util.concurrent.RecursiveAct
17   import java.util.concurrent.SynchronousQueue;
18   import java.util.concurrent.ThreadLocalRandom;
19   import java.util.concurrent.TimeoutException;
20 import java.util.concurrent.TimeUnit;
20  
21   import junit.framework.Test;
22   import junit.framework.TestSuite;
# Line 505 | Line 504 | public class RecursiveActionTest extends
504                  FibAction f = new FibAction(8);
505                  assertSame(f, f.fork());
506                  helpQuiesce();
507 +                while (!f.isDone()) // wait out race
508 +                    ;
509                  assertEquals(21, f.result);
510                  assertEquals(0, getQueuedTaskCount());
511                  checkCompletedNormally(f);
# Line 590 | Line 591 | public class RecursiveActionTest extends
591                  FailingFibAction f = new FailingFibAction(8);
592                  assertSame(f, f.fork());
593                  try {
594 <                    f.get(5L, TimeUnit.SECONDS);
594 >                    f.get(5L, SECONDS);
595                      shouldThrow();
596                  } catch (ExecutionException success) {
597                      Throwable cause = success.getCause();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines