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.47 by jsr166, Tue Aug 16 23:02:57 2016 UTC vs.
Revision 1.50 by jsr166, Mon May 29 19:15:02 2017 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.Arrays;
10   import java.util.HashSet;
# Line 73 | Line 73 | public class RecursiveActionTest extends
73  
74              Thread.currentThread().interrupt();
75              try {
76 <                a.get(5L, SECONDS);
76 >                a.get(randomTimeout(), randomTimeUnit());
77                  shouldThrow();
78              } catch (InterruptedException success) {
79              } catch (Throwable fail) { threadUnexpectedException(fail); }
80          }
81  
82          try {
83 <            a.get(0L, SECONDS);
83 >            a.get(randomExpiredTimeout(), randomTimeUnit());
84              shouldThrow();
85          } catch (TimeoutException success) {
86          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 98 | Line 98 | public class RecursiveActionTest extends
98          assertFalse(a.cancel(true));
99          try {
100              assertNull(a.get());
101 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
102 <        try {
103 <            assertNull(a.get(5L, SECONDS));
101 >            assertNull(a.get(randomTimeout(), randomTimeUnit()));
102          } catch (Throwable fail) { threadUnexpectedException(fail); }
103      }
104  
# Line 125 | Line 123 | public class RecursiveActionTest extends
123          } catch (Throwable fail) { threadUnexpectedException(fail); }
124  
125          try {
126 <            a.get(5L, SECONDS);
126 >            a.get(randomTimeout(), randomTimeUnit());
127              shouldThrow();
128          } catch (CancellationException success) {
129          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 156 | Line 154 | public class RecursiveActionTest extends
154          } catch (Throwable fail) { threadUnexpectedException(fail); }
155  
156          try {
157 <            a.get(5L, SECONDS);
157 >            a.get(randomTimeout(), randomTimeUnit());
158              shouldThrow();
159          } catch (ExecutionException success) {
160              assertSame(t.getClass(), success.getCause().getClass());
# Line 168 | Line 166 | public class RecursiveActionTest extends
166          public FJException(Throwable cause) { super(cause); }
167      }
168  
169 <    // A simple recursive action for testing
169 >    /** A simple recursive action for testing. */
170      final class FibAction extends CheckedRecursiveAction {
171          final int number;
172          int result;
# Line 186 | Line 184 | public class RecursiveActionTest extends
184          }
185      }
186  
187 <    // A recursive action failing in base case
187 >    /** A recursive action failing in base case. */
188      static final class FailingFibAction extends RecursiveAction {
189          final int number;
190          int result;
# Line 263 | Line 261 | public class RecursiveActionTest extends
261                  // test join()
262                  assertSame(f, f.fork());
263                  currentThread.interrupt();
266 –                assertTrue(currentThread.isInterrupted());
264                  assertNull(f.join());
265                  Thread.interrupted();
266                  assertEquals(21, f.result);
# Line 273 | Line 270 | public class RecursiveActionTest extends
270                  f.cancel(true);
271                  assertSame(f, f.fork());
272                  currentThread.interrupt();
276 –                assertTrue(currentThread.isInterrupted());
273                  try {
274                      f.join();
275                      shouldThrow();
# Line 286 | Line 282 | public class RecursiveActionTest extends
282                  f.completeExceptionally(new FJException());
283                  assertSame(f, f.fork());
284                  currentThread.interrupt();
289 –                assertTrue(currentThread.isInterrupted());
285                  try {
286                      f.join();
287                      shouldThrow();
# Line 299 | Line 294 | public class RecursiveActionTest extends
294                  f = new FibAction(8);
295                  assertSame(f, f.fork());
296                  currentThread.interrupt();
302 –                assertTrue(currentThread.isInterrupted());
297                  f.quietlyJoin();
298                  Thread.interrupted();
299                  assertEquals(21, f.result);
# Line 309 | Line 303 | public class RecursiveActionTest extends
303                  f.cancel(true);
304                  assertSame(f, f.fork());
305                  currentThread.interrupt();
312 –                assertTrue(currentThread.isInterrupted());
306                  f.quietlyJoin();
307                  Thread.interrupted();
308                  checkCancelled(f);
# Line 318 | Line 311 | public class RecursiveActionTest extends
311                  f.completeExceptionally(new FJException());
312                  assertSame(f, f.fork());
313                  currentThread.interrupt();
321 –                assertTrue(currentThread.isInterrupted());
314                  f.quietlyJoin();
315                  Thread.interrupted();
316                  checkCompletedAbnormally(f, f.getException());
# Line 365 | Line 357 | public class RecursiveActionTest extends
357                  f = fibActions[0];
358                  assertFalse(ForkJoinTask.inForkJoinPool());
359                  currentThread.interrupt();
368 –                assertTrue(currentThread.isInterrupted());
360                  assertNull(f.join());
361                  assertTrue(Thread.interrupted());
362                  assertEquals(21, f.result);
# Line 373 | Line 364 | public class RecursiveActionTest extends
364  
365                  f = fibActions[1];
366                  currentThread.interrupt();
376 –                assertTrue(currentThread.isInterrupted());
367                  try {
368                      f.join();
369                      shouldThrow();
# Line 384 | Line 374 | public class RecursiveActionTest extends
374  
375                  f = fibActions[2];
376                  currentThread.interrupt();
387 –                assertTrue(currentThread.isInterrupted());
377                  try {
378                      f.join();
379                      shouldThrow();
# Line 397 | Line 386 | public class RecursiveActionTest extends
386  
387                  f = fibActions[3];
388                  currentThread.interrupt();
400 –                assertTrue(currentThread.isInterrupted());
389                  f.quietlyJoin();
390                  assertTrue(Thread.interrupted());
391                  assertEquals(21, f.result);
# Line 405 | Line 393 | public class RecursiveActionTest extends
393  
394                  f = fibActions[4];
395                  currentThread.interrupt();
408 –                assertTrue(currentThread.isInterrupted());
396                  f.quietlyJoin();
397                  assertTrue(Thread.interrupted());
398                  checkCancelled(f);
399  
400                  f = fibActions[5];
401                  currentThread.interrupt();
415 –                assertTrue(currentThread.isInterrupted());
402                  f.quietlyJoin();
403                  assertTrue(Thread.interrupted());
404                  assertTrue(f.getException() instanceof FJException);
# Line 454 | Line 440 | public class RecursiveActionTest extends
440              protected void realCompute() throws Exception {
441                  FibAction f = new FibAction(8);
442                  assertSame(f, f.fork());
443 <                assertNull(f.get(5L, SECONDS));
443 >                assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
444                  assertEquals(21, f.result);
445                  checkCompletedNormally(f);
446              }};
# Line 470 | Line 456 | public class RecursiveActionTest extends
456                  FibAction f = new FibAction(8);
457                  assertSame(f, f.fork());
458                  try {
459 <                    f.get(5L, null);
459 >                    f.get(randomTimeout(), null);
460                      shouldThrow();
461                  } catch (NullPointerException success) {}
462              }};
# Line 589 | Line 575 | public class RecursiveActionTest extends
575                  FailingFibAction f = new FailingFibAction(8);
576                  assertSame(f, f.fork());
577                  try {
578 <                    f.get(5L, SECONDS);
578 >                    f.get(LONG_DELAY_MS, MILLISECONDS);
579                      shouldThrow();
580                  } catch (ExecutionException success) {
581                      Throwable cause = success.getCause();
# Line 681 | Line 667 | public class RecursiveActionTest extends
667                  assertTrue(f.cancel(true));
668                  assertSame(f, f.fork());
669                  try {
670 <                    f.get(5L, SECONDS);
670 >                    f.get(LONG_DELAY_MS, MILLISECONDS);
671                      shouldThrow();
672                  } catch (CancellationException success) {
673                      checkCancelled(f);

Diff Legend

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