--- jsr166/src/test/tck/RecursiveActionTest.java	2016/08/16 23:02:57	1.47
+++ jsr166/src/test/tck/RecursiveActionTest.java	2018/05/28 21:49:32	1.54
@@ -4,7 +4,7 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -73,14 +73,14 @@ public class RecursiveActionTest extends
 
             Thread.currentThread().interrupt();
             try {
-                a.get(5L, SECONDS);
+                a.get(randomTimeout(), randomTimeUnit());
                 shouldThrow();
             } catch (InterruptedException success) {
             } catch (Throwable fail) { threadUnexpectedException(fail); }
         }
 
         try {
-            a.get(0L, SECONDS);
+            a.get(randomExpiredTimeout(), randomTimeUnit());
             shouldThrow();
         } catch (TimeoutException success) {
         } catch (Throwable fail) { threadUnexpectedException(fail); }
@@ -98,9 +98,7 @@ public class RecursiveActionTest extends
         assertFalse(a.cancel(true));
         try {
             assertNull(a.get());
-        } catch (Throwable fail) { threadUnexpectedException(fail); }
-        try {
-            assertNull(a.get(5L, SECONDS));
+            assertNull(a.get(randomTimeout(), randomTimeUnit()));
         } catch (Throwable fail) { threadUnexpectedException(fail); }
     }
 
@@ -125,7 +123,7 @@ public class RecursiveActionTest extends
         } catch (Throwable fail) { threadUnexpectedException(fail); }
 
         try {
-            a.get(5L, SECONDS);
+            a.get(randomTimeout(), randomTimeUnit());
             shouldThrow();
         } catch (CancellationException success) {
         } catch (Throwable fail) { threadUnexpectedException(fail); }
@@ -156,7 +154,7 @@ public class RecursiveActionTest extends
         } catch (Throwable fail) { threadUnexpectedException(fail); }
 
         try {
-            a.get(5L, SECONDS);
+            a.get(randomTimeout(), randomTimeUnit());
             shouldThrow();
         } catch (ExecutionException success) {
             assertSame(t.getClass(), success.getCause().getClass());
@@ -168,7 +166,7 @@ public class RecursiveActionTest extends
         public FJException(Throwable cause) { super(cause); }
     }
 
-    // A simple recursive action for testing
+    /** A simple recursive action for testing. */
     final class FibAction extends CheckedRecursiveAction {
         final int number;
         int result;
@@ -186,7 +184,7 @@ public class RecursiveActionTest extends
         }
     }
 
-    // A recursive action failing in base case
+    /** A recursive action failing in base case. */
     static final class FailingFibAction extends RecursiveAction {
         final int number;
         int result;
@@ -263,7 +261,6 @@ public class RecursiveActionTest extends
                 // test join()
                 assertSame(f, f.fork());
                 currentThread.interrupt();
-                assertTrue(currentThread.isInterrupted());
                 assertNull(f.join());
                 Thread.interrupted();
                 assertEquals(21, f.result);
@@ -273,7 +270,6 @@ public class RecursiveActionTest extends
                 f.cancel(true);
                 assertSame(f, f.fork());
                 currentThread.interrupt();
-                assertTrue(currentThread.isInterrupted());
                 try {
                     f.join();
                     shouldThrow();
@@ -286,7 +282,6 @@ public class RecursiveActionTest extends
                 f.completeExceptionally(new FJException());
                 assertSame(f, f.fork());
                 currentThread.interrupt();
-                assertTrue(currentThread.isInterrupted());
                 try {
                     f.join();
                     shouldThrow();
@@ -299,7 +294,6 @@ public class RecursiveActionTest extends
                 f = new FibAction(8);
                 assertSame(f, f.fork());
                 currentThread.interrupt();
-                assertTrue(currentThread.isInterrupted());
                 f.quietlyJoin();
                 Thread.interrupted();
                 assertEquals(21, f.result);
@@ -309,7 +303,6 @@ public class RecursiveActionTest extends
                 f.cancel(true);
                 assertSame(f, f.fork());
                 currentThread.interrupt();
-                assertTrue(currentThread.isInterrupted());
                 f.quietlyJoin();
                 Thread.interrupted();
                 checkCancelled(f);
@@ -318,7 +311,6 @@ public class RecursiveActionTest extends
                 f.completeExceptionally(new FJException());
                 assertSame(f, f.fork());
                 currentThread.interrupt();
-                assertTrue(currentThread.isInterrupted());
                 f.quietlyJoin();
                 Thread.interrupted();
                 checkCompletedAbnormally(f, f.getException());
@@ -333,8 +325,7 @@ public class RecursiveActionTest extends
      * succeeds in the presence of interrupts
      */
     public void testJoinIgnoresInterruptsOutsideForkJoinPool() {
-        final SynchronousQueue<FibAction[]> sq =
-            new SynchronousQueue<FibAction[]>();
+        final SynchronousQueue<FibAction[]> sq = new SynchronousQueue<>();
         RecursiveAction a = new CheckedRecursiveAction() {
             protected void realCompute() throws InterruptedException {
                 FibAction[] fibActions = new FibAction[6];
@@ -346,8 +337,8 @@ public class RecursiveActionTest extends
                 fibActions[4].cancel(true);
                 fibActions[5].completeExceptionally(new FJException());
 
-                for (int i = 0; i < fibActions.length; i++)
-                    fibActions[i].fork();
+                for (FibAction fibAction : fibActions)
+                    fibAction.fork();
 
                 sq.put(fibActions);
 
@@ -365,7 +356,6 @@ public class RecursiveActionTest extends
                 f = fibActions[0];
                 assertFalse(ForkJoinTask.inForkJoinPool());
                 currentThread.interrupt();
-                assertTrue(currentThread.isInterrupted());
                 assertNull(f.join());
                 assertTrue(Thread.interrupted());
                 assertEquals(21, f.result);
@@ -373,7 +363,6 @@ public class RecursiveActionTest extends
 
                 f = fibActions[1];
                 currentThread.interrupt();
-                assertTrue(currentThread.isInterrupted());
                 try {
                     f.join();
                     shouldThrow();
@@ -384,7 +373,6 @@ public class RecursiveActionTest extends
 
                 f = fibActions[2];
                 currentThread.interrupt();
-                assertTrue(currentThread.isInterrupted());
                 try {
                     f.join();
                     shouldThrow();
@@ -397,7 +385,6 @@ public class RecursiveActionTest extends
 
                 f = fibActions[3];
                 currentThread.interrupt();
-                assertTrue(currentThread.isInterrupted());
                 f.quietlyJoin();
                 assertTrue(Thread.interrupted());
                 assertEquals(21, f.result);
@@ -405,14 +392,12 @@ public class RecursiveActionTest extends
 
                 f = fibActions[4];
                 currentThread.interrupt();
-                assertTrue(currentThread.isInterrupted());
                 f.quietlyJoin();
                 assertTrue(Thread.interrupted());
                 checkCancelled(f);
 
                 f = fibActions[5];
                 currentThread.interrupt();
-                assertTrue(currentThread.isInterrupted());
                 f.quietlyJoin();
                 assertTrue(Thread.interrupted());
                 assertTrue(f.getException() instanceof FJException);
@@ -454,7 +439,7 @@ public class RecursiveActionTest extends
             protected void realCompute() throws Exception {
                 FibAction f = new FibAction(8);
                 assertSame(f, f.fork());
-                assertNull(f.get(5L, SECONDS));
+                assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
                 assertEquals(21, f.result);
                 checkCompletedNormally(f);
             }};
@@ -470,7 +455,7 @@ public class RecursiveActionTest extends
                 FibAction f = new FibAction(8);
                 assertSame(f, f.fork());
                 try {
-                    f.get(5L, null);
+                    f.get(randomTimeout(), null);
                     shouldThrow();
                 } catch (NullPointerException success) {}
             }};
@@ -589,7 +574,7 @@ public class RecursiveActionTest extends
                 FailingFibAction f = new FailingFibAction(8);
                 assertSame(f, f.fork());
                 try {
-                    f.get(5L, SECONDS);
+                    f.get(LONG_DELAY_MS, MILLISECONDS);
                     shouldThrow();
                 } catch (ExecutionException success) {
                     Throwable cause = success.getCause();
@@ -681,7 +666,7 @@ public class RecursiveActionTest extends
                 assertTrue(f.cancel(true));
                 assertSame(f, f.fork());
                 try {
-                    f.get(5L, SECONDS);
+                    f.get(LONG_DELAY_MS, MILLISECONDS);
                     shouldThrow();
                 } catch (CancellationException success) {
                     checkCancelled(f);