ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ScheduledExecutorTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ScheduledExecutorTest.java (file contents):
Revision 1.62 by jsr166, Sun Oct 4 08:07:31 2015 UTC vs.
Revision 1.100 by jsr166, Wed Jan 27 01:57:24 2021 UTC

# Line 7 | Line 7
7   */
8  
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 + import static java.util.concurrent.TimeUnit.NANOSECONDS;
11   import static java.util.concurrent.TimeUnit.SECONDS;
12  
13   import java.util.ArrayList;
14 + import java.util.Collection;
15 + import java.util.Collections;
16   import java.util.HashSet;
17   import java.util.List;
18   import java.util.concurrent.BlockingQueue;
# Line 17 | Line 20 | import java.util.concurrent.Callable;
20   import java.util.concurrent.CancellationException;
21   import java.util.concurrent.CountDownLatch;
22   import java.util.concurrent.ExecutionException;
20 import java.util.concurrent.Executors;
23   import java.util.concurrent.ExecutorService;
24   import java.util.concurrent.Future;
25   import java.util.concurrent.RejectedExecutionException;
26   import java.util.concurrent.ScheduledFuture;
27   import java.util.concurrent.ScheduledThreadPoolExecutor;
28   import java.util.concurrent.ThreadFactory;
29 + import java.util.concurrent.ThreadLocalRandom;
30   import java.util.concurrent.ThreadPoolExecutor;
31 + import java.util.concurrent.atomic.AtomicBoolean;
32   import java.util.concurrent.atomic.AtomicInteger;
33 + import java.util.concurrent.atomic.AtomicLong;
34 + import java.util.stream.Stream;
35  
36   import junit.framework.Test;
37   import junit.framework.TestSuite;
# Line 42 | Line 48 | public class ScheduledExecutorTest exten
48       * execute successfully executes a runnable
49       */
50      public void testExecute() throws InterruptedException {
51 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
51 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
52          try (PoolCleaner cleaner = cleaner(p)) {
53              final CountDownLatch done = new CountDownLatch(1);
54              final Runnable task = new CheckedRunnable() {
55                  public void realRun() { done.countDown(); }};
56              p.execute(task);
57 <            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
57 >            await(done);
58          }
59      }
60  
# Line 56 | Line 62 | public class ScheduledExecutorTest exten
62       * delayed schedule of callable successfully executes after delay
63       */
64      public void testSchedule1() throws Exception {
65 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
65 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
66          try (PoolCleaner cleaner = cleaner(p)) {
67              final long startTime = System.nanoTime();
68              final CountDownLatch done = new CountDownLatch(1);
69 <            Callable task = new CheckedCallable<Boolean>() {
69 >            Callable<Boolean> task = new CheckedCallable<>() {
70                  public Boolean realCall() {
71                      done.countDown();
72                      assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
73                      return Boolean.TRUE;
74                  }};
75 <            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
75 >            Future<Boolean> f = p.schedule(task, timeoutMillis(), MILLISECONDS);
76              assertSame(Boolean.TRUE, f.get());
77              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
78 <            assertTrue(done.await(0L, MILLISECONDS));
78 >            assertEquals(0L, done.getCount());
79          }
80      }
81  
# Line 77 | Line 83 | public class ScheduledExecutorTest exten
83       * delayed schedule of runnable successfully executes after delay
84       */
85      public void testSchedule3() throws Exception {
86 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
86 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
87          try (PoolCleaner cleaner = cleaner(p)) {
88              final long startTime = System.nanoTime();
89              final CountDownLatch done = new CountDownLatch(1);
# Line 86 | Line 92 | public class ScheduledExecutorTest exten
92                      done.countDown();
93                      assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
94                  }};
95 <            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
95 >            Future<?> f = p.schedule(task, timeoutMillis(), MILLISECONDS);
96              await(done);
97              assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
98              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
# Line 97 | Line 103 | public class ScheduledExecutorTest exten
103       * scheduleAtFixedRate executes runnable after given initial delay
104       */
105      public void testSchedule4() throws Exception {
106 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
106 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
107          try (PoolCleaner cleaner = cleaner(p)) {
108              final long startTime = System.nanoTime();
109              final CountDownLatch done = new CountDownLatch(1);
# Line 106 | Line 112 | public class ScheduledExecutorTest exten
112                      done.countDown();
113                      assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
114                  }};
115 <            ScheduledFuture f =
115 >            ScheduledFuture<?> f =
116                  p.scheduleAtFixedRate(task, timeoutMillis(),
117                                        LONG_DELAY_MS, MILLISECONDS);
118              await(done);
# Line 119 | Line 125 | public class ScheduledExecutorTest exten
125       * scheduleWithFixedDelay executes runnable after given initial delay
126       */
127      public void testSchedule5() throws Exception {
128 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
128 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
129          try (PoolCleaner cleaner = cleaner(p)) {
130              final long startTime = System.nanoTime();
131              final CountDownLatch done = new CountDownLatch(1);
# Line 128 | Line 134 | public class ScheduledExecutorTest exten
134                      done.countDown();
135                      assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
136                  }};
137 <            ScheduledFuture f =
137 >            ScheduledFuture<?> f =
138                  p.scheduleWithFixedDelay(task, timeoutMillis(),
139                                           LONG_DELAY_MS, MILLISECONDS);
140              await(done);
# Line 143 | Line 149 | public class ScheduledExecutorTest exten
149      }
150  
151      /**
152 <     * scheduleAtFixedRate executes series of tasks at given rate
152 >     * scheduleAtFixedRate executes series of tasks at given rate.
153 >     * Eventually, it must hold that:
154 >     *   cycles - 1 <= elapsedMillis/delay < cycles
155       */
156      public void testFixedRateSequence() throws InterruptedException {
157 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
157 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
158          try (PoolCleaner cleaner = cleaner(p)) {
159              for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
160 <                long startTime = System.nanoTime();
161 <                int cycles = 10;
160 >                final long startTime = System.nanoTime();
161 >                final int cycles = 8;
162                  final CountDownLatch done = new CountDownLatch(cycles);
163 <                Runnable task = new CheckedRunnable() {
163 >                final Runnable task = new CheckedRunnable() {
164                      public void realRun() { done.countDown(); }};
165 <                ScheduledFuture h =
165 >                final ScheduledFuture<?> periodicTask =
166                      p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
167 <                done.await();
168 <                h.cancel(true);
169 <                double normalizedTime =
170 <                    (double) millisElapsedSince(startTime) / delay;
171 <                if (normalizedTime >= cycles - 1 &&
172 <                    normalizedTime <= cycles)
167 >                final int totalDelayMillis = (cycles - 1) * delay;
168 >                await(done, totalDelayMillis + LONG_DELAY_MS);
169 >                periodicTask.cancel(true);
170 >                final long elapsedMillis = millisElapsedSince(startTime);
171 >                assertTrue(elapsedMillis >= totalDelayMillis);
172 >                if (elapsedMillis <= cycles * delay)
173                      return;
174 +                // else retry with longer delay
175              }
176 <            throw new AssertionError("unexpected execution rate");
176 >            fail("unexpected execution rate");
177          }
178      }
179  
180      /**
181 <     * scheduleWithFixedDelay executes series of tasks with given period
181 >     * scheduleWithFixedDelay executes series of tasks with given period.
182 >     * Eventually, it must hold that each task starts at least delay and at
183 >     * most 2 * delay after the termination of the previous task.
184       */
185      public void testFixedDelaySequence() throws InterruptedException {
186 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
186 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
187          try (PoolCleaner cleaner = cleaner(p)) {
188              for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
189 <                long startTime = System.nanoTime();
190 <                int cycles = 10;
189 >                final long startTime = System.nanoTime();
190 >                final AtomicLong previous = new AtomicLong(startTime);
191 >                final AtomicBoolean tryLongerDelay = new AtomicBoolean(false);
192 >                final int cycles = 8;
193                  final CountDownLatch done = new CountDownLatch(cycles);
194 <                Runnable task = new CheckedRunnable() {
195 <                    public void realRun() { done.countDown(); }};
196 <                ScheduledFuture h =
194 >                final int d = delay;
195 >                final Runnable task = new CheckedRunnable() {
196 >                    public void realRun() {
197 >                        long now = System.nanoTime();
198 >                        long elapsedMillis
199 >                            = NANOSECONDS.toMillis(now - previous.get());
200 >                        if (done.getCount() == cycles) { // first execution
201 >                            if (elapsedMillis >= d)
202 >                                tryLongerDelay.set(true);
203 >                        } else {
204 >                            assertTrue(elapsedMillis >= d);
205 >                            if (elapsedMillis >= 2 * d)
206 >                                tryLongerDelay.set(true);
207 >                        }
208 >                        previous.set(now);
209 >                        done.countDown();
210 >                    }};
211 >                final ScheduledFuture<?> periodicTask =
212                      p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
213 <                done.await();
214 <                h.cancel(true);
215 <                double normalizedTime =
216 <                    (double) millisElapsedSince(startTime) / delay;
217 <                if (normalizedTime >= cycles - 1 &&
218 <                    normalizedTime <= cycles)
213 >                final int totalDelayMillis = (cycles - 1) * delay;
214 >                await(done, totalDelayMillis + cycles * LONG_DELAY_MS);
215 >                periodicTask.cancel(true);
216 >                final long elapsedMillis = millisElapsedSince(startTime);
217 >                assertTrue(elapsedMillis >= totalDelayMillis);
218 >                if (!tryLongerDelay.get())
219                      return;
220 +                // else retry with longer delay
221              }
222 <            throw new AssertionError("unexpected execution rate");
222 >            fail("unexpected execution rate");
223          }
224      }
225  
226      /**
227 <     * execute(null) throws NPE
227 >     * Submitting null tasks throws NullPointerException
228       */
229 <    public void testExecuteNull() throws InterruptedException {
230 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
229 >    public void testNullTaskSubmission() {
230 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
231          try (PoolCleaner cleaner = cleaner(p)) {
232 <            try {
204 <                p.execute(null);
205 <                shouldThrow();
206 <            } catch (NullPointerException success) {}
232 >            assertNullTaskSubmissionThrowsNullPointerException(p);
233          }
234      }
235  
236      /**
237 <     * schedule(null) throws NPE
237 >     * Submitted tasks are rejected when shutdown
238       */
239 <    public void testScheduleNull() throws InterruptedException {
239 >    public void testSubmittedTasksRejectedWhenShutdown() throws InterruptedException {
240          final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
241 <        try (PoolCleaner cleaner = cleaner(p)) {
242 <            try {
243 <                TrackedCallable callable = null;
244 <                Future f = p.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
245 <                shouldThrow();
246 <            } catch (NullPointerException success) {}
247 <        }
248 <    }
241 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
242 >        final CountDownLatch threadsStarted = new CountDownLatch(p.getCorePoolSize());
243 >        final CountDownLatch done = new CountDownLatch(1);
244 >        final Runnable r = () -> {
245 >            threadsStarted.countDown();
246 >            for (;;) {
247 >                try {
248 >                    done.await();
249 >                    return;
250 >                } catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
251 >            }};
252 >        final Callable<Boolean> c = () -> {
253 >            threadsStarted.countDown();
254 >            for (;;) {
255 >                try {
256 >                    done.await();
257 >                    return Boolean.TRUE;
258 >                } catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
259 >            }};
260  
261 <    /**
262 <     * execute throws RejectedExecutionException if shutdown
263 <     */
264 <    public void testSchedule1_RejectedExecutionException() throws InterruptedException {
265 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
266 <        try (PoolCleaner cleaner = cleaner(p)) {
267 <            try {
268 <                p.shutdown();
269 <                p.schedule(new NoOpRunnable(),
233 <                           MEDIUM_DELAY_MS, MILLISECONDS);
234 <                shouldThrow();
235 <            } catch (RejectedExecutionException success) {
236 <            } catch (SecurityException ok) {}
237 <        }
238 <    }
261 >        try (PoolCleaner cleaner = cleaner(p, done)) {
262 >            for (int i = p.getCorePoolSize(); i--> 0; ) {
263 >                switch (rnd.nextInt(4)) {
264 >                case 0: p.execute(r); break;
265 >                case 1: assertFalse(p.submit(r).isDone()); break;
266 >                case 2: assertFalse(p.submit(r, Boolean.TRUE).isDone()); break;
267 >                case 3: assertFalse(p.submit(c).isDone()); break;
268 >                }
269 >            }
270  
271 <    /**
272 <     * schedule throws RejectedExecutionException if shutdown
242 <     */
243 <    public void testSchedule2_RejectedExecutionException() throws InterruptedException {
244 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
245 <        try (PoolCleaner cleaner = cleaner(p)) {
246 <            try {
247 <                p.shutdown();
248 <                p.schedule(new NoOpCallable(),
249 <                           MEDIUM_DELAY_MS, MILLISECONDS);
250 <                shouldThrow();
251 <            } catch (RejectedExecutionException success) {
252 <            } catch (SecurityException ok) {}
253 <        }
254 <    }
271 >            // ScheduledThreadPoolExecutor has an unbounded queue, so never saturated.
272 >            await(threadsStarted);
273  
274 <    /**
275 <     * schedule callable throws RejectedExecutionException if shutdown
276 <     */
259 <    public void testSchedule3_RejectedExecutionException() throws InterruptedException {
260 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
261 <        try (PoolCleaner cleaner = cleaner(p)) {
262 <            try {
274 >            if (rnd.nextBoolean())
275 >                p.shutdownNow();
276 >            else
277                  p.shutdown();
278 <                p.schedule(new NoOpCallable(),
279 <                           MEDIUM_DELAY_MS, MILLISECONDS);
280 <                shouldThrow();
267 <            } catch (RejectedExecutionException success) {
268 <            } catch (SecurityException ok) {}
269 <        }
270 <    }
278 >            // Pool is shutdown, but not yet terminated
279 >            assertTaskSubmissionsAreRejected(p);
280 >            assertFalse(p.isTerminated());
281  
282 <    /**
283 <     * scheduleAtFixedRate throws RejectedExecutionException if shutdown
274 <     */
275 <    public void testScheduleAtFixedRate1_RejectedExecutionException() throws InterruptedException {
276 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
277 <        try (PoolCleaner cleaner = cleaner(p)) {
278 <            try {
279 <                p.shutdown();
280 <                p.scheduleAtFixedRate(new NoOpRunnable(),
281 <                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
282 <                shouldThrow();
283 <            } catch (RejectedExecutionException success) {
284 <            } catch (SecurityException ok) {}
285 <        }
286 <    }
282 >            done.countDown();   // release blocking tasks
283 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
284  
285 <    /**
289 <     * scheduleWithFixedDelay throws RejectedExecutionException if shutdown
290 <     */
291 <    public void testScheduleWithFixedDelay1_RejectedExecutionException() throws InterruptedException {
292 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
293 <        try (PoolCleaner cleaner = cleaner(p)) {
294 <            try {
295 <                p.shutdown();
296 <                p.scheduleWithFixedDelay(new NoOpRunnable(),
297 <                                         MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
298 <                shouldThrow();
299 <            } catch (RejectedExecutionException success) {
300 <            } catch (SecurityException ok) {}
285 >            assertTaskSubmissionsAreRejected(p);
286          }
287 +        assertEquals(p.getCorePoolSize(), p.getCompletedTaskCount());
288      }
289  
290      /**
# Line 306 | Line 292 | public class ScheduledExecutorTest exten
292       * thread becomes active
293       */
294      public void testGetActiveCount() throws InterruptedException {
295 +        final CountDownLatch done = new CountDownLatch(1);
296          final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
297 <        try (PoolCleaner cleaner = cleaner(p)) {
297 >        try (PoolCleaner cleaner = cleaner(p, done)) {
298              final CountDownLatch threadStarted = new CountDownLatch(1);
312            final CountDownLatch done = new CountDownLatch(1);
299              assertEquals(0, p.getActiveCount());
300              p.execute(new CheckedRunnable() {
301                  public void realRun() throws InterruptedException {
302                      threadStarted.countDown();
303                      assertEquals(1, p.getActiveCount());
304 <                    done.await();
304 >                    await(done);
305                  }});
306 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
306 >            await(threadStarted);
307              assertEquals(1, p.getActiveCount());
322            done.countDown();
308          }
309      }
310  
# Line 338 | Line 323 | public class ScheduledExecutorTest exten
323                  public void realRun() throws InterruptedException {
324                      threadStarted.countDown();
325                      assertEquals(0, p.getCompletedTaskCount());
326 <                    threadProceed.await();
326 >                    await(threadProceed);
327                      threadDone.countDown();
328                  }});
329              await(threadStarted);
330              assertEquals(0, p.getCompletedTaskCount());
331              threadProceed.countDown();
332 <            threadDone.await();
332 >            await(threadDone);
333              long startTime = System.nanoTime();
334              while (p.getCompletedTaskCount() != 1) {
335                  if (millisElapsedSince(startTime) > LONG_DELAY_MS)
# Line 373 | Line 358 | public class ScheduledExecutorTest exten
358          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(THREADS);
359          final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
360          final CountDownLatch done = new CountDownLatch(1);
361 <        try (PoolCleaner cleaner = cleaner(p)) {
361 >        try (PoolCleaner cleaner = cleaner(p, done)) {
362              assertEquals(0, p.getLargestPoolSize());
363              for (int i = 0; i < THREADS; i++)
364                  p.execute(new CheckedRunnable() {
365                      public void realRun() throws InterruptedException {
366                          threadsStarted.countDown();
367 <                        done.await();
367 >                        await(done);
368                          assertEquals(THREADS, p.getLargestPoolSize());
369                      }});
370 <            assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
370 >            await(threadsStarted);
371              assertEquals(THREADS, p.getLargestPoolSize());
387            done.countDown();
372          }
373          assertEquals(THREADS, p.getLargestPoolSize());
374      }
# Line 397 | Line 381 | public class ScheduledExecutorTest exten
381          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
382          final CountDownLatch threadStarted = new CountDownLatch(1);
383          final CountDownLatch done = new CountDownLatch(1);
384 <        try (PoolCleaner cleaner = cleaner(p)) {
384 >        try (PoolCleaner cleaner = cleaner(p, done)) {
385              assertEquals(0, p.getPoolSize());
386              p.execute(new CheckedRunnable() {
387                  public void realRun() throws InterruptedException {
388                      threadStarted.countDown();
389                      assertEquals(1, p.getPoolSize());
390 <                    done.await();
390 >                    await(done);
391                  }});
392 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
392 >            await(threadStarted);
393              assertEquals(1, p.getPoolSize());
410            done.countDown();
394          }
395      }
396  
# Line 416 | Line 399 | public class ScheduledExecutorTest exten
399       * submitted
400       */
401      public void testGetTaskCount() throws InterruptedException {
402 +        final int TASKS = 3;
403 +        final CountDownLatch done = new CountDownLatch(1);
404          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
405 <        try (PoolCleaner cleaner = cleaner(p)) {
405 >        try (PoolCleaner cleaner = cleaner(p, done)) {
406              final CountDownLatch threadStarted = new CountDownLatch(1);
422            final CountDownLatch done = new CountDownLatch(1);
423            final int TASKS = 5;
407              assertEquals(0, p.getTaskCount());
408 <            for (int i = 0; i < TASKS; i++)
408 >            assertEquals(0, p.getCompletedTaskCount());
409 >            p.execute(new CheckedRunnable() {
410 >                public void realRun() throws InterruptedException {
411 >                    threadStarted.countDown();
412 >                    await(done);
413 >                }});
414 >            await(threadStarted);
415 >            assertEquals(1, p.getTaskCount());
416 >            assertEquals(0, p.getCompletedTaskCount());
417 >            for (int i = 0; i < TASKS; i++) {
418 >                assertEquals(1 + i, p.getTaskCount());
419                  p.execute(new CheckedRunnable() {
420                      public void realRun() throws InterruptedException {
421                          threadStarted.countDown();
422 <                        done.await();
422 >                        assertEquals(1 + TASKS, p.getTaskCount());
423 >                        await(done);
424                      }});
425 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
426 <            assertEquals(TASKS, p.getTaskCount());
427 <            done.countDown();
425 >            }
426 >            assertEquals(1 + TASKS, p.getTaskCount());
427 >            assertEquals(0, p.getCompletedTaskCount());
428          }
429 +        assertEquals(1 + TASKS, p.getTaskCount());
430 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
431      }
432  
433      /**
434       * getThreadFactory returns factory in constructor if not set
435       */
436      public void testGetThreadFactory() throws InterruptedException {
437 <        ThreadFactory threadFactory = new SimpleThreadFactory();
438 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, threadFactory);
439 <        assertSame(threadFactory, p.getThreadFactory());
440 <        joinPool(p);
437 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
438 >        final ScheduledThreadPoolExecutor p =
439 >            new ScheduledThreadPoolExecutor(1, threadFactory);
440 >        try (PoolCleaner cleaner = cleaner(p)) {
441 >            assertSame(threadFactory, p.getThreadFactory());
442 >        }
443      }
444  
445      /**
# Line 449 | Line 447 | public class ScheduledExecutorTest exten
447       */
448      public void testSetThreadFactory() throws InterruptedException {
449          ThreadFactory threadFactory = new SimpleThreadFactory();
450 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
450 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
451          try (PoolCleaner cleaner = cleaner(p)) {
452              p.setThreadFactory(threadFactory);
453              assertSame(threadFactory, p.getThreadFactory());
# Line 460 | Line 458 | public class ScheduledExecutorTest exten
458       * setThreadFactory(null) throws NPE
459       */
460      public void testSetThreadFactoryNull() throws InterruptedException {
461 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
461 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
462          try (PoolCleaner cleaner = cleaner(p)) {
463              try {
464                  p.setThreadFactory(null);
# Line 470 | Line 468 | public class ScheduledExecutorTest exten
468      }
469  
470      /**
471 +     * The default rejected execution handler is AbortPolicy.
472 +     */
473 +    public void testDefaultRejectedExecutionHandler() {
474 +        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
475 +        try (PoolCleaner cleaner = cleaner(p)) {
476 +            assertTrue(p.getRejectedExecutionHandler()
477 +                       instanceof ThreadPoolExecutor.AbortPolicy);
478 +        }
479 +    }
480 +
481 +    /**
482       * isShutdown is false before shutdown, true after
483       */
484      public void testIsShutdown() {
485 <
486 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
487 <        try {
488 <            assertFalse(p.isShutdown());
489 <        }
490 <        finally {
491 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
485 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
486 >        assertFalse(p.isShutdown());
487 >        try (PoolCleaner cleaner = cleaner(p)) {
488 >            try {
489 >                p.shutdown();
490 >                assertTrue(p.isShutdown());
491 >            } catch (SecurityException ok) {}
492          }
484        assertTrue(p.isShutdown());
493      }
494  
495      /**
# Line 497 | Line 505 | public class ScheduledExecutorTest exten
505                  public void realRun() throws InterruptedException {
506                      assertFalse(p.isTerminated());
507                      threadStarted.countDown();
508 <                    done.await();
508 >                    await(done);
509                  }});
510 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
510 >            await(threadStarted);
511              assertFalse(p.isTerminating());
512              done.countDown();
513              try { p.shutdown(); } catch (SecurityException ok) { return; }
# Line 521 | Line 529 | public class ScheduledExecutorTest exten
529                  public void realRun() throws InterruptedException {
530                      assertFalse(p.isTerminating());
531                      threadStarted.countDown();
532 <                    done.await();
532 >                    await(done);
533                  }});
534 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
534 >            await(threadStarted);
535              assertFalse(p.isTerminating());
536              done.countDown();
537              try { p.shutdown(); } catch (SecurityException ok) { return; }
# Line 537 | Line 545 | public class ScheduledExecutorTest exten
545       * getQueue returns the work queue, which contains queued tasks
546       */
547      public void testGetQueue() throws InterruptedException {
548 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
549 <        try (PoolCleaner cleaner = cleaner(p)) {
548 >        final CountDownLatch done = new CountDownLatch(1);
549 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
550 >        try (PoolCleaner cleaner = cleaner(p, done)) {
551              final CountDownLatch threadStarted = new CountDownLatch(1);
552 <            final CountDownLatch done = new CountDownLatch(1);
553 <            ScheduledFuture[] tasks = new ScheduledFuture[5];
552 >            @SuppressWarnings("unchecked")
553 >            ScheduledFuture<?>[] tasks = (ScheduledFuture<?>[])new ScheduledFuture[5];
554              for (int i = 0; i < tasks.length; i++) {
555                  Runnable r = new CheckedRunnable() {
556                      public void realRun() throws InterruptedException {
557                          threadStarted.countDown();
558 <                        done.await();
558 >                        await(done);
559                      }};
560                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
561              }
562 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
562 >            await(threadStarted);
563              BlockingQueue<Runnable> q = p.getQueue();
564              assertTrue(q.contains(tasks[tasks.length - 1]));
565              assertFalse(q.contains(tasks[0]));
557            done.countDown();
566          }
567      }
568  
# Line 562 | Line 570 | public class ScheduledExecutorTest exten
570       * remove(task) removes queued task, and fails to remove active task
571       */
572      public void testRemove() throws InterruptedException {
573 +        final CountDownLatch done = new CountDownLatch(1);
574          final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
575 <        try (PoolCleaner cleaner = cleaner(p)) {
576 <            ScheduledFuture[] tasks = new ScheduledFuture[5];
575 >        try (PoolCleaner cleaner = cleaner(p, done)) {
576 >            @SuppressWarnings("unchecked")
577 >            ScheduledFuture<?>[] tasks = (ScheduledFuture<?>[])new ScheduledFuture[5];
578              final CountDownLatch threadStarted = new CountDownLatch(1);
569            final CountDownLatch done = new CountDownLatch(1);
579              for (int i = 0; i < tasks.length; i++) {
580                  Runnable r = new CheckedRunnable() {
581                      public void realRun() throws InterruptedException {
582                          threadStarted.countDown();
583 <                        done.await();
583 >                        await(done);
584                      }};
585                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
586              }
587 <            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
587 >            await(threadStarted);
588              BlockingQueue<Runnable> q = p.getQueue();
589              assertFalse(p.remove((Runnable)tasks[0]));
590              assertTrue(q.contains((Runnable)tasks[4]));
# Line 586 | Line 595 | public class ScheduledExecutorTest exten
595              assertTrue(q.contains((Runnable)tasks[3]));
596              assertTrue(p.remove((Runnable)tasks[3]));
597              assertFalse(q.contains((Runnable)tasks[3]));
589            done.countDown();
598          }
599      }
600  
# Line 594 | Line 602 | public class ScheduledExecutorTest exten
602       * purge eventually removes cancelled tasks from the queue
603       */
604      public void testPurge() throws InterruptedException {
605 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
606 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
607 <        for (int i = 0; i < tasks.length; i++)
608 <            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
609 <                                  LONG_DELAY_MS, MILLISECONDS);
610 <        try {
605 >        @SuppressWarnings("unchecked")
606 >        ScheduledFuture<?>[] tasks = (ScheduledFuture<?>[])new ScheduledFuture[5];
607 >        final Runnable releaser = new Runnable() { public void run() {
608 >            for (ScheduledFuture<?> task : tasks)
609 >                if (task != null) task.cancel(true); }};
610 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
611 >        try (PoolCleaner cleaner = cleaner(p, releaser)) {
612 >            for (int i = 0; i < tasks.length; i++)
613 >                tasks[i] = p.schedule(possiblyInterruptedRunnable(SMALL_DELAY_MS),
614 >                                      LONG_DELAY_MS, MILLISECONDS);
615              int max = tasks.length;
616              if (tasks[4].cancel(true)) --max;
617              if (tasks[3].cancel(true)) --max;
# Line 611 | Line 623 | public class ScheduledExecutorTest exten
623                  long count = p.getTaskCount();
624                  if (count == max)
625                      return;
626 <            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
626 >            } while (millisElapsedSince(startTime) < LONG_DELAY_MS);
627              fail("Purge failed to remove cancelled tasks");
616        } finally {
617            for (ScheduledFuture task : tasks)
618                task.cancel(true);
619            joinPool(p);
628          }
629      }
630  
# Line 630 | Line 638 | public class ScheduledExecutorTest exten
638          final AtomicInteger ran = new AtomicInteger(0);
639          final ScheduledThreadPoolExecutor p =
640              new ScheduledThreadPoolExecutor(poolSize);
641 <        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
641 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
642          Runnable waiter = new CheckedRunnable() { public void realRun() {
643              threadsStarted.countDown();
644              try {
645 <                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
645 >                MILLISECONDS.sleep(LONGER_DELAY_MS);
646              } catch (InterruptedException success) {}
647              ran.getAndIncrement();
648          }};
649          for (int i = 0; i < count; i++)
650              p.execute(waiter);
651 <        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
651 >        await(threadsStarted);
652          assertEquals(poolSize, p.getActiveCount());
653          assertEquals(0, p.getCompletedTaskCount());
654          final List<Runnable> queuedTasks;
# Line 663 | Line 671 | public class ScheduledExecutorTest exten
671       * and those tasks are drained from the queue
672       */
673      public void testShutdownNow_delayedTasks() throws InterruptedException {
674 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
675 <        List<ScheduledFuture> tasks = new ArrayList<>();
674 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
675 >        List<ScheduledFuture<?>> tasks = new ArrayList<>();
676          for (int i = 0; i < 3; i++) {
677              Runnable r = new NoOpRunnable();
678              tasks.add(p.schedule(r, 9, SECONDS));
# Line 672 | Line 680 | public class ScheduledExecutorTest exten
680              tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
681          }
682          if (testImplementationDetails)
683 <            assertEquals(new HashSet(tasks), new HashSet(p.getQueue()));
683 >            assertEquals(new HashSet<Object>(tasks), new HashSet<Object>(p.getQueue()));
684          final List<Runnable> queuedTasks;
685          try {
686              queuedTasks = p.shutdownNow();
# Line 682 | Line 690 | public class ScheduledExecutorTest exten
690          assertTrue(p.isShutdown());
691          assertTrue(p.getQueue().isEmpty());
692          if (testImplementationDetails)
693 <            assertEquals(new HashSet(tasks), new HashSet(queuedTasks));
693 >            assertEquals(new HashSet<Object>(tasks), new HashSet<Object>(queuedTasks));
694          assertEquals(tasks.size(), queuedTasks.size());
695 <        for (ScheduledFuture task : tasks) {
695 >        for (ScheduledFuture<?> task : tasks) {
696              assertFalse(task.isDone());
697              assertFalse(task.isCancelled());
698          }
# Line 699 | Line 707 | public class ScheduledExecutorTest exten
707       * - setExecuteExistingDelayedTasksAfterShutdownPolicy
708       * - setContinueExistingPeriodicTasksAfterShutdownPolicy
709       */
710 +    @SuppressWarnings("FutureReturnValueIgnored")
711      public void testShutdown_cancellation() throws Exception {
712 <        Boolean[] allBooleans = { null, Boolean.FALSE, Boolean.TRUE };
704 <        for (Boolean policy : allBooleans)
705 <    {
706 <        final int poolSize = 2;
712 >        final int poolSize = 4;
713          final ScheduledThreadPoolExecutor p
714              = new ScheduledThreadPoolExecutor(poolSize);
715 <        final boolean effectiveDelayedPolicy = (policy != Boolean.FALSE);
716 <        final boolean effectivePeriodicPolicy = (policy == Boolean.TRUE);
717 <        final boolean effectiveRemovePolicy = (policy == Boolean.TRUE);
718 <        if (policy != null) {
719 <            p.setExecuteExistingDelayedTasksAfterShutdownPolicy(policy);
720 <            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(policy);
721 <            p.setRemoveOnCancelPolicy(policy);
722 <        }
715 >        final BlockingQueue<Runnable> q = p.getQueue();
716 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
717 >        final long delay = rnd.nextInt(2);
718 >        final int rounds = rnd.nextInt(1, 3);
719 >        final boolean effectiveDelayedPolicy;
720 >        final boolean effectivePeriodicPolicy;
721 >        final boolean effectiveRemovePolicy;
722 >
723 >        if (rnd.nextBoolean())
724 >            p.setExecuteExistingDelayedTasksAfterShutdownPolicy(
725 >                effectiveDelayedPolicy = rnd.nextBoolean());
726 >        else
727 >            effectiveDelayedPolicy = true;
728          assertEquals(effectiveDelayedPolicy,
729                       p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
730 +
731 +        if (rnd.nextBoolean())
732 +            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(
733 +                effectivePeriodicPolicy = rnd.nextBoolean());
734 +        else
735 +            effectivePeriodicPolicy = false;
736          assertEquals(effectivePeriodicPolicy,
737                       p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
738 +
739 +        if (rnd.nextBoolean())
740 +            p.setRemoveOnCancelPolicy(
741 +                effectiveRemovePolicy = rnd.nextBoolean());
742 +        else
743 +            effectiveRemovePolicy = false;
744          assertEquals(effectiveRemovePolicy,
745                       p.getRemoveOnCancelPolicy());
746 <        // Strategy: Wedge the pool with poolSize "blocker" threads
746 >
747 >        final boolean periodicTasksContinue = effectivePeriodicPolicy && rnd.nextBoolean();
748 >
749 >        // Strategy: Wedge the pool with one wave of "blocker" tasks,
750 >        // then add a second wave that waits in the queue until unblocked.
751          final AtomicInteger ran = new AtomicInteger(0);
752          final CountDownLatch poolBlocked = new CountDownLatch(poolSize);
753          final CountDownLatch unblock = new CountDownLatch(1);
754 <        final CountDownLatch periodicLatch1 = new CountDownLatch(2);
728 <        final CountDownLatch periodicLatch2 = new CountDownLatch(2);
729 <        Runnable task = new CheckedRunnable() { public void realRun()
730 <                                                    throws InterruptedException {
731 <            poolBlocked.countDown();
732 <            assertTrue(unblock.await(LONG_DELAY_MS, MILLISECONDS));
733 <            ran.getAndIncrement();
734 <        }};
735 <        List<Future<?>> blockers = new ArrayList<>();
736 <        List<Future<?>> periodics = new ArrayList<>();
737 <        List<Future<?>> delayeds = new ArrayList<>();
738 <        for (int i = 0; i < poolSize; i++)
739 <            blockers.add(p.submit(task));
740 <        assertTrue(poolBlocked.await(LONG_DELAY_MS, MILLISECONDS));
741 <
742 <        periodics.add(p.scheduleAtFixedRate(countDowner(periodicLatch1),
743 <                                            1, 1, MILLISECONDS));
744 <        periodics.add(p.scheduleWithFixedDelay(countDowner(periodicLatch2),
745 <                                               1, 1, MILLISECONDS));
746 <        delayeds.add(p.schedule(task, 1, MILLISECONDS));
754 >        final RuntimeException exception = new RuntimeException();
755  
756 <        assertTrue(p.getQueue().containsAll(periodics));
757 <        assertTrue(p.getQueue().containsAll(delayeds));
758 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
759 <        assertTrue(p.isShutdown());
760 <        assertFalse(p.isTerminated());
761 <        for (Future<?> periodic : periodics) {
762 <            assertTrue(effectivePeriodicPolicy ^ periodic.isCancelled());
755 <            assertTrue(effectivePeriodicPolicy ^ periodic.isDone());
756 <        }
757 <        for (Future<?> delayed : delayeds) {
758 <            assertTrue(effectiveDelayedPolicy ^ delayed.isCancelled());
759 <            assertTrue(effectiveDelayedPolicy ^ delayed.isDone());
760 <        }
761 <        if (testImplementationDetails) {
762 <            assertEquals(effectivePeriodicPolicy,
763 <                         p.getQueue().containsAll(periodics));
764 <            assertEquals(effectiveDelayedPolicy,
765 <                         p.getQueue().containsAll(delayeds));
766 <        }
767 <        // Release all pool threads
768 <        unblock.countDown();
769 <
770 <        for (Future<?> delayed : delayeds) {
771 <            if (effectiveDelayedPolicy) {
772 <                assertNull(delayed.get());
756 >        class Task implements Runnable {
757 >            public void run() {
758 >                try {
759 >                    ran.getAndIncrement();
760 >                    poolBlocked.countDown();
761 >                    await(unblock);
762 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
763              }
764          }
765 <        if (effectivePeriodicPolicy) {
766 <            assertTrue(periodicLatch1.await(LONG_DELAY_MS, MILLISECONDS));
767 <            assertTrue(periodicLatch2.await(LONG_DELAY_MS, MILLISECONDS));
768 <            for (Future<?> periodic : periodics) {
769 <                assertTrue(periodic.cancel(false));
770 <                assertTrue(periodic.isCancelled());
771 <                assertTrue(periodic.isDone());
765 >
766 >        class PeriodicTask extends Task {
767 >            PeriodicTask(int rounds) { this.rounds = rounds; }
768 >            int rounds;
769 >            public void run() {
770 >                if (--rounds == 0) super.run();
771 >                // throw exception to surely terminate this periodic task,
772 >                // but in a separate execution and in a detectable way.
773 >                if (rounds == -1) throw exception;
774              }
775          }
776 +
777 +        Runnable task = new Task();
778 +
779 +        List<Future<?>> immediates = new ArrayList<>();
780 +        List<Future<?>> delayeds   = new ArrayList<>();
781 +        List<Future<?>> periodics  = new ArrayList<>();
782 +
783 +        immediates.add(p.submit(task));
784 +        delayeds.add(p.schedule(task, delay, MILLISECONDS));
785 +        periodics.add(p.scheduleAtFixedRate(
786 +                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
787 +        periodics.add(p.scheduleWithFixedDelay(
788 +                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
789 +
790 +        await(poolBlocked);
791 +
792 +        assertEquals(poolSize, ran.get());
793 +        assertEquals(poolSize, p.getActiveCount());
794 +        assertTrue(q.isEmpty());
795 +
796 +        // Add second wave of tasks.
797 +        immediates.add(p.submit(task));
798 +        delayeds.add(p.schedule(task, effectiveDelayedPolicy ? delay : LONG_DELAY_MS, MILLISECONDS));
799 +        periodics.add(p.scheduleAtFixedRate(
800 +                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
801 +        periodics.add(p.scheduleWithFixedDelay(
802 +                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
803 +
804 +        assertEquals(poolSize, q.size());
805 +        assertEquals(poolSize, ran.get());
806 +
807 +        immediates.forEach(
808 +            f -> assertTrue(((ScheduledFuture)f).getDelay(NANOSECONDS) <= 0L));
809 +
810 +        Stream.of(immediates, delayeds, periodics).flatMap(Collection::stream)
811 +            .forEach(f -> assertFalse(f.isDone()));
812 +
813 +        try { p.shutdown(); } catch (SecurityException ok) { return; }
814 +        assertTrue(p.isShutdown());
815 +        assertTrue(p.isTerminating());
816 +        assertFalse(p.isTerminated());
817 +
818 +        if (rnd.nextBoolean())
819 +            assertThrows(
820 +                RejectedExecutionException.class,
821 +                () -> p.submit(task),
822 +                () -> p.schedule(task, 1, SECONDS),
823 +                () -> p.scheduleAtFixedRate(
824 +                    new PeriodicTask(1), 1, 1, SECONDS),
825 +                () -> p.scheduleWithFixedDelay(
826 +                    new PeriodicTask(2), 1, 1, SECONDS));
827 +
828 +        assertTrue(q.contains(immediates.get(1)));
829 +        assertTrue(!effectiveDelayedPolicy
830 +                   ^ q.contains(delayeds.get(1)));
831 +        assertTrue(!effectivePeriodicPolicy
832 +                   ^ q.containsAll(periodics.subList(2, 4)));
833 +
834 +        immediates.forEach(f -> assertFalse(f.isDone()));
835 +
836 +        assertFalse(delayeds.get(0).isDone());
837 +        if (effectiveDelayedPolicy)
838 +            assertFalse(delayeds.get(1).isDone());
839 +        else
840 +            assertTrue(delayeds.get(1).isCancelled());
841 +
842 +        if (effectivePeriodicPolicy)
843 +            periodics.forEach(
844 +                f -> {
845 +                    assertFalse(f.isDone());
846 +                    if (!periodicTasksContinue) {
847 +                        assertTrue(f.cancel(false));
848 +                        assertTrue(f.isCancelled());
849 +                    }
850 +                });
851 +        else {
852 +            periodics.subList(0, 2).forEach(f -> assertFalse(f.isDone()));
853 +            periodics.subList(2, 4).forEach(f -> assertTrue(f.isCancelled()));
854 +        }
855 +
856 +        unblock.countDown();    // Release all pool threads
857 +
858          assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
859 +        assertFalse(p.isTerminating());
860          assertTrue(p.isTerminated());
861 <        assertEquals(2 + (effectiveDelayedPolicy ? 1 : 0), ran.get());
862 <    }}
861 >
862 >        assertTrue(q.isEmpty());
863 >
864 >        Stream.of(immediates, delayeds, periodics).flatMap(Collection::stream)
865 >            .forEach(f -> assertTrue(f.isDone()));
866 >
867 >        for (Future<?> f : immediates) assertNull(f.get());
868 >
869 >        assertNull(delayeds.get(0).get());
870 >        if (effectiveDelayedPolicy)
871 >            assertNull(delayeds.get(1).get());
872 >        else
873 >            assertTrue(delayeds.get(1).isCancelled());
874 >
875 >        if (periodicTasksContinue)
876 >            periodics.forEach(
877 >                f -> {
878 >                    try { f.get(); }
879 >                    catch (ExecutionException success) {
880 >                        assertSame(exception, success.getCause());
881 >                    }
882 >                    catch (Throwable fail) { threadUnexpectedException(fail); }
883 >                });
884 >        else
885 >            periodics.forEach(f -> assertTrue(f.isCancelled()));
886 >
887 >        assertEquals(poolSize + 1
888 >                     + (effectiveDelayedPolicy ? 1 : 0)
889 >                     + (periodicTasksContinue ? 2 : 0),
890 >                     ran.get());
891 >    }
892  
893      /**
894       * completed submit of callable returns result
# Line 823 | Line 927 | public class ScheduledExecutorTest exten
927      }
928  
929      /**
930 <     * invokeAny(null) throws NPE
930 >     * invokeAny(null) throws NullPointerException
931       */
932      public void testInvokeAny1() throws Exception {
933          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
# Line 836 | Line 940 | public class ScheduledExecutorTest exten
940      }
941  
942      /**
943 <     * invokeAny(empty collection) throws IAE
943 >     * invokeAny(empty collection) throws IllegalArgumentException
944       */
945      public void testInvokeAny2() throws Exception {
946          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
# Line 849 | Line 953 | public class ScheduledExecutorTest exten
953      }
954  
955      /**
956 <     * invokeAny(c) throws NPE if c has null elements
956 >     * invokeAny(c) throws NullPointerException if c has null elements
957       */
958      public void testInvokeAny3() throws Exception {
959          CountDownLatch latch = new CountDownLatch(1);
960          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
961          try (PoolCleaner cleaner = cleaner(e)) {
962 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
962 >            List<Callable<String>> l = new ArrayList<>();
963              l.add(latchAwaitingStringTask(latch));
964              l.add(null);
965              try {
# Line 872 | Line 976 | public class ScheduledExecutorTest exten
976      public void testInvokeAny4() throws Exception {
977          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
978          try (PoolCleaner cleaner = cleaner(e)) {
979 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
979 >            List<Callable<String>> l = new ArrayList<>();
980              l.add(new NPETask());
981              try {
982                  e.invokeAny(l);
# Line 889 | Line 993 | public class ScheduledExecutorTest exten
993      public void testInvokeAny5() throws Exception {
994          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
995          try (PoolCleaner cleaner = cleaner(e)) {
996 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
996 >            List<Callable<String>> l = new ArrayList<>();
997              l.add(new StringTask());
998              l.add(new StringTask());
999              String result = e.invokeAny(l);
# Line 911 | Line 1015 | public class ScheduledExecutorTest exten
1015      }
1016  
1017      /**
1018 <     * invokeAll(empty collection) returns empty collection
1018 >     * invokeAll(empty collection) returns empty list
1019       */
1020      public void testInvokeAll2() throws Exception {
1021          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1022 +        final Collection<Callable<String>> emptyCollection
1023 +            = Collections.emptyList();
1024          try (PoolCleaner cleaner = cleaner(e)) {
1025 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1025 >            List<Future<String>> r = e.invokeAll(emptyCollection);
1026              assertTrue(r.isEmpty());
1027          }
1028      }
# Line 927 | Line 1033 | public class ScheduledExecutorTest exten
1033      public void testInvokeAll3() throws Exception {
1034          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1035          try (PoolCleaner cleaner = cleaner(e)) {
1036 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1036 >            List<Callable<String>> l = new ArrayList<>();
1037              l.add(new StringTask());
1038              l.add(null);
1039              try {
# Line 943 | Line 1049 | public class ScheduledExecutorTest exten
1049      public void testInvokeAll4() throws Exception {
1050          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1051          try (PoolCleaner cleaner = cleaner(e)) {
1052 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1052 >            List<Callable<String>> l = new ArrayList<>();
1053              l.add(new NPETask());
1054              List<Future<String>> futures = e.invokeAll(l);
1055              assertEquals(1, futures.size());
# Line 962 | Line 1068 | public class ScheduledExecutorTest exten
1068      public void testInvokeAll5() throws Exception {
1069          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1070          try (PoolCleaner cleaner = cleaner(e)) {
1071 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1071 >            List<Callable<String>> l = new ArrayList<>();
1072              l.add(new StringTask());
1073              l.add(new StringTask());
1074              List<Future<String>> futures = e.invokeAll(l);
# Line 979 | Line 1085 | public class ScheduledExecutorTest exten
1085          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1086          try (PoolCleaner cleaner = cleaner(e)) {
1087              try {
1088 <                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1088 >                e.invokeAny(null, randomTimeout(), randomTimeUnit());
1089                  shouldThrow();
1090              } catch (NullPointerException success) {}
1091          }
1092      }
1093  
1094      /**
1095 <     * timed invokeAny(,,null) throws NPE
1095 >     * timed invokeAny(,,null) throws NullPointerException
1096       */
1097      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1098          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1099          try (PoolCleaner cleaner = cleaner(e)) {
1100 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1100 >            List<Callable<String>> l = new ArrayList<>();
1101              l.add(new StringTask());
1102              try {
1103 <                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1103 >                e.invokeAny(l, randomTimeout(), null);
1104                  shouldThrow();
1105              } catch (NullPointerException success) {}
1106          }
1107      }
1108  
1109      /**
1110 <     * timed invokeAny(empty collection) throws IAE
1110 >     * timed invokeAny(empty collection) throws IllegalArgumentException
1111       */
1112      public void testTimedInvokeAny2() throws Exception {
1113          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1114 +        final Collection<Callable<String>> emptyCollection
1115 +            = Collections.emptyList();
1116          try (PoolCleaner cleaner = cleaner(e)) {
1117              try {
1118 <                e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1118 >                e.invokeAny(emptyCollection, randomTimeout(), randomTimeUnit());
1119                  shouldThrow();
1120              } catch (IllegalArgumentException success) {}
1121          }
# Line 1020 | Line 1128 | public class ScheduledExecutorTest exten
1128          CountDownLatch latch = new CountDownLatch(1);
1129          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1130          try (PoolCleaner cleaner = cleaner(e)) {
1131 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1131 >            List<Callable<String>> l = new ArrayList<>();
1132              l.add(latchAwaitingStringTask(latch));
1133              l.add(null);
1134              try {
1135 <                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1135 >                e.invokeAny(l, randomTimeout(), randomTimeUnit());
1136                  shouldThrow();
1137              } catch (NullPointerException success) {}
1138              latch.countDown();
# Line 1037 | Line 1145 | public class ScheduledExecutorTest exten
1145      public void testTimedInvokeAny4() throws Exception {
1146          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1147          try (PoolCleaner cleaner = cleaner(e)) {
1148 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1148 >            long startTime = System.nanoTime();
1149 >            List<Callable<String>> l = new ArrayList<>();
1150              l.add(new NPETask());
1151              try {
1152 <                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1152 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1153                  shouldThrow();
1154              } catch (ExecutionException success) {
1155                  assertTrue(success.getCause() instanceof NullPointerException);
1156              }
1157 +            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1158          }
1159      }
1160  
# Line 1054 | Line 1164 | public class ScheduledExecutorTest exten
1164      public void testTimedInvokeAny5() throws Exception {
1165          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1166          try (PoolCleaner cleaner = cleaner(e)) {
1167 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1167 >            long startTime = System.nanoTime();
1168 >            List<Callable<String>> l = new ArrayList<>();
1169              l.add(new StringTask());
1170              l.add(new StringTask());
1171 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1171 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1172              assertSame(TEST_STRING, result);
1173 +            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1174          }
1175      }
1176  
# Line 1069 | Line 1181 | public class ScheduledExecutorTest exten
1181          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1182          try (PoolCleaner cleaner = cleaner(e)) {
1183              try {
1184 <                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1184 >                e.invokeAll(null, randomTimeout(), randomTimeUnit());
1185                  shouldThrow();
1186              } catch (NullPointerException success) {}
1187          }
# Line 1081 | Line 1193 | public class ScheduledExecutorTest exten
1193      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1194          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1195          try (PoolCleaner cleaner = cleaner(e)) {
1196 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1196 >            List<Callable<String>> l = new ArrayList<>();
1197              l.add(new StringTask());
1198              try {
1199 <                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1199 >                e.invokeAll(l, randomTimeout(), null);
1200                  shouldThrow();
1201              } catch (NullPointerException success) {}
1202          }
1203      }
1204  
1205      /**
1206 <     * timed invokeAll(empty collection) returns empty collection
1206 >     * timed invokeAll(empty collection) returns empty list
1207       */
1208      public void testTimedInvokeAll2() throws Exception {
1209          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1210 +        final Collection<Callable<String>> emptyCollection
1211 +            = Collections.emptyList();
1212          try (PoolCleaner cleaner = cleaner(e)) {
1213 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1214 <                                                 MEDIUM_DELAY_MS, MILLISECONDS);
1213 >            List<Future<String>> r =
1214 >                e.invokeAll(emptyCollection, randomTimeout(), randomTimeUnit());
1215              assertTrue(r.isEmpty());
1216          }
1217      }
# Line 1108 | Line 1222 | public class ScheduledExecutorTest exten
1222      public void testTimedInvokeAll3() throws Exception {
1223          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1224          try (PoolCleaner cleaner = cleaner(e)) {
1225 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1225 >            List<Callable<String>> l = new ArrayList<>();
1226              l.add(new StringTask());
1227              l.add(null);
1228              try {
1229 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1229 >                e.invokeAll(l, randomTimeout(), randomTimeUnit());
1230                  shouldThrow();
1231              } catch (NullPointerException success) {}
1232          }
# Line 1124 | Line 1238 | public class ScheduledExecutorTest exten
1238      public void testTimedInvokeAll4() throws Exception {
1239          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1240          try (PoolCleaner cleaner = cleaner(e)) {
1241 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1241 >            List<Callable<String>> l = new ArrayList<>();
1242              l.add(new NPETask());
1243              List<Future<String>> futures =
1244 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1244 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1245              assertEquals(1, futures.size());
1246              try {
1247                  futures.get(0).get();
# Line 1144 | Line 1258 | public class ScheduledExecutorTest exten
1258      public void testTimedInvokeAll5() throws Exception {
1259          final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1260          try (PoolCleaner cleaner = cleaner(e)) {
1261 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1261 >            List<Callable<String>> l = new ArrayList<>();
1262              l.add(new StringTask());
1263              l.add(new StringTask());
1264              List<Future<String>> futures =
# Line 1159 | Line 1273 | public class ScheduledExecutorTest exten
1273       * timed invokeAll(c) cancels tasks not completed by timeout
1274       */
1275      public void testTimedInvokeAll6() throws Exception {
1276 <        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1277 <        try (PoolCleaner cleaner = cleaner(e)) {
1278 <            for (long timeout = timeoutMillis();;) {
1276 >        for (long timeout = timeoutMillis();;) {
1277 >            final CountDownLatch done = new CountDownLatch(1);
1278 >            final Callable<String> waiter = new CheckedCallable<>() {
1279 >                public String realCall() {
1280 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1281 >                    catch (InterruptedException ok) {}
1282 >                    return "1"; }};
1283 >            final ExecutorService p = new ScheduledThreadPoolExecutor(2);
1284 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1285                  List<Callable<String>> tasks = new ArrayList<>();
1286                  tasks.add(new StringTask("0"));
1287 <                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1287 >                tasks.add(waiter);
1288                  tasks.add(new StringTask("2"));
1289                  long startTime = System.nanoTime();
1290                  List<Future<String>> futures =
1291 <                    e.invokeAll(tasks, timeout, MILLISECONDS);
1291 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1292                  assertEquals(tasks.size(), futures.size());
1293                  assertTrue(millisElapsedSince(startTime) >= timeout);
1294 <                for (Future future : futures)
1294 >                for (Future<?> future : futures)
1295                      assertTrue(future.isDone());
1296                  assertTrue(futures.get(1).isCancelled());
1297                  try {
# Line 1187 | Line 1307 | public class ScheduledExecutorTest exten
1307          }
1308      }
1309  
1310 +    /**
1311 +     * A fixed delay task with overflowing period should not prevent a
1312 +     * one-shot task from executing.
1313 +     * https://bugs.openjdk.java.net/browse/JDK-8051859
1314 +     */
1315 +    @SuppressWarnings("FutureReturnValueIgnored")
1316 +    public void testScheduleWithFixedDelay_overflow() throws Exception {
1317 +        final CountDownLatch delayedDone = new CountDownLatch(1);
1318 +        final CountDownLatch immediateDone = new CountDownLatch(1);
1319 +        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
1320 +        try (PoolCleaner cleaner = cleaner(p)) {
1321 +            final Runnable delayed = () -> {
1322 +                delayedDone.countDown();
1323 +                p.submit(() -> immediateDone.countDown());
1324 +            };
1325 +            p.scheduleWithFixedDelay(delayed, 0L, Long.MAX_VALUE, SECONDS);
1326 +            await(delayedDone);
1327 +            await(immediateDone);
1328 +        }
1329 +    }
1330 +
1331   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines