--- jsr166/src/test/tck/ScheduledExecutorTest.java	2017/07/17 22:27:31	1.95
+++ jsr166/src/test/tck/ScheduledExecutorTest.java	2021/01/27 01:57:24	1.100
@@ -66,13 +66,13 @@ public class ScheduledExecutorTest exten
         try (PoolCleaner cleaner = cleaner(p)) {
             final long startTime = System.nanoTime();
             final CountDownLatch done = new CountDownLatch(1);
-            Callable task = new CheckedCallable<Boolean>() {
+            Callable<Boolean> task = new CheckedCallable<>() {
                 public Boolean realCall() {
                     done.countDown();
                     assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
                     return Boolean.TRUE;
                 }};
-            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
+            Future<Boolean> f = p.schedule(task, timeoutMillis(), MILLISECONDS);
             assertSame(Boolean.TRUE, f.get());
             assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
             assertEquals(0L, done.getCount());
@@ -92,7 +92,7 @@ public class ScheduledExecutorTest exten
                     done.countDown();
                     assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
                 }};
-            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
+            Future<?> f = p.schedule(task, timeoutMillis(), MILLISECONDS);
             await(done);
             assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
             assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
@@ -112,7 +112,7 @@ public class ScheduledExecutorTest exten
                     done.countDown();
                     assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
                 }};
-            ScheduledFuture f =
+            ScheduledFuture<?> f =
                 p.scheduleAtFixedRate(task, timeoutMillis(),
                                       LONG_DELAY_MS, MILLISECONDS);
             await(done);
@@ -134,7 +134,7 @@ public class ScheduledExecutorTest exten
                     done.countDown();
                     assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
                 }};
-            ScheduledFuture f =
+            ScheduledFuture<?> f =
                 p.scheduleWithFixedDelay(task, timeoutMillis(),
                                          LONG_DELAY_MS, MILLISECONDS);
             await(done);
@@ -162,7 +162,7 @@ public class ScheduledExecutorTest exten
                 final CountDownLatch done = new CountDownLatch(cycles);
                 final Runnable task = new CheckedRunnable() {
                     public void realRun() { done.countDown(); }};
-                final ScheduledFuture periodicTask =
+                final ScheduledFuture<?> periodicTask =
                     p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
                 final int totalDelayMillis = (cycles - 1) * delay;
                 await(done, totalDelayMillis + LONG_DELAY_MS);
@@ -208,7 +208,7 @@ public class ScheduledExecutorTest exten
                         previous.set(now);
                         done.countDown();
                     }};
-                final ScheduledFuture periodicTask =
+                final ScheduledFuture<?> periodicTask =
                     p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
                 final int totalDelayMillis = (cycles - 1) * delay;
                 await(done, totalDelayMillis + cycles * LONG_DELAY_MS);
@@ -549,7 +549,8 @@ public class ScheduledExecutorTest exten
         final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
         try (PoolCleaner cleaner = cleaner(p, done)) {
             final CountDownLatch threadStarted = new CountDownLatch(1);
-            ScheduledFuture[] tasks = new ScheduledFuture[5];
+            @SuppressWarnings("unchecked")
+            ScheduledFuture<?>[] tasks = (ScheduledFuture<?>[])new ScheduledFuture[5];
             for (int i = 0; i < tasks.length; i++) {
                 Runnable r = new CheckedRunnable() {
                     public void realRun() throws InterruptedException {
@@ -572,7 +573,8 @@ public class ScheduledExecutorTest exten
         final CountDownLatch done = new CountDownLatch(1);
         final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
         try (PoolCleaner cleaner = cleaner(p, done)) {
-            ScheduledFuture[] tasks = new ScheduledFuture[5];
+            @SuppressWarnings("unchecked")
+            ScheduledFuture<?>[] tasks = (ScheduledFuture<?>[])new ScheduledFuture[5];
             final CountDownLatch threadStarted = new CountDownLatch(1);
             for (int i = 0; i < tasks.length; i++) {
                 Runnable r = new CheckedRunnable() {
@@ -600,14 +602,15 @@ public class ScheduledExecutorTest exten
      * purge eventually removes cancelled tasks from the queue
      */
     public void testPurge() throws InterruptedException {
-        final ScheduledFuture[] tasks = new ScheduledFuture[5];
+        @SuppressWarnings("unchecked")
+        ScheduledFuture<?>[] tasks = (ScheduledFuture<?>[])new ScheduledFuture[5];
         final Runnable releaser = new Runnable() { public void run() {
-            for (ScheduledFuture task : tasks)
+            for (ScheduledFuture<?> task : tasks)
                 if (task != null) task.cancel(true); }};
         final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
         try (PoolCleaner cleaner = cleaner(p, releaser)) {
             for (int i = 0; i < tasks.length; i++)
-                tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
+                tasks[i] = p.schedule(possiblyInterruptedRunnable(SMALL_DELAY_MS),
                                       LONG_DELAY_MS, MILLISECONDS);
             int max = tasks.length;
             if (tasks[4].cancel(true)) --max;
@@ -639,7 +642,7 @@ public class ScheduledExecutorTest exten
         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();
         }};
@@ -669,7 +672,7 @@ public class ScheduledExecutorTest exten
      */
     public void testShutdownNow_delayedTasks() throws InterruptedException {
         final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
-        List<ScheduledFuture> tasks = new ArrayList<>();
+        List<ScheduledFuture<?>> tasks = new ArrayList<>();
         for (int i = 0; i < 3; i++) {
             Runnable r = new NoOpRunnable();
             tasks.add(p.schedule(r, 9, SECONDS));
@@ -677,7 +680,7 @@ public class ScheduledExecutorTest exten
             tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
         }
         if (testImplementationDetails)
-            assertEquals(new HashSet(tasks), new HashSet(p.getQueue()));
+            assertEquals(new HashSet<Object>(tasks), new HashSet<Object>(p.getQueue()));
         final List<Runnable> queuedTasks;
         try {
             queuedTasks = p.shutdownNow();
@@ -687,9 +690,9 @@ public class ScheduledExecutorTest exten
         assertTrue(p.isShutdown());
         assertTrue(p.getQueue().isEmpty());
         if (testImplementationDetails)
-            assertEquals(new HashSet(tasks), new HashSet(queuedTasks));
+            assertEquals(new HashSet<Object>(tasks), new HashSet<Object>(queuedTasks));
         assertEquals(tasks.size(), queuedTasks.size());
-        for (ScheduledFuture task : tasks) {
+        for (ScheduledFuture<?> task : tasks) {
             assertFalse(task.isDone());
             assertFalse(task.isCancelled());
         }
@@ -804,7 +807,7 @@ public class ScheduledExecutorTest exten
         immediates.forEach(
             f -> assertTrue(((ScheduledFuture)f).getDelay(NANOSECONDS) <= 0L));
 
-        Stream.of(immediates, delayeds, periodics).flatMap(c -> c.stream())
+        Stream.of(immediates, delayeds, periodics).flatMap(Collection::stream)
             .forEach(f -> assertFalse(f.isDone()));
 
         try { p.shutdown(); } catch (SecurityException ok) { return; }
@@ -858,7 +861,7 @@ public class ScheduledExecutorTest exten
 
         assertTrue(q.isEmpty());
 
-        Stream.of(immediates, delayeds, periodics).flatMap(c -> c.stream())
+        Stream.of(immediates, delayeds, periodics).flatMap(Collection::stream)
             .forEach(f -> assertTrue(f.isDone()));
 
         for (Future<?> f : immediates) assertNull(f.get());
@@ -1272,7 +1275,7 @@ public class ScheduledExecutorTest exten
     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) {}
@@ -1288,7 +1291,7 @@ public class ScheduledExecutorTest exten
                     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 {