--- jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2018/01/27 19:01:26	1.102
+++ jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2021/01/27 01:57:24	1.106
@@ -660,16 +660,18 @@ public class ThreadPoolExecutorSubclassT
                           q);
         try (PoolCleaner cleaner = cleaner(p, done)) {
             final CountDownLatch threadStarted = new CountDownLatch(1);
-            FutureTask[] tasks = new FutureTask[5];
+            FutureTask[] rtasks = new FutureTask[5];
+            @SuppressWarnings("unchecked")
+            FutureTask<Boolean>[] tasks = (FutureTask<Boolean>[])rtasks;
             for (int i = 0; i < tasks.length; i++) {
-                Callable<Boolean> task = new CheckedCallable<Boolean>() {
+                Callable<Boolean> task = new CheckedCallable<>() {
                     public Boolean realCall() throws InterruptedException {
                         threadStarted.countDown();
                         assertSame(q, p.getQueue());
                         await(done);
                         return Boolean.TRUE;
                     }};
-                tasks[i] = new FutureTask(task);
+                tasks[i] = new FutureTask<>(task);
                 p.execute(tasks[i]);
             }
             await(threadStarted);
@@ -726,15 +728,17 @@ public class ThreadPoolExecutorSubclassT
                           LONG_DELAY_MS, MILLISECONDS,
                           q);
         try (PoolCleaner cleaner = cleaner(p, done)) {
-            FutureTask[] tasks = new FutureTask[5];
+            FutureTask[] rtasks = new FutureTask[5];
+            @SuppressWarnings("unchecked")
+            FutureTask<Boolean>[] tasks = (FutureTask<Boolean>[])rtasks;
             for (int i = 0; i < tasks.length; i++) {
-                Callable<Boolean> task = new CheckedCallable<Boolean>() {
+                Callable<Boolean> task = new CheckedCallable<>() {
                     public Boolean realCall() throws InterruptedException {
                         threadStarted.countDown();
                         await(done);
                         return Boolean.TRUE;
                     }};
-                tasks[i] = new FutureTask(task);
+                tasks[i] = new FutureTask<>(task);
                 p.execute(tasks[i]);
             }
             await(threadStarted);
@@ -769,7 +773,7 @@ public class ThreadPoolExecutorSubclassT
         Runnable waiter = new CheckedRunnable() { public void realRun() {
             threadsStarted.countDown();
             try {
-                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
+                MILLISECONDS.sleep(LONGER_DELAY_MS);
             } catch (InterruptedException success) {}
             ran.getAndIncrement();
         }};
@@ -1642,7 +1646,7 @@ public class ThreadPoolExecutorSubclassT
             l.add(latchAwaitingStringTask(latch));
             l.add(null);
             try {
-                e.invokeAny(l, randomTimeout(), MILLISECONDS);
+                e.invokeAny(l, randomTimeout(), randomTimeUnit());
                 shouldThrow();
             } catch (NullPointerException success) {}
             latch.countDown();
@@ -1809,7 +1813,7 @@ public class ThreadPoolExecutorSubclassT
     public void testTimedInvokeAll6() throws Exception {
         for (long timeout = timeoutMillis();;) {
             final CountDownLatch done = new CountDownLatch(1);
-            final Callable<String> waiter = new CheckedCallable<String>() {
+            final Callable<String> waiter = new CheckedCallable<>() {
                 public String realCall() {
                     try { done.await(LONG_DELAY_MS, MILLISECONDS); }
                     catch (InterruptedException ok) {}
@@ -1828,7 +1832,7 @@ public class ThreadPoolExecutorSubclassT
                     p.invokeAll(tasks, timeout, MILLISECONDS);
                 assertEquals(tasks.size(), futures.size());
                 assertTrue(millisElapsedSince(startTime) >= timeout);
-                for (Future future : futures)
+                for (Future<?> future : futures)
                     assertTrue(future.isDone());
                 assertTrue(futures.get(1).isCancelled());
                 try {
@@ -1966,7 +1970,7 @@ public class ThreadPoolExecutorSubclassT
             }
         }
     }
-
+    @SuppressWarnings("deprecation")
     public void testFinalizeMethodCallsSuperFinalize() {
         new CustomTPE(1, 1,
                       LONG_DELAY_MS, MILLISECONDS,