--- jsr166/src/test/tck/RecursiveTaskTest.java	2017/10/21 06:48:13	1.37
+++ jsr166/src/test/tck/RecursiveTaskTest.java	2021/01/26 13:33:06	1.42
@@ -51,7 +51,7 @@ public class RecursiveTaskTest extends J
         }
     }
 
-    void checkNotDone(RecursiveTask a) {
+    void checkNotDone(RecursiveTask<?> a) {
         assertFalse(a.isDone());
         assertFalse(a.isCompletedNormally());
         assertFalse(a.isCompletedAbnormally());
@@ -82,29 +82,33 @@ public class RecursiveTaskTest extends J
         } catch (Throwable fail) { threadUnexpectedException(fail); }
     }
 
-    <T> void checkCompletedNormally(RecursiveTask<T> a, T expected) {
+    <T> void checkCompletedNormally(RecursiveTask<T> a, T expectedValue) {
         assertTrue(a.isDone());
         assertFalse(a.isCancelled());
         assertTrue(a.isCompletedNormally());
         assertFalse(a.isCompletedAbnormally());
         assertNull(a.getException());
-        assertSame(expected, a.getRawResult());
-        assertSame(expected, a.join());
+        assertSame(expectedValue, a.getRawResult());
+        assertSame(expectedValue, a.join());
         assertFalse(a.cancel(false));
         assertFalse(a.cancel(true));
+
+        T v1 = null, v2 = null;
         try {
-            assertSame(expected, a.get());
-            assertSame(expected, a.get(randomTimeout(), randomTimeUnit()));
-        } catch (Exception fail) { threadUnexpectedException(fail); }
+            v1 = a.get();
+            v2 = a.get(randomTimeout(), randomTimeUnit());
+        } catch (Throwable fail) { threadUnexpectedException(fail); }
+        assertSame(expectedValue, v1);
+        assertSame(expectedValue, v2);
     }
 
     /**
      * Waits for the task to complete, and checks that when it does,
      * it will have an Integer result equals to the given int.
      */
-    void checkCompletesNormally(RecursiveTask<Integer> a, int expected) {
+    void checkCompletesNormally(RecursiveTask<Integer> a, int expectedValue) {
         Integer r = a.join();
-        assertEquals(expected, (int) r);
+        assertEquals(expectedValue, (int) r);
         checkCompletedNormally(a, r);
     }
 
@@ -112,13 +116,13 @@ public class RecursiveTaskTest extends J
      * Like checkCompletesNormally, but verifies that the task has
      * already completed.
      */
-    void checkCompletedNormally(RecursiveTask<Integer> a, int expected) {
+    void checkCompletedNormally(RecursiveTask<Integer> a, int expectedValue) {
         Integer r = a.getRawResult();
-        assertEquals(expected, (int) r);
+        assertEquals(expectedValue, (int) r);
         checkCompletedNormally(a, r);
     }
 
-    void checkCancelled(RecursiveTask a) {
+    void checkCancelled(RecursiveTask<?> a) {
         assertTrue(a.isDone());
         assertTrue(a.isCancelled());
         assertFalse(a.isCompletedNormally());
@@ -145,7 +149,7 @@ public class RecursiveTaskTest extends J
         } catch (Throwable fail) { threadUnexpectedException(fail); }
     }
 
-    void checkCompletedAbnormally(RecursiveTask a, Throwable t) {
+    void checkCompletedAbnormally(RecursiveTask<?> a, Throwable t) {
         assertTrue(a.isDone());
         assertFalse(a.isCancelled());
         assertFalse(a.isCompletedNormally());
@@ -194,7 +198,7 @@ public class RecursiveTaskTest extends J
                 return n;
             FibTask f1 = new FibTask(n - 1);
             f1.fork();
-            return (new FibTask(n - 2)).compute() + f1.join();
+            return new FibTask(n - 2).compute() + f1.join();
         }
 
         public void publicSetRawResult(Integer result) {
@@ -213,7 +217,7 @@ public class RecursiveTaskTest extends J
                 throw new FJException();
             FailingFibTask f1 = new FailingFibTask(n - 1);
             f1.fork();
-            return (new FibTask(n - 2)).compute() + f1.join();
+            return new FibTask(n - 2).compute() + f1.join();
         }
     }
 
@@ -377,7 +381,7 @@ public class RecursiveTaskTest extends J
                 FailingFibTask f = new FailingFibTask(8);
                 assertSame(f, f.fork());
                 try {
-                    Integer r = f.join();
+                    f.join();
                     shouldThrow();
                 } catch (FJException success) {
                     checkCompletedAbnormally(f, success);
@@ -396,7 +400,7 @@ public class RecursiveTaskTest extends J
                 FailingFibTask f = new FailingFibTask(8);
                 assertSame(f, f.fork());
                 try {
-                    Integer r = f.get();
+                    f.get();
                     shouldThrow();
                 } catch (ExecutionException success) {
                     Throwable cause = success.getCause();
@@ -417,7 +421,7 @@ public class RecursiveTaskTest extends J
                 FailingFibTask f = new FailingFibTask(8);
                 assertSame(f, f.fork());
                 try {
-                    Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
+                    f.get(LONG_DELAY_MS, MILLISECONDS);
                     shouldThrow();
                 } catch (ExecutionException success) {
                     Throwable cause = success.getCause();
@@ -454,7 +458,7 @@ public class RecursiveTaskTest extends J
                 FibTask f = new FibTask(8);
                 assertTrue(f.cancel(true));
                 try {
-                    Integer r = f.invoke();
+                    f.invoke();
                     shouldThrow();
                 } catch (CancellationException success) {
                     checkCancelled(f);
@@ -474,7 +478,7 @@ public class RecursiveTaskTest extends J
                 assertTrue(f.cancel(true));
                 assertSame(f, f.fork());
                 try {
-                    Integer r = f.join();
+                    f.join();
                     shouldThrow();
                 } catch (CancellationException success) {
                     checkCancelled(f);
@@ -494,7 +498,7 @@ public class RecursiveTaskTest extends J
                 assertTrue(f.cancel(true));
                 assertSame(f, f.fork());
                 try {
-                    Integer r = f.get();
+                    f.get();
                     shouldThrow();
                 } catch (CancellationException success) {
                     checkCancelled(f);
@@ -514,7 +518,7 @@ public class RecursiveTaskTest extends J
                 assertTrue(f.cancel(true));
                 assertSame(f, f.fork());
                 try {
-                    Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
+                    f.get(LONG_DELAY_MS, MILLISECONDS);
                     shouldThrow();
                 } catch (CancellationException success) {
                     checkCancelled(f);
@@ -658,7 +662,7 @@ public class RecursiveTaskTest extends J
                 FibTask f = new FibTask(8);
                 f.completeExceptionally(new FJException());
                 try {
-                    Integer r = f.invoke();
+                    f.invoke();
                     shouldThrow();
                 } catch (FJException success) {
                     checkCompletedAbnormally(f, success);
@@ -744,7 +748,7 @@ public class RecursiveTaskTest extends J
                 FibTask f = new FibTask(8);
                 FibTask g = new FibTask(9);
                 FibTask h = new FibTask(7);
-                HashSet set = new HashSet();
+                HashSet<ForkJoinTask<?>> set = new HashSet<ForkJoinTask<?>>();
                 set.add(f);
                 set.add(g);
                 set.add(h);
@@ -844,7 +848,7 @@ public class RecursiveTaskTest extends J
                 FailingFibTask f = new FailingFibTask(8);
                 FibTask g = new FibTask(9);
                 FibTask h = new FibTask(7);
-                HashSet set = new HashSet();
+                HashSet<ForkJoinTask<?>> set = new HashSet<ForkJoinTask<?>>();
                 set.add(f);
                 set.add(g);
                 set.add(h);