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.58 by jsr166, Mon Sep 28 08:23:49 2015 UTC vs.
Revision 1.93 by jsr166, Mon May 29 19:15:03 2017 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;
# Line 17 | Line 18 | import java.util.concurrent.Callable;
18   import java.util.concurrent.CancellationException;
19   import java.util.concurrent.CountDownLatch;
20   import java.util.concurrent.ExecutionException;
20 import java.util.concurrent.Executors;
21   import java.util.concurrent.ExecutorService;
22   import java.util.concurrent.Future;
23   import java.util.concurrent.RejectedExecutionException;
24   import java.util.concurrent.ScheduledFuture;
25   import java.util.concurrent.ScheduledThreadPoolExecutor;
26   import java.util.concurrent.ThreadFactory;
27 + import java.util.concurrent.ThreadLocalRandom;
28   import java.util.concurrent.ThreadPoolExecutor;
29 + import java.util.concurrent.atomic.AtomicBoolean;
30   import java.util.concurrent.atomic.AtomicInteger;
31 + import java.util.concurrent.atomic.AtomicLong;
32 + import java.util.stream.Stream;
33  
34   import junit.framework.Test;
35   import junit.framework.TestSuite;
# Line 42 | Line 46 | public class ScheduledExecutorTest exten
46       * execute successfully executes a runnable
47       */
48      public void testExecute() throws InterruptedException {
49 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
50 <        final CountDownLatch done = new CountDownLatch(1);
51 <        final Runnable task = new CheckedRunnable() {
52 <            public void realRun() {
53 <                done.countDown();
50 <            }};
51 <        try {
49 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
50 >        try (PoolCleaner cleaner = cleaner(p)) {
51 >            final CountDownLatch done = new CountDownLatch(1);
52 >            final Runnable task = new CheckedRunnable() {
53 >                public void realRun() { done.countDown(); }};
54              p.execute(task);
55 <            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
54 <        } finally {
55 <            joinPool(p);
55 >            await(done);
56          }
57      }
58  
# Line 60 | Line 60 | public class ScheduledExecutorTest exten
60       * delayed schedule of callable successfully executes after delay
61       */
62      public void testSchedule1() throws Exception {
63 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
64 <        final long startTime = System.nanoTime();
65 <        final CountDownLatch done = new CountDownLatch(1);
66 <        try {
63 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
64 >        try (PoolCleaner cleaner = cleaner(p)) {
65 >            final long startTime = System.nanoTime();
66 >            final CountDownLatch done = new CountDownLatch(1);
67              Callable task = new CheckedCallable<Boolean>() {
68                  public Boolean realCall() {
69                      done.countDown();
# Line 73 | Line 73 | public class ScheduledExecutorTest exten
73              Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
74              assertSame(Boolean.TRUE, f.get());
75              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
76 <            assertTrue(done.await(0L, MILLISECONDS));
77 <        } finally {
78 <            joinPool(p);
76 >            assertEquals(0L, done.getCount());
77          }
78      }
79  
# Line 83 | Line 81 | public class ScheduledExecutorTest exten
81       * delayed schedule of runnable successfully executes after delay
82       */
83      public void testSchedule3() throws Exception {
84 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
85 <        final long startTime = System.nanoTime();
86 <        final CountDownLatch done = new CountDownLatch(1);
87 <        try {
84 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
85 >        try (PoolCleaner cleaner = cleaner(p)) {
86 >            final long startTime = System.nanoTime();
87 >            final CountDownLatch done = new CountDownLatch(1);
88              Runnable task = new CheckedRunnable() {
89                  public void realRun() {
90                      done.countDown();
# Line 96 | Line 94 | public class ScheduledExecutorTest exten
94              await(done);
95              assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
96              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
99        } finally {
100            joinPool(p);
97          }
98      }
99  
# Line 105 | Line 101 | public class ScheduledExecutorTest exten
101       * scheduleAtFixedRate executes runnable after given initial delay
102       */
103      public void testSchedule4() throws Exception {
104 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
105 <        final long startTime = System.nanoTime();
106 <        final CountDownLatch done = new CountDownLatch(1);
107 <        try {
104 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
105 >        try (PoolCleaner cleaner = cleaner(p)) {
106 >            final long startTime = System.nanoTime();
107 >            final CountDownLatch done = new CountDownLatch(1);
108              Runnable task = new CheckedRunnable() {
109                  public void realRun() {
110                      done.countDown();
# Line 120 | Line 116 | public class ScheduledExecutorTest exten
116              await(done);
117              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
118              f.cancel(true);
123        } finally {
124            joinPool(p);
119          }
120      }
121  
# Line 129 | Line 123 | public class ScheduledExecutorTest exten
123       * scheduleWithFixedDelay executes runnable after given initial delay
124       */
125      public void testSchedule5() throws Exception {
126 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
127 <        final long startTime = System.nanoTime();
128 <        final CountDownLatch done = new CountDownLatch(1);
129 <        try {
126 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
127 >        try (PoolCleaner cleaner = cleaner(p)) {
128 >            final long startTime = System.nanoTime();
129 >            final CountDownLatch done = new CountDownLatch(1);
130              Runnable task = new CheckedRunnable() {
131                  public void realRun() {
132                      done.countDown();
# Line 144 | Line 138 | public class ScheduledExecutorTest exten
138              await(done);
139              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
140              f.cancel(true);
147        } finally {
148            joinPool(p);
141          }
142      }
143  
# Line 155 | Line 147 | public class ScheduledExecutorTest exten
147      }
148  
149      /**
150 <     * scheduleAtFixedRate executes series of tasks at given rate
150 >     * scheduleAtFixedRate executes series of tasks at given rate.
151 >     * Eventually, it must hold that:
152 >     *   cycles - 1 <= elapsedMillis/delay < cycles
153       */
154      public void testFixedRateSequence() throws InterruptedException {
155 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
156 <        try {
155 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
156 >        try (PoolCleaner cleaner = cleaner(p)) {
157              for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
158 <                long startTime = System.nanoTime();
159 <                int cycles = 10;
158 >                final long startTime = System.nanoTime();
159 >                final int cycles = 8;
160                  final CountDownLatch done = new CountDownLatch(cycles);
161 <                Runnable task = new CheckedRunnable() {
161 >                final Runnable task = new CheckedRunnable() {
162                      public void realRun() { done.countDown(); }};
163 <                ScheduledFuture h =
163 >                final ScheduledFuture periodicTask =
164                      p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
165 <                done.await();
166 <                h.cancel(true);
167 <                double normalizedTime =
168 <                    (double) millisElapsedSince(startTime) / delay;
169 <                if (normalizedTime >= cycles - 1 &&
170 <                    normalizedTime <= cycles)
165 >                final int totalDelayMillis = (cycles - 1) * delay;
166 >                await(done, totalDelayMillis + LONG_DELAY_MS);
167 >                periodicTask.cancel(true);
168 >                final long elapsedMillis = millisElapsedSince(startTime);
169 >                assertTrue(elapsedMillis >= totalDelayMillis);
170 >                if (elapsedMillis <= cycles * delay)
171                      return;
172 +                // else retry with longer delay
173              }
174 <            throw new AssertionError("unexpected execution rate");
180 <        } finally {
181 <            joinPool(p);
174 >            fail("unexpected execution rate");
175          }
176      }
177  
178      /**
179 <     * scheduleWithFixedDelay executes series of tasks with given period
179 >     * scheduleWithFixedDelay executes series of tasks with given period.
180 >     * Eventually, it must hold that each task starts at least delay and at
181 >     * most 2 * delay after the termination of the previous task.
182       */
183      public void testFixedDelaySequence() throws InterruptedException {
184 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
185 <        try {
184 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
185 >        try (PoolCleaner cleaner = cleaner(p)) {
186              for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
187 <                long startTime = System.nanoTime();
188 <                int cycles = 10;
187 >                final long startTime = System.nanoTime();
188 >                final AtomicLong previous = new AtomicLong(startTime);
189 >                final AtomicBoolean tryLongerDelay = new AtomicBoolean(false);
190 >                final int cycles = 8;
191                  final CountDownLatch done = new CountDownLatch(cycles);
192 <                Runnable task = new CheckedRunnable() {
193 <                    public void realRun() { done.countDown(); }};
194 <                ScheduledFuture h =
192 >                final int d = delay;
193 >                final Runnable task = new CheckedRunnable() {
194 >                    public void realRun() {
195 >                        long now = System.nanoTime();
196 >                        long elapsedMillis
197 >                            = NANOSECONDS.toMillis(now - previous.get());
198 >                        if (done.getCount() == cycles) { // first execution
199 >                            if (elapsedMillis >= d)
200 >                                tryLongerDelay.set(true);
201 >                        } else {
202 >                            assertTrue(elapsedMillis >= d);
203 >                            if (elapsedMillis >= 2 * d)
204 >                                tryLongerDelay.set(true);
205 >                        }
206 >                        previous.set(now);
207 >                        done.countDown();
208 >                    }};
209 >                final ScheduledFuture periodicTask =
210                      p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
211 <                done.await();
212 <                h.cancel(true);
213 <                double normalizedTime =
214 <                    (double) millisElapsedSince(startTime) / delay;
215 <                if (normalizedTime >= cycles - 1 &&
216 <                    normalizedTime <= cycles)
211 >                final int totalDelayMillis = (cycles - 1) * delay;
212 >                await(done, totalDelayMillis + cycles * LONG_DELAY_MS);
213 >                periodicTask.cancel(true);
214 >                final long elapsedMillis = millisElapsedSince(startTime);
215 >                assertTrue(elapsedMillis >= totalDelayMillis);
216 >                if (!tryLongerDelay.get())
217                      return;
218 +                // else retry with longer delay
219              }
220 <            throw new AssertionError("unexpected execution rate");
208 <        } finally {
209 <            joinPool(p);
220 >            fail("unexpected execution rate");
221          }
222      }
223  
# Line 214 | Line 225 | public class ScheduledExecutorTest exten
225       * execute(null) throws NPE
226       */
227      public void testExecuteNull() throws InterruptedException {
228 <        ScheduledThreadPoolExecutor se = null;
229 <        try {
230 <            se = new ScheduledThreadPoolExecutor(1);
231 <            se.execute(null);
232 <            shouldThrow();
233 <        } catch (NullPointerException success) {}
234 <
224 <        joinPool(se);
228 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
229 >        try (PoolCleaner cleaner = cleaner(p)) {
230 >            try {
231 >                p.execute(null);
232 >                shouldThrow();
233 >            } catch (NullPointerException success) {}
234 >        }
235      }
236  
237      /**
238       * schedule(null) throws NPE
239       */
240      public void testScheduleNull() throws InterruptedException {
241 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
242 <        try {
243 <            TrackedCallable callable = null;
244 <            Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
245 <            shouldThrow();
246 <        } catch (NullPointerException success) {}
247 <        joinPool(se);
241 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
242 >        try (PoolCleaner cleaner = cleaner(p)) {
243 >            try {
244 >                Future f = p.schedule((Callable)null,
245 >                                      randomTimeout(), randomTimeUnit());
246 >                shouldThrow();
247 >            } catch (NullPointerException success) {}
248 >        }
249      }
250  
251      /**
252       * execute throws RejectedExecutionException if shutdown
253       */
254      public void testSchedule1_RejectedExecutionException() throws InterruptedException {
255 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
256 <        try {
257 <            se.shutdown();
258 <            se.schedule(new NoOpRunnable(),
259 <                        MEDIUM_DELAY_MS, MILLISECONDS);
260 <            shouldThrow();
261 <        } catch (RejectedExecutionException success) {
262 <        } catch (SecurityException ok) {
255 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
256 >        try (PoolCleaner cleaner = cleaner(p)) {
257 >            try {
258 >                p.shutdown();
259 >                p.schedule(new NoOpRunnable(),
260 >                           MEDIUM_DELAY_MS, MILLISECONDS);
261 >                shouldThrow();
262 >            } catch (RejectedExecutionException success) {
263 >            } catch (SecurityException ok) {}
264          }
253
254        joinPool(se);
265      }
266  
267      /**
268       * schedule throws RejectedExecutionException if shutdown
269       */
270      public void testSchedule2_RejectedExecutionException() throws InterruptedException {
271 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
272 <        try {
273 <            se.shutdown();
274 <            se.schedule(new NoOpCallable(),
275 <                        MEDIUM_DELAY_MS, MILLISECONDS);
276 <            shouldThrow();
277 <        } catch (RejectedExecutionException success) {
278 <        } catch (SecurityException ok) {
271 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
272 >        try (PoolCleaner cleaner = cleaner(p)) {
273 >            try {
274 >                p.shutdown();
275 >                p.schedule(new NoOpCallable(),
276 >                           MEDIUM_DELAY_MS, MILLISECONDS);
277 >                shouldThrow();
278 >            } catch (RejectedExecutionException success) {
279 >            } catch (SecurityException ok) {}
280          }
270        joinPool(se);
281      }
282  
283      /**
284       * schedule callable throws RejectedExecutionException if shutdown
285       */
286      public void testSchedule3_RejectedExecutionException() throws InterruptedException {
287 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
288 <        try {
289 <            se.shutdown();
290 <            se.schedule(new NoOpCallable(),
291 <                        MEDIUM_DELAY_MS, MILLISECONDS);
292 <            shouldThrow();
293 <        } catch (RejectedExecutionException success) {
294 <        } catch (SecurityException ok) {
287 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
288 >        try (PoolCleaner cleaner = cleaner(p)) {
289 >            try {
290 >                p.shutdown();
291 >                p.schedule(new NoOpCallable(),
292 >                           MEDIUM_DELAY_MS, MILLISECONDS);
293 >                shouldThrow();
294 >            } catch (RejectedExecutionException success) {
295 >            } catch (SecurityException ok) {}
296          }
286        joinPool(se);
297      }
298  
299      /**
300       * scheduleAtFixedRate throws RejectedExecutionException if shutdown
301       */
302      public void testScheduleAtFixedRate1_RejectedExecutionException() throws InterruptedException {
303 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
304 <        try {
305 <            se.shutdown();
306 <            se.scheduleAtFixedRate(new NoOpRunnable(),
307 <                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
308 <            shouldThrow();
309 <        } catch (RejectedExecutionException success) {
310 <        } catch (SecurityException ok) {
303 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
304 >        try (PoolCleaner cleaner = cleaner(p)) {
305 >            try {
306 >                p.shutdown();
307 >                p.scheduleAtFixedRate(new NoOpRunnable(),
308 >                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
309 >                shouldThrow();
310 >            } catch (RejectedExecutionException success) {
311 >            } catch (SecurityException ok) {}
312          }
302        joinPool(se);
313      }
314  
315      /**
316       * scheduleWithFixedDelay throws RejectedExecutionException if shutdown
317       */
318      public void testScheduleWithFixedDelay1_RejectedExecutionException() throws InterruptedException {
319 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
320 <        try {
321 <            se.shutdown();
322 <            se.scheduleWithFixedDelay(new NoOpRunnable(),
323 <                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
324 <            shouldThrow();
325 <        } catch (RejectedExecutionException success) {
326 <        } catch (SecurityException ok) {
319 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
320 >        try (PoolCleaner cleaner = cleaner(p)) {
321 >            try {
322 >                p.shutdown();
323 >                p.scheduleWithFixedDelay(new NoOpRunnable(),
324 >                                         MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
325 >                shouldThrow();
326 >            } catch (RejectedExecutionException success) {
327 >            } catch (SecurityException ok) {}
328          }
318        joinPool(se);
329      }
330  
331      /**
# Line 323 | Line 333 | public class ScheduledExecutorTest exten
333       * thread becomes active
334       */
335      public void testGetActiveCount() throws InterruptedException {
326        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
327        final CountDownLatch threadStarted = new CountDownLatch(1);
336          final CountDownLatch done = new CountDownLatch(1);
337 <        try {
337 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
338 >        try (PoolCleaner cleaner = cleaner(p, done)) {
339 >            final CountDownLatch threadStarted = new CountDownLatch(1);
340              assertEquals(0, p.getActiveCount());
341              p.execute(new CheckedRunnable() {
342                  public void realRun() throws InterruptedException {
343                      threadStarted.countDown();
344                      assertEquals(1, p.getActiveCount());
345 <                    done.await();
345 >                    await(done);
346                  }});
347 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
347 >            await(threadStarted);
348              assertEquals(1, p.getActiveCount());
339        } finally {
340            done.countDown();
341            joinPool(p);
349          }
350      }
351  
# Line 348 | Line 355 | public class ScheduledExecutorTest exten
355       */
356      public void testGetCompletedTaskCount() throws InterruptedException {
357          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
358 <        final CountDownLatch threadStarted = new CountDownLatch(1);
359 <        final CountDownLatch threadProceed = new CountDownLatch(1);
360 <        final CountDownLatch threadDone = new CountDownLatch(1);
361 <        try {
358 >        try (PoolCleaner cleaner = cleaner(p)) {
359 >            final CountDownLatch threadStarted = new CountDownLatch(1);
360 >            final CountDownLatch threadProceed = new CountDownLatch(1);
361 >            final CountDownLatch threadDone = new CountDownLatch(1);
362              assertEquals(0, p.getCompletedTaskCount());
363              p.execute(new CheckedRunnable() {
364                  public void realRun() throws InterruptedException {
365                      threadStarted.countDown();
366                      assertEquals(0, p.getCompletedTaskCount());
367 <                    threadProceed.await();
367 >                    await(threadProceed);
368                      threadDone.countDown();
369                  }});
370              await(threadStarted);
371              assertEquals(0, p.getCompletedTaskCount());
372              threadProceed.countDown();
373 <            threadDone.await();
373 >            await(threadDone);
374              long startTime = System.nanoTime();
375              while (p.getCompletedTaskCount() != 1) {
376                  if (millisElapsedSince(startTime) > LONG_DELAY_MS)
377                      fail("timed out");
378                  Thread.yield();
379              }
373        } finally {
374            joinPool(p);
380          }
381      }
382  
# Line 380 | Line 385 | public class ScheduledExecutorTest exten
385       */
386      public void testGetCorePoolSize() throws InterruptedException {
387          ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
388 <        assertEquals(1, p.getCorePoolSize());
389 <        joinPool(p);
388 >        try (PoolCleaner cleaner = cleaner(p)) {
389 >            assertEquals(1, p.getCorePoolSize());
390 >        }
391      }
392  
393      /**
# Line 393 | Line 399 | public class ScheduledExecutorTest exten
399          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(THREADS);
400          final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
401          final CountDownLatch done = new CountDownLatch(1);
402 <        try {
402 >        try (PoolCleaner cleaner = cleaner(p, done)) {
403              assertEquals(0, p.getLargestPoolSize());
404              for (int i = 0; i < THREADS; i++)
405                  p.execute(new CheckedRunnable() {
406                      public void realRun() throws InterruptedException {
407                          threadsStarted.countDown();
408 <                        done.await();
408 >                        await(done);
409                          assertEquals(THREADS, p.getLargestPoolSize());
410                      }});
411 <            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
406 <            assertEquals(THREADS, p.getLargestPoolSize());
407 <        } finally {
408 <            done.countDown();
409 <            joinPool(p);
411 >            await(threadsStarted);
412              assertEquals(THREADS, p.getLargestPoolSize());
413          }
414 +        assertEquals(THREADS, p.getLargestPoolSize());
415      }
416  
417      /**
# Line 419 | Line 422 | public class ScheduledExecutorTest exten
422          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
423          final CountDownLatch threadStarted = new CountDownLatch(1);
424          final CountDownLatch done = new CountDownLatch(1);
425 <        try {
425 >        try (PoolCleaner cleaner = cleaner(p, done)) {
426              assertEquals(0, p.getPoolSize());
427              p.execute(new CheckedRunnable() {
428                  public void realRun() throws InterruptedException {
429                      threadStarted.countDown();
430                      assertEquals(1, p.getPoolSize());
431 <                    done.await();
431 >                    await(done);
432                  }});
433 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
433 >            await(threadStarted);
434              assertEquals(1, p.getPoolSize());
432        } finally {
433            done.countDown();
434            joinPool(p);
435          }
436      }
437  
# Line 440 | Line 440 | public class ScheduledExecutorTest exten
440       * submitted
441       */
442      public void testGetTaskCount() throws InterruptedException {
443 <        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
444 <        final CountDownLatch threadStarted = new CountDownLatch(1);
443 >        final int TASKS = 3;
444          final CountDownLatch done = new CountDownLatch(1);
445 <        final int TASKS = 5;
446 <        try {
445 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
446 >        try (PoolCleaner cleaner = cleaner(p, done)) {
447 >            final CountDownLatch threadStarted = new CountDownLatch(1);
448              assertEquals(0, p.getTaskCount());
449 <            for (int i = 0; i < TASKS; i++)
449 >            assertEquals(0, p.getCompletedTaskCount());
450 >            p.execute(new CheckedRunnable() {
451 >                public void realRun() throws InterruptedException {
452 >                    threadStarted.countDown();
453 >                    await(done);
454 >                }});
455 >            await(threadStarted);
456 >            assertEquals(1, p.getTaskCount());
457 >            assertEquals(0, p.getCompletedTaskCount());
458 >            for (int i = 0; i < TASKS; i++) {
459 >                assertEquals(1 + i, p.getTaskCount());
460                  p.execute(new CheckedRunnable() {
461                      public void realRun() throws InterruptedException {
462                          threadStarted.countDown();
463 <                        done.await();
463 >                        assertEquals(1 + TASKS, p.getTaskCount());
464 >                        await(done);
465                      }});
466 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
467 <            assertEquals(TASKS, p.getTaskCount());
468 <        } finally {
458 <            done.countDown();
459 <            joinPool(p);
466 >            }
467 >            assertEquals(1 + TASKS, p.getTaskCount());
468 >            assertEquals(0, p.getCompletedTaskCount());
469          }
470 +        assertEquals(1 + TASKS, p.getTaskCount());
471 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
472      }
473  
474      /**
475       * getThreadFactory returns factory in constructor if not set
476       */
477      public void testGetThreadFactory() throws InterruptedException {
478 <        ThreadFactory tf = new SimpleThreadFactory();
479 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, tf);
480 <        assertSame(tf, p.getThreadFactory());
481 <        joinPool(p);
478 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
479 >        final ScheduledThreadPoolExecutor p =
480 >            new ScheduledThreadPoolExecutor(1, threadFactory);
481 >        try (PoolCleaner cleaner = cleaner(p)) {
482 >            assertSame(threadFactory, p.getThreadFactory());
483 >        }
484      }
485  
486      /**
487       * setThreadFactory sets the thread factory returned by getThreadFactory
488       */
489      public void testSetThreadFactory() throws InterruptedException {
490 <        ThreadFactory tf = new SimpleThreadFactory();
491 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
492 <        p.setThreadFactory(tf);
493 <        assertSame(tf, p.getThreadFactory());
494 <        joinPool(p);
490 >        ThreadFactory threadFactory = new SimpleThreadFactory();
491 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
492 >        try (PoolCleaner cleaner = cleaner(p)) {
493 >            p.setThreadFactory(threadFactory);
494 >            assertSame(threadFactory, p.getThreadFactory());
495 >        }
496      }
497  
498      /**
499       * setThreadFactory(null) throws NPE
500       */
501      public void testSetThreadFactoryNull() throws InterruptedException {
502 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
503 <        try {
504 <            p.setThreadFactory(null);
505 <            shouldThrow();
506 <        } catch (NullPointerException success) {
507 <        } finally {
508 <            joinPool(p);
502 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
503 >        try (PoolCleaner cleaner = cleaner(p)) {
504 >            try {
505 >                p.setThreadFactory(null);
506 >                shouldThrow();
507 >            } catch (NullPointerException success) {}
508 >        }
509 >    }
510 >
511 >    /**
512 >     * The default rejected execution handler is AbortPolicy.
513 >     */
514 >    public void testDefaultRejectedExecutionHandler() {
515 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
516 >        try (PoolCleaner cleaner = cleaner(p)) {
517 >            assertTrue(p.getRejectedExecutionHandler()
518 >                       instanceof ThreadPoolExecutor.AbortPolicy);
519          }
520      }
521  
# Line 499 | Line 523 | public class ScheduledExecutorTest exten
523       * isShutdown is false before shutdown, true after
524       */
525      public void testIsShutdown() {
526 <
527 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
528 <        try {
529 <            assertFalse(p.isShutdown());
530 <        }
531 <        finally {
532 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
526 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
527 >        assertFalse(p.isShutdown());
528 >        try (PoolCleaner cleaner = cleaner(p)) {
529 >            try {
530 >                p.shutdown();
531 >                assertTrue(p.isShutdown());
532 >            } catch (SecurityException ok) {}
533          }
510        assertTrue(p.isShutdown());
534      }
535  
536      /**
# Line 515 | Line 538 | public class ScheduledExecutorTest exten
538       */
539      public void testIsTerminated() throws InterruptedException {
540          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
541 <        final CountDownLatch threadStarted = new CountDownLatch(1);
542 <        final CountDownLatch done = new CountDownLatch(1);
543 <        assertFalse(p.isTerminated());
544 <        try {
541 >        try (PoolCleaner cleaner = cleaner(p)) {
542 >            final CountDownLatch threadStarted = new CountDownLatch(1);
543 >            final CountDownLatch done = new CountDownLatch(1);
544 >            assertFalse(p.isTerminated());
545              p.execute(new CheckedRunnable() {
546                  public void realRun() throws InterruptedException {
547                      assertFalse(p.isTerminated());
548                      threadStarted.countDown();
549 <                    done.await();
549 >                    await(done);
550                  }});
551 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
551 >            await(threadStarted);
552              assertFalse(p.isTerminating());
553              done.countDown();
531        } finally {
554              try { p.shutdown(); } catch (SecurityException ok) { return; }
555 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
556 +            assertTrue(p.isTerminated());
557          }
534        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
535        assertTrue(p.isTerminated());
558      }
559  
560      /**
# Line 542 | Line 564 | public class ScheduledExecutorTest exten
564          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
565          final CountDownLatch threadStarted = new CountDownLatch(1);
566          final CountDownLatch done = new CountDownLatch(1);
567 <        try {
567 >        try (PoolCleaner cleaner = cleaner(p)) {
568              assertFalse(p.isTerminating());
569              p.execute(new CheckedRunnable() {
570                  public void realRun() throws InterruptedException {
571                      assertFalse(p.isTerminating());
572                      threadStarted.countDown();
573 <                    done.await();
573 >                    await(done);
574                  }});
575 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
575 >            await(threadStarted);
576              assertFalse(p.isTerminating());
577              done.countDown();
556        } finally {
578              try { p.shutdown(); } catch (SecurityException ok) { return; }
579 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
580 +            assertTrue(p.isTerminated());
581 +            assertFalse(p.isTerminating());
582          }
559        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
560        assertTrue(p.isTerminated());
561        assertFalse(p.isTerminating());
583      }
584  
585      /**
586       * getQueue returns the work queue, which contains queued tasks
587       */
588      public void testGetQueue() throws InterruptedException {
568        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
569        final CountDownLatch threadStarted = new CountDownLatch(1);
589          final CountDownLatch done = new CountDownLatch(1);
590 <        try {
590 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
591 >        try (PoolCleaner cleaner = cleaner(p, done)) {
592 >            final CountDownLatch threadStarted = new CountDownLatch(1);
593              ScheduledFuture[] tasks = new ScheduledFuture[5];
594              for (int i = 0; i < tasks.length; i++) {
595                  Runnable r = new CheckedRunnable() {
596                      public void realRun() throws InterruptedException {
597                          threadStarted.countDown();
598 <                        done.await();
598 >                        await(done);
599                      }};
600                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
601              }
602 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
602 >            await(threadStarted);
603              BlockingQueue<Runnable> q = p.getQueue();
604              assertTrue(q.contains(tasks[tasks.length - 1]));
605              assertFalse(q.contains(tasks[0]));
585        } finally {
586            done.countDown();
587            joinPool(p);
606          }
607      }
608  
# Line 592 | Line 610 | public class ScheduledExecutorTest exten
610       * remove(task) removes queued task, and fails to remove active task
611       */
612      public void testRemove() throws InterruptedException {
595        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
596        ScheduledFuture[] tasks = new ScheduledFuture[5];
597        final CountDownLatch threadStarted = new CountDownLatch(1);
613          final CountDownLatch done = new CountDownLatch(1);
614 <        try {
614 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
615 >        try (PoolCleaner cleaner = cleaner(p, done)) {
616 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
617 >            final CountDownLatch threadStarted = new CountDownLatch(1);
618              for (int i = 0; i < tasks.length; i++) {
619                  Runnable r = new CheckedRunnable() {
620                      public void realRun() throws InterruptedException {
621                          threadStarted.countDown();
622 <                        done.await();
622 >                        await(done);
623                      }};
624                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
625              }
626 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
626 >            await(threadStarted);
627              BlockingQueue<Runnable> q = p.getQueue();
628              assertFalse(p.remove((Runnable)tasks[0]));
629              assertTrue(q.contains((Runnable)tasks[4]));
# Line 616 | Line 634 | public class ScheduledExecutorTest exten
634              assertTrue(q.contains((Runnable)tasks[3]));
635              assertTrue(p.remove((Runnable)tasks[3]));
636              assertFalse(q.contains((Runnable)tasks[3]));
619        } finally {
620            done.countDown();
621            joinPool(p);
637          }
638      }
639  
# Line 626 | Line 641 | public class ScheduledExecutorTest exten
641       * purge eventually removes cancelled tasks from the queue
642       */
643      public void testPurge() throws InterruptedException {
644 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
645 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
646 <        for (int i = 0; i < tasks.length; i++)
647 <            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
648 <                                  LONG_DELAY_MS, MILLISECONDS);
649 <        try {
644 >        final ScheduledFuture[] tasks = new ScheduledFuture[5];
645 >        final Runnable releaser = new Runnable() { public void run() {
646 >            for (ScheduledFuture task : tasks)
647 >                if (task != null) task.cancel(true); }};
648 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
649 >        try (PoolCleaner cleaner = cleaner(p, releaser)) {
650 >            for (int i = 0; i < tasks.length; i++)
651 >                tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
652 >                                      LONG_DELAY_MS, MILLISECONDS);
653              int max = tasks.length;
654              if (tasks[4].cancel(true)) --max;
655              if (tasks[3].cancel(true)) --max;
# Line 643 | Line 661 | public class ScheduledExecutorTest exten
661                  long count = p.getTaskCount();
662                  if (count == max)
663                      return;
664 <            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
664 >            } while (millisElapsedSince(startTime) < LONG_DELAY_MS);
665              fail("Purge failed to remove cancelled tasks");
648        } finally {
649            for (ScheduledFuture task : tasks)
650                task.cancel(true);
651            joinPool(p);
666          }
667      }
668  
# Line 662 | Line 676 | public class ScheduledExecutorTest exten
676          final AtomicInteger ran = new AtomicInteger(0);
677          final ScheduledThreadPoolExecutor p =
678              new ScheduledThreadPoolExecutor(poolSize);
679 <        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
679 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
680          Runnable waiter = new CheckedRunnable() { public void realRun() {
681              threadsStarted.countDown();
682              try {
# Line 672 | Line 686 | public class ScheduledExecutorTest exten
686          }};
687          for (int i = 0; i < count; i++)
688              p.execute(waiter);
689 <        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
689 >        await(threadsStarted);
690          assertEquals(poolSize, p.getActiveCount());
691          assertEquals(0, p.getCompletedTaskCount());
692          final List<Runnable> queuedTasks;
# Line 695 | Line 709 | public class ScheduledExecutorTest exten
709       * and those tasks are drained from the queue
710       */
711      public void testShutdownNow_delayedTasks() throws InterruptedException {
712 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
712 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
713          List<ScheduledFuture> tasks = new ArrayList<>();
714          for (int i = 0; i < 3; i++) {
715              Runnable r = new NoOpRunnable();
# Line 732 | Line 746 | public class ScheduledExecutorTest exten
746       * - setContinueExistingPeriodicTasksAfterShutdownPolicy
747       */
748      public void testShutdown_cancellation() throws Exception {
749 <        Boolean[] allBooleans = { null, Boolean.FALSE, Boolean.TRUE };
736 <        for (Boolean policy : allBooleans)
737 <    {
738 <        final int poolSize = 2;
749 >        final int poolSize = 4;
750          final ScheduledThreadPoolExecutor p
751              = new ScheduledThreadPoolExecutor(poolSize);
752 <        final boolean effectiveDelayedPolicy = (policy != Boolean.FALSE);
753 <        final boolean effectivePeriodicPolicy = (policy == Boolean.TRUE);
754 <        final boolean effectiveRemovePolicy = (policy == Boolean.TRUE);
755 <        if (policy != null) {
756 <            p.setExecuteExistingDelayedTasksAfterShutdownPolicy(policy);
757 <            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(policy);
758 <            p.setRemoveOnCancelPolicy(policy);
759 <        }
752 >        final BlockingQueue<Runnable> q = p.getQueue();
753 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
754 >        final long delay = rnd.nextInt(2);
755 >        final int rounds = rnd.nextInt(1, 3);
756 >        final boolean effectiveDelayedPolicy;
757 >        final boolean effectivePeriodicPolicy;
758 >        final boolean effectiveRemovePolicy;
759 >
760 >        if (rnd.nextBoolean())
761 >            p.setExecuteExistingDelayedTasksAfterShutdownPolicy(
762 >                effectiveDelayedPolicy = rnd.nextBoolean());
763 >        else
764 >            effectiveDelayedPolicy = true;
765          assertEquals(effectiveDelayedPolicy,
766                       p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
767 +
768 +        if (rnd.nextBoolean())
769 +            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(
770 +                effectivePeriodicPolicy = rnd.nextBoolean());
771 +        else
772 +            effectivePeriodicPolicy = false;
773          assertEquals(effectivePeriodicPolicy,
774                       p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
775 +
776 +        if (rnd.nextBoolean())
777 +            p.setRemoveOnCancelPolicy(
778 +                effectiveRemovePolicy = rnd.nextBoolean());
779 +        else
780 +            effectiveRemovePolicy = false;
781          assertEquals(effectiveRemovePolicy,
782                       p.getRemoveOnCancelPolicy());
783 <        // Strategy: Wedge the pool with poolSize "blocker" threads
783 >
784 >        final boolean periodicTasksContinue = effectivePeriodicPolicy && rnd.nextBoolean();
785 >
786 >        // Strategy: Wedge the pool with one wave of "blocker" tasks,
787 >        // then add a second wave that waits in the queue until unblocked.
788          final AtomicInteger ran = new AtomicInteger(0);
789          final CountDownLatch poolBlocked = new CountDownLatch(poolSize);
790          final CountDownLatch unblock = new CountDownLatch(1);
791 <        final CountDownLatch periodicLatch1 = new CountDownLatch(2);
760 <        final CountDownLatch periodicLatch2 = new CountDownLatch(2);
761 <        Runnable task = new CheckedRunnable() { public void realRun()
762 <                                                    throws InterruptedException {
763 <            poolBlocked.countDown();
764 <            assertTrue(unblock.await(LONG_DELAY_MS, MILLISECONDS));
765 <            ran.getAndIncrement();
766 <        }};
767 <        List<Future<?>> blockers = new ArrayList<>();
768 <        List<Future<?>> periodics = new ArrayList<>();
769 <        List<Future<?>> delayeds = new ArrayList<>();
770 <        for (int i = 0; i < poolSize; i++)
771 <            blockers.add(p.submit(task));
772 <        assertTrue(poolBlocked.await(LONG_DELAY_MS, MILLISECONDS));
773 <
774 <        periodics.add(p.scheduleAtFixedRate(countDowner(periodicLatch1),
775 <                                            1, 1, MILLISECONDS));
776 <        periodics.add(p.scheduleWithFixedDelay(countDowner(periodicLatch2),
777 <                                               1, 1, MILLISECONDS));
778 <        delayeds.add(p.schedule(task, 1, MILLISECONDS));
791 >        final RuntimeException exception = new RuntimeException();
792  
793 <        assertTrue(p.getQueue().containsAll(periodics));
794 <        assertTrue(p.getQueue().containsAll(delayeds));
795 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
796 <        assertTrue(p.isShutdown());
797 <        assertFalse(p.isTerminated());
798 <        for (Future<?> periodic : periodics) {
799 <            assertTrue(effectivePeriodicPolicy ^ periodic.isCancelled());
787 <            assertTrue(effectivePeriodicPolicy ^ periodic.isDone());
788 <        }
789 <        for (Future<?> delayed : delayeds) {
790 <            assertTrue(effectiveDelayedPolicy ^ delayed.isCancelled());
791 <            assertTrue(effectiveDelayedPolicy ^ delayed.isDone());
792 <        }
793 <        if (testImplementationDetails) {
794 <            assertEquals(effectivePeriodicPolicy,
795 <                         p.getQueue().containsAll(periodics));
796 <            assertEquals(effectiveDelayedPolicy,
797 <                         p.getQueue().containsAll(delayeds));
798 <        }
799 <        // Release all pool threads
800 <        unblock.countDown();
801 <
802 <        for (Future<?> delayed : delayeds) {
803 <            if (effectiveDelayedPolicy) {
804 <                assertNull(delayed.get());
793 >        class Task implements Runnable {
794 >            public void run() {
795 >                try {
796 >                    ran.getAndIncrement();
797 >                    poolBlocked.countDown();
798 >                    await(unblock);
799 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
800              }
801          }
802 <        if (effectivePeriodicPolicy) {
803 <            assertTrue(periodicLatch1.await(LONG_DELAY_MS, MILLISECONDS));
804 <            assertTrue(periodicLatch2.await(LONG_DELAY_MS, MILLISECONDS));
805 <            for (Future<?> periodic : periodics) {
806 <                assertTrue(periodic.cancel(false));
807 <                assertTrue(periodic.isCancelled());
808 <                assertTrue(periodic.isDone());
802 >
803 >        class PeriodicTask extends Task {
804 >            PeriodicTask(int rounds) { this.rounds = rounds; }
805 >            int rounds;
806 >            public void run() {
807 >                if (--rounds == 0) super.run();
808 >                // throw exception to surely terminate this periodic task,
809 >                // but in a separate execution and in a detectable way.
810 >                if (rounds == -1) throw exception;
811              }
812          }
813 +
814 +        Runnable task = new Task();
815 +
816 +        List<Future<?>> immediates = new ArrayList<>();
817 +        List<Future<?>> delayeds   = new ArrayList<>();
818 +        List<Future<?>> periodics  = new ArrayList<>();
819 +
820 +        immediates.add(p.submit(task));
821 +        delayeds.add(p.schedule(task, delay, MILLISECONDS));
822 +        periodics.add(p.scheduleAtFixedRate(
823 +                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
824 +        periodics.add(p.scheduleWithFixedDelay(
825 +                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
826 +
827 +        await(poolBlocked);
828 +
829 +        assertEquals(poolSize, ran.get());
830 +        assertEquals(poolSize, p.getActiveCount());
831 +        assertTrue(q.isEmpty());
832 +
833 +        // Add second wave of tasks.
834 +        immediates.add(p.submit(task));
835 +        delayeds.add(p.schedule(task, effectiveDelayedPolicy ? delay : LONG_DELAY_MS, MILLISECONDS));
836 +        periodics.add(p.scheduleAtFixedRate(
837 +                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
838 +        periodics.add(p.scheduleWithFixedDelay(
839 +                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
840 +
841 +        assertEquals(poolSize, q.size());
842 +        assertEquals(poolSize, ran.get());
843 +
844 +        immediates.forEach(
845 +            f -> assertTrue(((ScheduledFuture)f).getDelay(NANOSECONDS) <= 0L));
846 +
847 +        Stream.of(immediates, delayeds, periodics).flatMap(c -> c.stream())
848 +            .forEach(f -> assertFalse(f.isDone()));
849 +
850 +        try { p.shutdown(); } catch (SecurityException ok) { return; }
851 +        assertTrue(p.isShutdown());
852 +        assertTrue(p.isTerminating());
853 +        assertFalse(p.isTerminated());
854 +
855 +        if (rnd.nextBoolean())
856 +            assertThrows(
857 +                RejectedExecutionException.class,
858 +                () -> p.submit(task),
859 +                () -> p.schedule(task, 1, SECONDS),
860 +                () -> p.scheduleAtFixedRate(
861 +                    new PeriodicTask(1), 1, 1, SECONDS),
862 +                () -> p.scheduleWithFixedDelay(
863 +                    new PeriodicTask(2), 1, 1, SECONDS));
864 +
865 +        assertTrue(q.contains(immediates.get(1)));
866 +        assertTrue(!effectiveDelayedPolicy
867 +                   ^ q.contains(delayeds.get(1)));
868 +        assertTrue(!effectivePeriodicPolicy
869 +                   ^ q.containsAll(periodics.subList(2, 4)));
870 +
871 +        immediates.forEach(f -> assertFalse(f.isDone()));
872 +
873 +        assertFalse(delayeds.get(0).isDone());
874 +        if (effectiveDelayedPolicy)
875 +            assertFalse(delayeds.get(1).isDone());
876 +        else
877 +            assertTrue(delayeds.get(1).isCancelled());
878 +
879 +        if (effectivePeriodicPolicy)
880 +            periodics.forEach(
881 +                f -> {
882 +                    assertFalse(f.isDone());
883 +                    if (!periodicTasksContinue) {
884 +                        assertTrue(f.cancel(false));
885 +                        assertTrue(f.isCancelled());
886 +                    }
887 +                });
888 +        else {
889 +            periodics.subList(0, 2).forEach(f -> assertFalse(f.isDone()));
890 +            periodics.subList(2, 4).forEach(f -> assertTrue(f.isCancelled()));
891 +        }
892 +
893 +        unblock.countDown();    // Release all pool threads
894 +
895          assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
896 +        assertFalse(p.isTerminating());
897          assertTrue(p.isTerminated());
898 <        assertEquals(2 + (effectiveDelayedPolicy ? 1 : 0), ran.get());
899 <    }}
898 >
899 >        assertTrue(q.isEmpty());
900 >
901 >        Stream.of(immediates, delayeds, periodics).flatMap(c -> c.stream())
902 >            .forEach(f -> assertTrue(f.isDone()));
903 >
904 >        for (Future<?> f : immediates) assertNull(f.get());
905 >
906 >        assertNull(delayeds.get(0).get());
907 >        if (effectiveDelayedPolicy)
908 >            assertNull(delayeds.get(1).get());
909 >        else
910 >            assertTrue(delayeds.get(1).isCancelled());
911 >
912 >        if (periodicTasksContinue)
913 >            periodics.forEach(
914 >                f -> {
915 >                    try { f.get(); }
916 >                    catch (ExecutionException success) {
917 >                        assertSame(exception, success.getCause());
918 >                    }
919 >                    catch (Throwable fail) { threadUnexpectedException(fail); }
920 >                });
921 >        else
922 >            periodics.forEach(f -> assertTrue(f.isCancelled()));
923 >
924 >        assertEquals(poolSize + 1
925 >                     + (effectiveDelayedPolicy ? 1 : 0)
926 >                     + (periodicTasksContinue ? 2 : 0),
927 >                     ran.get());
928 >    }
929  
930      /**
931       * completed submit of callable returns result
932       */
933      public void testSubmitCallable() throws Exception {
934 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
935 <        try {
934 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
935 >        try (PoolCleaner cleaner = cleaner(e)) {
936              Future<String> future = e.submit(new StringTask());
937              String result = future.get();
938              assertSame(TEST_STRING, result);
830        } finally {
831            joinPool(e);
939          }
940      }
941  
# Line 836 | Line 943 | public class ScheduledExecutorTest exten
943       * completed submit of runnable returns successfully
944       */
945      public void testSubmitRunnable() throws Exception {
946 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
947 <        try {
946 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
947 >        try (PoolCleaner cleaner = cleaner(e)) {
948              Future<?> future = e.submit(new NoOpRunnable());
949              future.get();
950              assertTrue(future.isDone());
844        } finally {
845            joinPool(e);
951          }
952      }
953  
# Line 850 | Line 955 | public class ScheduledExecutorTest exten
955       * completed submit of (runnable, result) returns result
956       */
957      public void testSubmitRunnable2() throws Exception {
958 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
959 <        try {
958 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
959 >        try (PoolCleaner cleaner = cleaner(e)) {
960              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
961              String result = future.get();
962              assertSame(TEST_STRING, result);
858        } finally {
859            joinPool(e);
963          }
964      }
965  
# Line 864 | Line 967 | public class ScheduledExecutorTest exten
967       * invokeAny(null) throws NPE
968       */
969      public void testInvokeAny1() throws Exception {
970 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
971 <        try {
972 <            e.invokeAny(null);
973 <            shouldThrow();
974 <        } catch (NullPointerException success) {
975 <        } finally {
873 <            joinPool(e);
970 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
971 >        try (PoolCleaner cleaner = cleaner(e)) {
972 >            try {
973 >                e.invokeAny(null);
974 >                shouldThrow();
975 >            } catch (NullPointerException success) {}
976          }
977      }
978  
# Line 878 | Line 980 | public class ScheduledExecutorTest exten
980       * invokeAny(empty collection) throws IAE
981       */
982      public void testInvokeAny2() throws Exception {
983 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
984 <        try {
985 <            e.invokeAny(new ArrayList<Callable<String>>());
986 <            shouldThrow();
987 <        } catch (IllegalArgumentException success) {
988 <        } finally {
887 <            joinPool(e);
983 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
984 >        try (PoolCleaner cleaner = cleaner(e)) {
985 >            try {
986 >                e.invokeAny(new ArrayList<Callable<String>>());
987 >                shouldThrow();
988 >            } catch (IllegalArgumentException success) {}
989          }
990      }
991  
# Line 893 | Line 994 | public class ScheduledExecutorTest exten
994       */
995      public void testInvokeAny3() throws Exception {
996          CountDownLatch latch = new CountDownLatch(1);
997 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
998 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
999 <        l.add(latchAwaitingStringTask(latch));
1000 <        l.add(null);
1001 <        try {
1002 <            e.invokeAny(l);
1003 <            shouldThrow();
1004 <        } catch (NullPointerException success) {
1005 <        } finally {
997 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
998 >        try (PoolCleaner cleaner = cleaner(e)) {
999 >            List<Callable<String>> l = new ArrayList<>();
1000 >            l.add(latchAwaitingStringTask(latch));
1001 >            l.add(null);
1002 >            try {
1003 >                e.invokeAny(l);
1004 >                shouldThrow();
1005 >            } catch (NullPointerException success) {}
1006              latch.countDown();
906            joinPool(e);
1007          }
1008      }
1009  
# Line 911 | Line 1011 | public class ScheduledExecutorTest exten
1011       * invokeAny(c) throws ExecutionException if no task completes
1012       */
1013      public void testInvokeAny4() throws Exception {
1014 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1015 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1016 <        l.add(new NPETask());
1017 <        try {
1018 <            e.invokeAny(l);
1019 <            shouldThrow();
1020 <        } catch (ExecutionException success) {
1021 <            assertTrue(success.getCause() instanceof NullPointerException);
1022 <        } finally {
1023 <            joinPool(e);
1014 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1015 >        try (PoolCleaner cleaner = cleaner(e)) {
1016 >            List<Callable<String>> l = new ArrayList<>();
1017 >            l.add(new NPETask());
1018 >            try {
1019 >                e.invokeAny(l);
1020 >                shouldThrow();
1021 >            } catch (ExecutionException success) {
1022 >                assertTrue(success.getCause() instanceof NullPointerException);
1023 >            }
1024          }
1025      }
1026  
# Line 928 | Line 1028 | public class ScheduledExecutorTest exten
1028       * invokeAny(c) returns result of some task
1029       */
1030      public void testInvokeAny5() throws Exception {
1031 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1032 <        try {
1033 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1031 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1032 >        try (PoolCleaner cleaner = cleaner(e)) {
1033 >            List<Callable<String>> l = new ArrayList<>();
1034              l.add(new StringTask());
1035              l.add(new StringTask());
1036              String result = e.invokeAny(l);
1037              assertSame(TEST_STRING, result);
938        } finally {
939            joinPool(e);
1038          }
1039      }
1040  
# Line 944 | Line 1042 | public class ScheduledExecutorTest exten
1042       * invokeAll(null) throws NPE
1043       */
1044      public void testInvokeAll1() throws Exception {
1045 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1046 <        try {
1047 <            e.invokeAll(null);
1048 <            shouldThrow();
1049 <        } catch (NullPointerException success) {
1050 <        } finally {
953 <            joinPool(e);
1045 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1046 >        try (PoolCleaner cleaner = cleaner(e)) {
1047 >            try {
1048 >                e.invokeAll(null);
1049 >                shouldThrow();
1050 >            } catch (NullPointerException success) {}
1051          }
1052      }
1053  
# Line 958 | Line 1055 | public class ScheduledExecutorTest exten
1055       * invokeAll(empty collection) returns empty collection
1056       */
1057      public void testInvokeAll2() throws Exception {
1058 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1059 <        try {
1058 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1059 >        try (PoolCleaner cleaner = cleaner(e)) {
1060              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1061              assertTrue(r.isEmpty());
965        } finally {
966            joinPool(e);
1062          }
1063      }
1064  
# Line 971 | Line 1066 | public class ScheduledExecutorTest exten
1066       * invokeAll(c) throws NPE if c has null elements
1067       */
1068      public void testInvokeAll3() throws Exception {
1069 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1070 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1071 <        l.add(new StringTask());
1072 <        l.add(null);
1073 <        try {
1074 <            e.invokeAll(l);
1075 <            shouldThrow();
1076 <        } catch (NullPointerException success) {
1077 <        } finally {
983 <            joinPool(e);
1069 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1070 >        try (PoolCleaner cleaner = cleaner(e)) {
1071 >            List<Callable<String>> l = new ArrayList<>();
1072 >            l.add(new StringTask());
1073 >            l.add(null);
1074 >            try {
1075 >                e.invokeAll(l);
1076 >                shouldThrow();
1077 >            } catch (NullPointerException success) {}
1078          }
1079      }
1080  
# Line 988 | Line 1082 | public class ScheduledExecutorTest exten
1082       * get of invokeAll(c) throws exception on failed task
1083       */
1084      public void testInvokeAll4() throws Exception {
1085 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1086 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1087 <        l.add(new NPETask());
1088 <        List<Future<String>> futures = e.invokeAll(l);
1089 <        assertEquals(1, futures.size());
1090 <        try {
1091 <            futures.get(0).get();
1092 <            shouldThrow();
1093 <        } catch (ExecutionException success) {
1094 <            assertTrue(success.getCause() instanceof NullPointerException);
1095 <        } finally {
1096 <            joinPool(e);
1085 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1086 >        try (PoolCleaner cleaner = cleaner(e)) {
1087 >            List<Callable<String>> l = new ArrayList<>();
1088 >            l.add(new NPETask());
1089 >            List<Future<String>> futures = e.invokeAll(l);
1090 >            assertEquals(1, futures.size());
1091 >            try {
1092 >                futures.get(0).get();
1093 >                shouldThrow();
1094 >            } catch (ExecutionException success) {
1095 >                assertTrue(success.getCause() instanceof NullPointerException);
1096 >            }
1097          }
1098      }
1099  
# Line 1007 | Line 1101 | public class ScheduledExecutorTest exten
1101       * invokeAll(c) returns results of all completed tasks
1102       */
1103      public void testInvokeAll5() throws Exception {
1104 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1105 <        try {
1106 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1104 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1105 >        try (PoolCleaner cleaner = cleaner(e)) {
1106 >            List<Callable<String>> l = new ArrayList<>();
1107              l.add(new StringTask());
1108              l.add(new StringTask());
1109              List<Future<String>> futures = e.invokeAll(l);
1110              assertEquals(2, futures.size());
1111              for (Future<String> future : futures)
1112                  assertSame(TEST_STRING, future.get());
1019        } finally {
1020            joinPool(e);
1113          }
1114      }
1115  
# Line 1025 | Line 1117 | public class ScheduledExecutorTest exten
1117       * timed invokeAny(null) throws NPE
1118       */
1119      public void testTimedInvokeAny1() throws Exception {
1120 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1121 <        try {
1122 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1123 <            shouldThrow();
1124 <        } catch (NullPointerException success) {
1125 <        } finally {
1034 <            joinPool(e);
1120 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1121 >        try (PoolCleaner cleaner = cleaner(e)) {
1122 >            try {
1123 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1124 >                shouldThrow();
1125 >            } catch (NullPointerException success) {}
1126          }
1127      }
1128  
# Line 1039 | Line 1130 | public class ScheduledExecutorTest exten
1130       * timed invokeAny(,,null) throws NPE
1131       */
1132      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1133 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1134 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1135 <        l.add(new StringTask());
1136 <        try {
1137 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1138 <            shouldThrow();
1139 <        } catch (NullPointerException success) {
1140 <        } finally {
1050 <            joinPool(e);
1133 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1134 >        try (PoolCleaner cleaner = cleaner(e)) {
1135 >            List<Callable<String>> l = new ArrayList<>();
1136 >            l.add(new StringTask());
1137 >            try {
1138 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1139 >                shouldThrow();
1140 >            } catch (NullPointerException success) {}
1141          }
1142      }
1143  
# Line 1055 | Line 1145 | public class ScheduledExecutorTest exten
1145       * timed invokeAny(empty collection) throws IAE
1146       */
1147      public void testTimedInvokeAny2() throws Exception {
1148 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1149 <        try {
1150 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1151 <            shouldThrow();
1152 <        } catch (IllegalArgumentException success) {
1153 <        } finally {
1064 <            joinPool(e);
1148 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1149 >        try (PoolCleaner cleaner = cleaner(e)) {
1150 >            try {
1151 >                e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1152 >                shouldThrow();
1153 >            } catch (IllegalArgumentException success) {}
1154          }
1155      }
1156  
# Line 1070 | Line 1159 | public class ScheduledExecutorTest exten
1159       */
1160      public void testTimedInvokeAny3() throws Exception {
1161          CountDownLatch latch = new CountDownLatch(1);
1162 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1163 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1164 <        l.add(latchAwaitingStringTask(latch));
1165 <        l.add(null);
1166 <        try {
1167 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1168 <            shouldThrow();
1169 <        } catch (NullPointerException success) {
1170 <        } finally {
1162 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1163 >        try (PoolCleaner cleaner = cleaner(e)) {
1164 >            List<Callable<String>> l = new ArrayList<>();
1165 >            l.add(latchAwaitingStringTask(latch));
1166 >            l.add(null);
1167 >            try {
1168 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1169 >                shouldThrow();
1170 >            } catch (NullPointerException success) {}
1171              latch.countDown();
1083            joinPool(e);
1172          }
1173      }
1174  
# Line 1088 | Line 1176 | public class ScheduledExecutorTest exten
1176       * timed invokeAny(c) throws ExecutionException if no task completes
1177       */
1178      public void testTimedInvokeAny4() throws Exception {
1179 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1180 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1181 <        l.add(new NPETask());
1182 <        try {
1183 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1184 <            shouldThrow();
1185 <        } catch (ExecutionException success) {
1186 <            assertTrue(success.getCause() instanceof NullPointerException);
1187 <        } finally {
1188 <            joinPool(e);
1179 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1180 >        try (PoolCleaner cleaner = cleaner(e)) {
1181 >            long startTime = System.nanoTime();
1182 >            List<Callable<String>> l = new ArrayList<>();
1183 >            l.add(new NPETask());
1184 >            try {
1185 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1186 >                shouldThrow();
1187 >            } catch (ExecutionException success) {
1188 >                assertTrue(success.getCause() instanceof NullPointerException);
1189 >            }
1190 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1191          }
1192      }
1193  
# Line 1105 | Line 1195 | public class ScheduledExecutorTest exten
1195       * timed invokeAny(c) returns result of some task
1196       */
1197      public void testTimedInvokeAny5() throws Exception {
1198 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1199 <        try {
1200 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1198 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1199 >        try (PoolCleaner cleaner = cleaner(e)) {
1200 >            long startTime = System.nanoTime();
1201 >            List<Callable<String>> l = new ArrayList<>();
1202              l.add(new StringTask());
1203              l.add(new StringTask());
1204 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1204 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1205              assertSame(TEST_STRING, result);
1206 <        } finally {
1116 <            joinPool(e);
1206 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1207          }
1208      }
1209  
# Line 1121 | Line 1211 | public class ScheduledExecutorTest exten
1211       * timed invokeAll(null) throws NPE
1212       */
1213      public void testTimedInvokeAll1() throws Exception {
1214 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1215 <        try {
1216 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1217 <            shouldThrow();
1218 <        } catch (NullPointerException success) {
1219 <        } finally {
1130 <            joinPool(e);
1214 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1215 >        try (PoolCleaner cleaner = cleaner(e)) {
1216 >            try {
1217 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1218 >                shouldThrow();
1219 >            } catch (NullPointerException success) {}
1220          }
1221      }
1222  
# Line 1135 | Line 1224 | public class ScheduledExecutorTest exten
1224       * timed invokeAll(,,null) throws NPE
1225       */
1226      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1227 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1228 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1229 <        l.add(new StringTask());
1230 <        try {
1231 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1232 <            shouldThrow();
1233 <        } catch (NullPointerException success) {
1234 <        } finally {
1146 <            joinPool(e);
1227 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1228 >        try (PoolCleaner cleaner = cleaner(e)) {
1229 >            List<Callable<String>> l = new ArrayList<>();
1230 >            l.add(new StringTask());
1231 >            try {
1232 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1233 >                shouldThrow();
1234 >            } catch (NullPointerException success) {}
1235          }
1236      }
1237  
# Line 1151 | Line 1239 | public class ScheduledExecutorTest exten
1239       * timed invokeAll(empty collection) returns empty collection
1240       */
1241      public void testTimedInvokeAll2() throws Exception {
1242 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1243 <        try {
1244 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1242 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1243 >        try (PoolCleaner cleaner = cleaner(e)) {
1244 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1245 >                                                 MEDIUM_DELAY_MS, MILLISECONDS);
1246              assertTrue(r.isEmpty());
1158        } finally {
1159            joinPool(e);
1247          }
1248      }
1249  
# Line 1164 | Line 1251 | public class ScheduledExecutorTest exten
1251       * timed invokeAll(c) throws NPE if c has null elements
1252       */
1253      public void testTimedInvokeAll3() throws Exception {
1254 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1255 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1256 <        l.add(new StringTask());
1257 <        l.add(null);
1258 <        try {
1259 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1260 <            shouldThrow();
1261 <        } catch (NullPointerException success) {
1262 <        } finally {
1176 <            joinPool(e);
1254 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1255 >        try (PoolCleaner cleaner = cleaner(e)) {
1256 >            List<Callable<String>> l = new ArrayList<>();
1257 >            l.add(new StringTask());
1258 >            l.add(null);
1259 >            try {
1260 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1261 >                shouldThrow();
1262 >            } catch (NullPointerException success) {}
1263          }
1264      }
1265  
# Line 1181 | Line 1267 | public class ScheduledExecutorTest exten
1267       * get of element of invokeAll(c) throws exception on failed task
1268       */
1269      public void testTimedInvokeAll4() throws Exception {
1270 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1271 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1272 <        l.add(new NPETask());
1273 <        List<Future<String>> futures =
1274 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1275 <        assertEquals(1, futures.size());
1276 <        try {
1277 <            futures.get(0).get();
1278 <            shouldThrow();
1279 <        } catch (ExecutionException success) {
1280 <            assertTrue(success.getCause() instanceof NullPointerException);
1281 <        } finally {
1282 <            joinPool(e);
1270 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1271 >        try (PoolCleaner cleaner = cleaner(e)) {
1272 >            List<Callable<String>> l = new ArrayList<>();
1273 >            l.add(new NPETask());
1274 >            List<Future<String>> futures =
1275 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1276 >            assertEquals(1, futures.size());
1277 >            try {
1278 >                futures.get(0).get();
1279 >                shouldThrow();
1280 >            } catch (ExecutionException success) {
1281 >                assertTrue(success.getCause() instanceof NullPointerException);
1282 >            }
1283          }
1284      }
1285  
# Line 1201 | Line 1287 | public class ScheduledExecutorTest exten
1287       * timed invokeAll(c) returns results of all completed tasks
1288       */
1289      public void testTimedInvokeAll5() throws Exception {
1290 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1291 <        try {
1292 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1290 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1291 >        try (PoolCleaner cleaner = cleaner(e)) {
1292 >            List<Callable<String>> l = new ArrayList<>();
1293              l.add(new StringTask());
1294              l.add(new StringTask());
1295              List<Future<String>> futures =
1296 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1296 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1297              assertEquals(2, futures.size());
1298              for (Future<String> future : futures)
1299                  assertSame(TEST_STRING, future.get());
1214        } finally {
1215            joinPool(e);
1300          }
1301      }
1302  
# Line 1220 | Line 1304 | public class ScheduledExecutorTest exten
1304       * timed invokeAll(c) cancels tasks not completed by timeout
1305       */
1306      public void testTimedInvokeAll6() throws Exception {
1307 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1308 <        try {
1309 <            for (long timeout = timeoutMillis();;) {
1307 >        for (long timeout = timeoutMillis();;) {
1308 >            final CountDownLatch done = new CountDownLatch(1);
1309 >            final Callable<String> waiter = new CheckedCallable<String>() {
1310 >                public String realCall() {
1311 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1312 >                    catch (InterruptedException ok) {}
1313 >                    return "1"; }};
1314 >            final ExecutorService p = new ScheduledThreadPoolExecutor(2);
1315 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1316                  List<Callable<String>> tasks = new ArrayList<>();
1317                  tasks.add(new StringTask("0"));
1318 <                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1318 >                tasks.add(waiter);
1319                  tasks.add(new StringTask("2"));
1320                  long startTime = System.nanoTime();
1321                  List<Future<String>> futures =
1322 <                    e.invokeAll(tasks, timeout, MILLISECONDS);
1322 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1323                  assertEquals(tasks.size(), futures.size());
1324                  assertTrue(millisElapsedSince(startTime) >= timeout);
1325                  for (Future future : futures)
# Line 1245 | Line 1335 | public class ScheduledExecutorTest exten
1335                          fail("expected exactly one task to be cancelled");
1336                  }
1337              }
1338 <        } finally {
1339 <            joinPool(e);
1338 >        }
1339 >    }
1340 >
1341 >    /**
1342 >     * A fixed delay task with overflowing period should not prevent a
1343 >     * one-shot task from executing.
1344 >     * https://bugs.openjdk.java.net/browse/JDK-8051859
1345 >     */
1346 >    public void testScheduleWithFixedDelay_overflow() throws Exception {
1347 >        final CountDownLatch delayedDone = new CountDownLatch(1);
1348 >        final CountDownLatch immediateDone = new CountDownLatch(1);
1349 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
1350 >        try (PoolCleaner cleaner = cleaner(p)) {
1351 >            final Runnable immediate = new Runnable() { public void run() {
1352 >                immediateDone.countDown();
1353 >            }};
1354 >            final Runnable delayed = new Runnable() { public void run() {
1355 >                delayedDone.countDown();
1356 >                p.submit(immediate);
1357 >            }};
1358 >            p.scheduleWithFixedDelay(delayed, 0L, Long.MAX_VALUE, SECONDS);
1359 >            await(delayedDone);
1360 >            await(immediateDone);
1361          }
1362      }
1363  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines