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

Comparing jsr166/src/test/tck/RecursiveTaskTest.java (file contents):
Revision 1.36 by jsr166, Mon May 29 19:15:02 2017 UTC vs.
Revision 1.41 by jsr166, Mon Dec 16 22:55:54 2019 UTC

# Line 82 | Line 82 | public class RecursiveTaskTest extends J
82          } catch (Throwable fail) { threadUnexpectedException(fail); }
83      }
84  
85 <    <T> void checkCompletedNormally(RecursiveTask<T> a, T expected) {
85 >    <T> void checkCompletedNormally(RecursiveTask<T> a, T expectedValue) {
86          assertTrue(a.isDone());
87          assertFalse(a.isCancelled());
88          assertTrue(a.isCompletedNormally());
89          assertFalse(a.isCompletedAbnormally());
90          assertNull(a.getException());
91 <        assertSame(expected, a.getRawResult());
92 <        assertSame(expected, a.join());
91 >        assertSame(expectedValue, a.getRawResult());
92 >        assertSame(expectedValue, a.join());
93          assertFalse(a.cancel(false));
94          assertFalse(a.cancel(true));
95 +
96 +        T v1 = null, v2 = null;
97          try {
98 <            assertSame(expected, a.get());
99 <            assertSame(expected, a.get(randomTimeout(), randomTimeUnit()));
98 >            v1 = a.get();
99 >            v2 = a.get(randomTimeout(), randomTimeUnit());
100          } catch (Throwable fail) { threadUnexpectedException(fail); }
101 +        assertSame(expectedValue, v1);
102 +        assertSame(expectedValue, v2);
103      }
104  
105      /**
106       * Waits for the task to complete, and checks that when it does,
107       * it will have an Integer result equals to the given int.
108       */
109 <    void checkCompletesNormally(RecursiveTask<Integer> a, int expected) {
109 >    void checkCompletesNormally(RecursiveTask<Integer> a, int expectedValue) {
110          Integer r = a.join();
111 <        assertEquals(expected, (int) r);
111 >        assertEquals(expectedValue, (int) r);
112          checkCompletedNormally(a, r);
113      }
114  
# Line 112 | Line 116 | public class RecursiveTaskTest extends J
116       * Like checkCompletesNormally, but verifies that the task has
117       * already completed.
118       */
119 <    void checkCompletedNormally(RecursiveTask<Integer> a, int expected) {
119 >    void checkCompletedNormally(RecursiveTask<Integer> a, int expectedValue) {
120          Integer r = a.getRawResult();
121 <        assertEquals(expected, (int) r);
121 >        assertEquals(expectedValue, (int) r);
122          checkCompletedNormally(a, r);
123      }
124  
# Line 194 | Line 198 | public class RecursiveTaskTest extends J
198                  return n;
199              FibTask f1 = new FibTask(n - 1);
200              f1.fork();
201 <            return (new FibTask(n - 2)).compute() + f1.join();
201 >            return new FibTask(n - 2).compute() + f1.join();
202          }
203  
204          public void publicSetRawResult(Integer result) {
# Line 213 | Line 217 | public class RecursiveTaskTest extends J
217                  throw new FJException();
218              FailingFibTask f1 = new FailingFibTask(n - 1);
219              f1.fork();
220 <            return (new FibTask(n - 2)).compute() + f1.join();
220 >            return new FibTask(n - 2).compute() + f1.join();
221          }
222      }
223  
# Line 377 | Line 381 | public class RecursiveTaskTest extends J
381                  FailingFibTask f = new FailingFibTask(8);
382                  assertSame(f, f.fork());
383                  try {
384 <                    Integer r = f.join();
384 >                    f.join();
385                      shouldThrow();
386                  } catch (FJException success) {
387                      checkCompletedAbnormally(f, success);
# Line 396 | Line 400 | public class RecursiveTaskTest extends J
400                  FailingFibTask f = new FailingFibTask(8);
401                  assertSame(f, f.fork());
402                  try {
403 <                    Integer r = f.get();
403 >                    f.get();
404                      shouldThrow();
405                  } catch (ExecutionException success) {
406                      Throwable cause = success.getCause();
# Line 417 | Line 421 | public class RecursiveTaskTest extends J
421                  FailingFibTask f = new FailingFibTask(8);
422                  assertSame(f, f.fork());
423                  try {
424 <                    Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
424 >                    f.get(LONG_DELAY_MS, MILLISECONDS);
425                      shouldThrow();
426                  } catch (ExecutionException success) {
427                      Throwable cause = success.getCause();
# Line 454 | Line 458 | public class RecursiveTaskTest extends J
458                  FibTask f = new FibTask(8);
459                  assertTrue(f.cancel(true));
460                  try {
461 <                    Integer r = f.invoke();
461 >                    f.invoke();
462                      shouldThrow();
463                  } catch (CancellationException success) {
464                      checkCancelled(f);
# Line 474 | Line 478 | public class RecursiveTaskTest extends J
478                  assertTrue(f.cancel(true));
479                  assertSame(f, f.fork());
480                  try {
481 <                    Integer r = f.join();
481 >                    f.join();
482                      shouldThrow();
483                  } catch (CancellationException success) {
484                      checkCancelled(f);
# Line 494 | Line 498 | public class RecursiveTaskTest extends J
498                  assertTrue(f.cancel(true));
499                  assertSame(f, f.fork());
500                  try {
501 <                    Integer r = f.get();
501 >                    f.get();
502                      shouldThrow();
503                  } catch (CancellationException success) {
504                      checkCancelled(f);
# Line 514 | Line 518 | public class RecursiveTaskTest extends J
518                  assertTrue(f.cancel(true));
519                  assertSame(f, f.fork());
520                  try {
521 <                    Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
521 >                    f.get(LONG_DELAY_MS, MILLISECONDS);
522                      shouldThrow();
523                  } catch (CancellationException success) {
524                      checkCancelled(f);
# Line 658 | Line 662 | public class RecursiveTaskTest extends J
662                  FibTask f = new FibTask(8);
663                  f.completeExceptionally(new FJException());
664                  try {
665 <                    Integer r = f.invoke();
665 >                    f.invoke();
666                      shouldThrow();
667                  } catch (FJException success) {
668                      checkCompletedAbnormally(f, success);

Diff Legend

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