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.35 by jsr166, Sat Mar 18 18:20:00 2017 UTC vs.
Revision 1.42 by dl, Tue Jan 26 13:33:06 2021 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 < import static java.util.concurrent.TimeUnit.SECONDS;
7 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
8  
9   import java.util.HashSet;
10   import java.util.concurrent.CancellationException;
# Line 51 | Line 51 | public class RecursiveTaskTest extends J
51          }
52      }
53  
54 <    void checkNotDone(RecursiveTask a) {
54 >    void checkNotDone(RecursiveTask<?> a) {
55          assertFalse(a.isDone());
56          assertFalse(a.isCompletedNormally());
57          assertFalse(a.isCompletedAbnormally());
# Line 69 | Line 69 | public class RecursiveTaskTest extends J
69  
70              Thread.currentThread().interrupt();
71              try {
72 <                a.get(5L, SECONDS);
72 >                a.get(randomTimeout(), randomTimeUnit());
73                  shouldThrow();
74              } catch (InterruptedException success) {
75              } catch (Throwable fail) { threadUnexpectedException(fail); }
76          }
77  
78          try {
79 <            a.get(0L, SECONDS);
79 >            a.get(randomExpiredTimeout(), randomTimeUnit());
80              shouldThrow();
81          } catch (TimeoutException success) {
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 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
98 <        try {
99 <            assertSame(expected, a.get(5L, SECONDS));
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 114 | 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  
125 <    void checkCancelled(RecursiveTask a) {
125 >    void checkCancelled(RecursiveTask<?> a) {
126          assertTrue(a.isDone());
127          assertTrue(a.isCancelled());
128          assertFalse(a.isCompletedNormally());
# Line 141 | Line 143 | public class RecursiveTaskTest extends J
143          } catch (Throwable fail) { threadUnexpectedException(fail); }
144  
145          try {
146 <            a.get(5L, SECONDS);
146 >            a.get(randomTimeout(), randomTimeUnit());
147              shouldThrow();
148          } catch (CancellationException success) {
149          } catch (Throwable fail) { threadUnexpectedException(fail); }
150      }
151  
152 <    void checkCompletedAbnormally(RecursiveTask a, Throwable t) {
152 >    void checkCompletedAbnormally(RecursiveTask<?> a, Throwable t) {
153          assertTrue(a.isDone());
154          assertFalse(a.isCancelled());
155          assertFalse(a.isCompletedNormally());
# Line 172 | Line 174 | public class RecursiveTaskTest extends J
174          } catch (Throwable fail) { threadUnexpectedException(fail); }
175  
176          try {
177 <            a.get(5L, SECONDS);
177 >            a.get(randomTimeout(), randomTimeUnit());
178              shouldThrow();
179          } catch (ExecutionException success) {
180              assertSame(t.getClass(), success.getCause().getClass());
# Line 196 | 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 215 | 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 293 | Line 295 | public class RecursiveTaskTest extends J
295              public Integer realCompute() throws Exception {
296                  FibTask f = new FibTask(8);
297                  assertSame(f, f.fork());
298 <                Integer r = f.get(5L, SECONDS);
298 >                Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
299                  assertEquals(21, (int) r);
300                  checkCompletedNormally(f, r);
301                  return r;
# Line 379 | 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 398 | 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 419 | 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(5L, SECONDS);
424 >                    f.get(LONG_DELAY_MS, MILLISECONDS);
425                      shouldThrow();
426                  } catch (ExecutionException success) {
427                      Throwable cause = success.getCause();
# Line 456 | 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 476 | 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 496 | 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 516 | Line 518 | public class RecursiveTaskTest extends J
518                  assertTrue(f.cancel(true));
519                  assertSame(f, f.fork());
520                  try {
521 <                    Integer r = f.get(5L, SECONDS);
521 >                    f.get(LONG_DELAY_MS, MILLISECONDS);
522                      shouldThrow();
523                  } catch (CancellationException success) {
524                      checkCancelled(f);
# Line 660 | 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);
# Line 746 | Line 748 | public class RecursiveTaskTest extends J
748                  FibTask f = new FibTask(8);
749                  FibTask g = new FibTask(9);
750                  FibTask h = new FibTask(7);
751 <                HashSet set = new HashSet();
751 >                HashSet<ForkJoinTask<?>> set = new HashSet<ForkJoinTask<?>>();
752                  set.add(f);
753                  set.add(g);
754                  set.add(h);
# Line 846 | Line 848 | public class RecursiveTaskTest extends J
848                  FailingFibTask f = new FailingFibTask(8);
849                  FibTask g = new FibTask(9);
850                  FibTask h = new FibTask(7);
851 <                HashSet set = new HashSet();
851 >                HashSet<ForkJoinTask<?>> set = new HashSet<ForkJoinTask<?>>();
852                  set.add(f);
853                  set.add(g);
854                  set.add(h);

Diff Legend

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