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.44 by jsr166, Sat May 28 15:33:20 2011 UTC vs.
Revision 1.97 by jsr166, Sat Nov 24 21:41:21 2018 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import junit.framework.*;
10 import java.util.*;
11 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.util.concurrent.atomic.*;
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;
19 > import java.util.concurrent.Callable;
20 > import java.util.concurrent.CancellationException;
21 > import java.util.concurrent.CountDownLatch;
22 > import java.util.concurrent.ExecutionException;
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;
38  
39   public class ScheduledExecutorTest extends JSR166TestCase {
40      public static void main(String[] args) {
41 <        junit.textui.TestRunner.run(suite());
41 >        main(suite(), args);
42      }
43      public static Test suite() {
44          return new TestSuite(ScheduledExecutorTest.class);
# Line 24 | 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);
52 <        final CountDownLatch done = new CountDownLatch(1);
53 <        final Runnable task = new CheckedRunnable() {
54 <            public void realRun() {
55 <                done.countDown();
32 <            }};
33 <        try {
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));
36 <        } finally {
37 <            joinPool(p);
57 >            await(done);
58          }
59      }
60  
# Line 42 | 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);
66 <        final long startTime = System.nanoTime();
67 <        final CountDownLatch done = new CountDownLatch(1);
68 <        try {
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>() {
70                  public Boolean realCall() {
71                      done.countDown();
# Line 55 | Line 75 | public class ScheduledExecutorTest exten
75              Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
76              assertSame(Boolean.TRUE, f.get());
77              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
78 <            assertTrue(done.await(0L, MILLISECONDS));
59 <        } finally {
60 <            joinPool(p);
78 >            assertEquals(0L, done.getCount());
79          }
80      }
81  
# Line 65 | 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);
87 <        final long startTime = System.nanoTime();
88 <        final CountDownLatch done = new CountDownLatch(1);
89 <        try {
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);
90              Runnable task = new CheckedRunnable() {
91                  public void realRun() {
92                      done.countDown();
# Line 78 | Line 96 | public class ScheduledExecutorTest exten
96              await(done);
97              assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
98              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
81        } finally {
82            joinPool(p);
99          }
100      }
101  
# Line 87 | 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);
107 <        final long startTime = System.nanoTime();
108 <        final CountDownLatch done = new CountDownLatch(1);
109 <        try {
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);
110              Runnable task = new CheckedRunnable() {
111                  public void realRun() {
112                      done.countDown();
# Line 102 | Line 118 | public class ScheduledExecutorTest exten
118              await(done);
119              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
120              f.cancel(true);
105        } finally {
106            joinPool(p);
121          }
122      }
123  
# Line 111 | 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);
129 <        final long startTime = System.nanoTime();
130 <        final CountDownLatch done = new CountDownLatch(1);
131 <        try {
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);
132              Runnable task = new CheckedRunnable() {
133                  public void realRun() {
134                      done.countDown();
# Line 126 | Line 140 | public class ScheduledExecutorTest exten
140              await(done);
141              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
142              f.cancel(true);
129        } finally {
130            joinPool(p);
143          }
144      }
145  
# Line 137 | 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);
158 <        RunnableCounter counter = new RunnableCounter();
159 <        ScheduledFuture h =
160 <            p.scheduleAtFixedRate(counter, 0, 1, MILLISECONDS);
161 <        delay(SMALL_DELAY_MS);
162 <        h.cancel(true);
163 <        int c = counter.count.get();
164 <        // By time scaling conventions, we must have at least
165 <        // an execution per SHORT delay, but no more than one SHORT more
166 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
167 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
168 <        joinPool(p);
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 >                final long startTime = System.nanoTime();
161 >                final int cycles = 8;
162 >                final CountDownLatch done = new CountDownLatch(cycles);
163 >                final Runnable task = new CheckedRunnable() {
164 >                    public void realRun() { done.countDown(); }};
165 >                final ScheduledFuture periodicTask =
166 >                    p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
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 >            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);
187 <        RunnableCounter counter = new RunnableCounter();
188 <        ScheduledFuture h =
189 <            p.scheduleWithFixedDelay(counter, 0, 1, MILLISECONDS);
190 <        delay(SMALL_DELAY_MS);
191 <        h.cancel(true);
192 <        int c = counter.count.get();
193 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
194 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
195 <        joinPool(p);
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 >                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 >                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 >                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 >            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 se = null;
231 <        try {
232 <            se = new ScheduledThreadPoolExecutor(1);
233 <            se.execute(null);
181 <            shouldThrow();
182 <        } catch (NullPointerException success) {}
183 <
184 <        joinPool(se);
229 >    public void testNullTaskSubmission() {
230 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
231 >        try (PoolCleaner cleaner = cleaner(p)) {
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 {
240 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
241 <        try {
242 <            TrackedCallable callable = null;
243 <            Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
244 <            shouldThrow();
245 <        } catch (NullPointerException success) {}
246 <        joinPool(se);
247 <    }
239 >    public void testSubmittedTasksRejectedWhenShutdown() throws InterruptedException {
240 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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 se = new ScheduledThreadPoolExecutor(1);
266 <        try {
267 <            se.shutdown();
268 <            se.schedule(new NoOpRunnable(),
269 <                        MEDIUM_DELAY_MS, MILLISECONDS);
209 <            shouldThrow();
210 <        } catch (RejectedExecutionException success) {
211 <        } catch (SecurityException ok) {
212 <        }
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 <        joinPool(se);
272 <    }
271 >            // ScheduledThreadPoolExecutor has an unbounded queue, so never saturated.
272 >            await(threadsStarted);
273  
274 <    /**
275 <     * schedule throws RejectedExecutionException if shutdown
276 <     */
277 <    public void testSchedule2_RejectedExecutionException() throws InterruptedException {
278 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
279 <        try {
280 <            se.shutdown();
224 <            se.schedule(new NoOpCallable(),
225 <                        MEDIUM_DELAY_MS, MILLISECONDS);
226 <            shouldThrow();
227 <        } catch (RejectedExecutionException success) {
228 <        } catch (SecurityException ok) {
229 <        }
230 <        joinPool(se);
231 <    }
274 >            if (rnd.nextBoolean())
275 >                p.shutdownNow();
276 >            else
277 >                p.shutdown();
278 >            // Pool is shutdown, but not yet terminated
279 >            assertTaskSubmissionsAreRejected(p);
280 >            assertFalse(p.isTerminated());
281  
282 <    /**
283 <     * schedule callable throws RejectedExecutionException if shutdown
235 <     */
236 <    public void testSchedule3_RejectedExecutionException() throws InterruptedException {
237 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
238 <        try {
239 <            se.shutdown();
240 <            se.schedule(new NoOpCallable(),
241 <                        MEDIUM_DELAY_MS, MILLISECONDS);
242 <            shouldThrow();
243 <        } catch (RejectedExecutionException success) {
244 <        } catch (SecurityException ok) {
245 <        }
246 <        joinPool(se);
247 <    }
282 >            done.countDown();   // release blocking tasks
283 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
284  
285 <    /**
250 <     * scheduleAtFixedRate throws RejectedExecutionException if shutdown
251 <     */
252 <    public void testScheduleAtFixedRate1_RejectedExecutionException() throws InterruptedException {
253 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
254 <        try {
255 <            se.shutdown();
256 <            se.scheduleAtFixedRate(new NoOpRunnable(),
257 <                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
258 <            shouldThrow();
259 <        } catch (RejectedExecutionException success) {
260 <        } catch (SecurityException ok) {
285 >            assertTaskSubmissionsAreRejected(p);
286          }
287 <        joinPool(se);
263 <    }
264 <
265 <    /**
266 <     * scheduleWithFixedDelay throws RejectedExecutionException if shutdown
267 <     */
268 <    public void testScheduleWithFixedDelay1_RejectedExecutionException() throws InterruptedException {
269 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
270 <        try {
271 <            se.shutdown();
272 <            se.scheduleWithFixedDelay(new NoOpRunnable(),
273 <                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
274 <            shouldThrow();
275 <        } catch (RejectedExecutionException success) {
276 <        } catch (SecurityException ok) {
277 <        }
278 <        joinPool(se);
287 >        assertEquals(p.getCorePoolSize(), p.getCompletedTaskCount());
288      }
289  
290      /**
# Line 283 | Line 292 | public class ScheduledExecutorTest exten
292       * thread becomes active
293       */
294      public void testGetActiveCount() throws InterruptedException {
286        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
287        final CountDownLatch threadStarted = new CountDownLatch(1);
295          final CountDownLatch done = new CountDownLatch(1);
296 <        try {
296 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
297 >        try (PoolCleaner cleaner = cleaner(p, done)) {
298 >            final CountDownLatch threadStarted = 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(SMALL_DELAY_MS, MILLISECONDS));
306 >            await(threadStarted);
307              assertEquals(1, p.getActiveCount());
299        } finally {
300            done.countDown();
301            joinPool(p);
308          }
309      }
310  
# Line 308 | Line 314 | public class ScheduledExecutorTest exten
314       */
315      public void testGetCompletedTaskCount() throws InterruptedException {
316          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
317 <        final CountDownLatch threadStarted = new CountDownLatch(1);
318 <        final CountDownLatch threadProceed = new CountDownLatch(1);
319 <        final CountDownLatch threadDone = new CountDownLatch(1);
320 <        try {
317 >        try (PoolCleaner cleaner = cleaner(p)) {
318 >            final CountDownLatch threadStarted = new CountDownLatch(1);
319 >            final CountDownLatch threadProceed = new CountDownLatch(1);
320 >            final CountDownLatch threadDone = new CountDownLatch(1);
321              assertEquals(0, p.getCompletedTaskCount());
322              p.execute(new CheckedRunnable() {
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 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
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)
336                      fail("timed out");
337                  Thread.yield();
338              }
333        } finally {
334            joinPool(p);
339          }
340      }
341  
# Line 340 | Line 344 | public class ScheduledExecutorTest exten
344       */
345      public void testGetCorePoolSize() throws InterruptedException {
346          ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
347 <        assertEquals(1, p.getCorePoolSize());
348 <        joinPool(p);
347 >        try (PoolCleaner cleaner = cleaner(p)) {
348 >            assertEquals(1, p.getCorePoolSize());
349 >        }
350      }
351  
352      /**
# Line 353 | 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 {
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(SMALL_DELAY_MS, MILLISECONDS));
366 <            assertEquals(THREADS, p.getLargestPoolSize());
367 <        } finally {
368 <            done.countDown();
369 <            joinPool(p);
370 >            await(threadsStarted);
371              assertEquals(THREADS, p.getLargestPoolSize());
372          }
373 +        assertEquals(THREADS, p.getLargestPoolSize());
374      }
375  
376      /**
# Line 379 | 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 {
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(SMALL_DELAY_MS, MILLISECONDS));
392 >            await(threadStarted);
393              assertEquals(1, p.getPoolSize());
392        } finally {
393            done.countDown();
394            joinPool(p);
394          }
395      }
396  
# Line 400 | Line 399 | public class ScheduledExecutorTest exten
399       * submitted
400       */
401      public void testGetTaskCount() throws InterruptedException {
402 <        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
404 <        final CountDownLatch threadStarted = new CountDownLatch(1);
402 >        final int TASKS = 3;
403          final CountDownLatch done = new CountDownLatch(1);
404 <        final int TASKS = 5;
405 <        try {
404 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
405 >        try (PoolCleaner cleaner = cleaner(p, done)) {
406 >            final CountDownLatch threadStarted = new CountDownLatch(1);
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(SMALL_DELAY_MS, MILLISECONDS));
426 <            assertEquals(TASKS, p.getTaskCount());
427 <        } finally {
418 <            done.countDown();
419 <            joinPool(p);
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 tf = new SimpleThreadFactory();
438 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, tf);
439 <        assertSame(tf, 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      /**
446       * setThreadFactory sets the thread factory returned by getThreadFactory
447       */
448      public void testSetThreadFactory() throws InterruptedException {
449 <        ThreadFactory tf = new SimpleThreadFactory();
450 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
451 <        p.setThreadFactory(tf);
452 <        assertSame(tf, p.getThreadFactory());
453 <        joinPool(p);
449 >        ThreadFactory threadFactory = new SimpleThreadFactory();
450 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
451 >        try (PoolCleaner cleaner = cleaner(p)) {
452 >            p.setThreadFactory(threadFactory);
453 >            assertSame(threadFactory, p.getThreadFactory());
454 >        }
455      }
456  
457      /**
458       * setThreadFactory(null) throws NPE
459       */
460      public void testSetThreadFactoryNull() throws InterruptedException {
461 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
462 <        try {
463 <            p.setThreadFactory(null);
464 <            shouldThrow();
465 <        } catch (NullPointerException success) {
466 <        } finally {
467 <            joinPool(p);
461 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
462 >        try (PoolCleaner cleaner = cleaner(p)) {
463 >            try {
464 >                p.setThreadFactory(null);
465 >                shouldThrow();
466 >            } catch (NullPointerException success) {}
467 >        }
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  
# Line 459 | Line 482 | public class ScheduledExecutorTest exten
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          }
470        assertTrue(p.isShutdown());
493      }
494  
495      /**
# Line 475 | Line 497 | public class ScheduledExecutorTest exten
497       */
498      public void testIsTerminated() throws InterruptedException {
499          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
500 <        final CountDownLatch threadStarted = new CountDownLatch(1);
501 <        final CountDownLatch done = new CountDownLatch(1);
502 <        assertFalse(p.isTerminated());
503 <        try {
500 >        try (PoolCleaner cleaner = cleaner(p)) {
501 >            final CountDownLatch threadStarted = new CountDownLatch(1);
502 >            final CountDownLatch done = new CountDownLatch(1);
503 >            assertFalse(p.isTerminated());
504              p.execute(new CheckedRunnable() {
505                  public void realRun() throws InterruptedException {
506                      assertFalse(p.isTerminated());
507                      threadStarted.countDown();
508 <                    done.await();
508 >                    await(done);
509                  }});
510 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
510 >            await(threadStarted);
511              assertFalse(p.isTerminating());
512              done.countDown();
491        } finally {
513              try { p.shutdown(); } catch (SecurityException ok) { return; }
514 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
515 +            assertTrue(p.isTerminated());
516          }
494        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
495        assertTrue(p.isTerminated());
517      }
518  
519      /**
# Line 502 | Line 523 | public class ScheduledExecutorTest exten
523          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
524          final CountDownLatch threadStarted = new CountDownLatch(1);
525          final CountDownLatch done = new CountDownLatch(1);
526 <        try {
526 >        try (PoolCleaner cleaner = cleaner(p)) {
527              assertFalse(p.isTerminating());
528              p.execute(new CheckedRunnable() {
529                  public void realRun() throws InterruptedException {
530                      assertFalse(p.isTerminating());
531                      threadStarted.countDown();
532 <                    done.await();
532 >                    await(done);
533                  }});
534 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
534 >            await(threadStarted);
535              assertFalse(p.isTerminating());
536              done.countDown();
516        } finally {
537              try { p.shutdown(); } catch (SecurityException ok) { return; }
538 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
539 +            assertTrue(p.isTerminated());
540 +            assertFalse(p.isTerminating());
541          }
519        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
520        assertTrue(p.isTerminated());
521        assertFalse(p.isTerminating());
542      }
543  
544      /**
545       * getQueue returns the work queue, which contains queued tasks
546       */
547      public void testGetQueue() throws InterruptedException {
528        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
529        final CountDownLatch threadStarted = new CountDownLatch(1);
548          final CountDownLatch done = new CountDownLatch(1);
549 <        try {
549 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
550 >        try (PoolCleaner cleaner = cleaner(p, done)) {
551 >            final CountDownLatch threadStarted = new CountDownLatch(1);
552              ScheduledFuture[] tasks = new ScheduledFuture[5];
553              for (int i = 0; i < tasks.length; i++) {
554                  Runnable r = new CheckedRunnable() {
555                      public void realRun() throws InterruptedException {
556                          threadStarted.countDown();
557 <                        done.await();
557 >                        await(done);
558                      }};
559                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
560              }
561 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
561 >            await(threadStarted);
562              BlockingQueue<Runnable> q = p.getQueue();
563              assertTrue(q.contains(tasks[tasks.length - 1]));
564              assertFalse(q.contains(tasks[0]));
545        } finally {
546            done.countDown();
547            joinPool(p);
565          }
566      }
567  
# Line 552 | Line 569 | public class ScheduledExecutorTest exten
569       * remove(task) removes queued task, and fails to remove active task
570       */
571      public void testRemove() throws InterruptedException {
555        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
556        ScheduledFuture[] tasks = new ScheduledFuture[5];
557        final CountDownLatch threadStarted = new CountDownLatch(1);
572          final CountDownLatch done = new CountDownLatch(1);
573 <        try {
573 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
574 >        try (PoolCleaner cleaner = cleaner(p, done)) {
575 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
576 >            final CountDownLatch threadStarted = new CountDownLatch(1);
577              for (int i = 0; i < tasks.length; i++) {
578                  Runnable r = new CheckedRunnable() {
579                      public void realRun() throws InterruptedException {
580                          threadStarted.countDown();
581 <                        done.await();
581 >                        await(done);
582                      }};
583                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
584              }
585 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
585 >            await(threadStarted);
586              BlockingQueue<Runnable> q = p.getQueue();
587              assertFalse(p.remove((Runnable)tasks[0]));
588              assertTrue(q.contains((Runnable)tasks[4]));
# Line 576 | Line 593 | public class ScheduledExecutorTest exten
593              assertTrue(q.contains((Runnable)tasks[3]));
594              assertTrue(p.remove((Runnable)tasks[3]));
595              assertFalse(q.contains((Runnable)tasks[3]));
579        } finally {
580            done.countDown();
581            joinPool(p);
596          }
597      }
598  
# Line 586 | Line 600 | public class ScheduledExecutorTest exten
600       * purge eventually removes cancelled tasks from the queue
601       */
602      public void testPurge() throws InterruptedException {
603 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
604 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
605 <        for (int i = 0; i < tasks.length; i++)
606 <            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
607 <                                  LONG_DELAY_MS, MILLISECONDS);
608 <        try {
603 >        final ScheduledFuture[] tasks = new ScheduledFuture[5];
604 >        final Runnable releaser = new Runnable() { public void run() {
605 >            for (ScheduledFuture task : tasks)
606 >                if (task != null) task.cancel(true); }};
607 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
608 >        try (PoolCleaner cleaner = cleaner(p, releaser)) {
609 >            for (int i = 0; i < tasks.length; i++)
610 >                tasks[i] = p.schedule(possiblyInterruptedRunnable(SMALL_DELAY_MS),
611 >                                      LONG_DELAY_MS, MILLISECONDS);
612              int max = tasks.length;
613              if (tasks[4].cancel(true)) --max;
614              if (tasks[3].cancel(true)) --max;
# Line 603 | Line 620 | public class ScheduledExecutorTest exten
620                  long count = p.getTaskCount();
621                  if (count == max)
622                      return;
623 <            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
623 >            } while (millisElapsedSince(startTime) < LONG_DELAY_MS);
624              fail("Purge failed to remove cancelled tasks");
608        } finally {
609            for (ScheduledFuture task : tasks)
610                task.cancel(true);
611            joinPool(p);
625          }
626      }
627  
628      /**
629 <     * shutdownNow returns a list containing tasks that were not run
629 >     * shutdownNow returns a list containing tasks that were not run,
630 >     * and those tasks are drained from the queue
631       */
632 <    public void testShutdownNow() {
633 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
634 <        for (int i = 0; i < 5; i++)
635 <            p.schedule(new SmallPossiblyInterruptedRunnable(),
636 <                       LONG_DELAY_MS, MILLISECONDS);
632 >    public void testShutdownNow() throws InterruptedException {
633 >        final int poolSize = 2;
634 >        final int count = 5;
635 >        final AtomicInteger ran = new AtomicInteger(0);
636 >        final ScheduledThreadPoolExecutor p =
637 >            new ScheduledThreadPoolExecutor(poolSize);
638 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
639 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
640 >            threadsStarted.countDown();
641 >            try {
642 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
643 >            } catch (InterruptedException success) {}
644 >            ran.getAndIncrement();
645 >        }};
646 >        for (int i = 0; i < count; i++)
647 >            p.execute(waiter);
648 >        await(threadsStarted);
649 >        assertEquals(poolSize, p.getActiveCount());
650 >        assertEquals(0, p.getCompletedTaskCount());
651 >        final List<Runnable> queuedTasks;
652          try {
653 <            List<Runnable> l = p.shutdownNow();
625 <            assertTrue(p.isShutdown());
626 <            assertEquals(5, l.size());
653 >            queuedTasks = p.shutdownNow();
654          } catch (SecurityException ok) {
655 <            // Allowed in case test doesn't have privs
629 <        } finally {
630 <            joinPool(p);
655 >            return; // Allowed in case test doesn't have privs
656          }
657 +        assertTrue(p.isShutdown());
658 +        assertTrue(p.getQueue().isEmpty());
659 +        assertEquals(count - poolSize, queuedTasks.size());
660 +        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
661 +        assertTrue(p.isTerminated());
662 +        assertEquals(poolSize, ran.get());
663 +        assertEquals(poolSize, p.getCompletedTaskCount());
664      }
665  
666      /**
667 <     * In default setting, shutdown cancels periodic but not delayed
668 <     * tasks at shutdown
667 >     * shutdownNow returns a list containing tasks that were not run,
668 >     * and those tasks are drained from the queue
669       */
670 <    public void testShutdown1() throws InterruptedException {
671 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
672 <        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
673 <        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
674 <
675 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
676 <        for (int i = 0; i < tasks.length; i++)
677 <            tasks[i] = p.schedule(new NoOpRunnable(),
678 <                                  SHORT_DELAY_MS, MILLISECONDS);
679 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
680 <        BlockingQueue<Runnable> q = p.getQueue();
681 <        for (ScheduledFuture task : tasks) {
682 <            assertFalse(task.isDone());
683 <            assertFalse(task.isCancelled());
684 <            assertTrue(q.contains(task));
670 >    public void testShutdownNow_delayedTasks() throws InterruptedException {
671 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
672 >        List<ScheduledFuture> tasks = new ArrayList<>();
673 >        for (int i = 0; i < 3; i++) {
674 >            Runnable r = new NoOpRunnable();
675 >            tasks.add(p.schedule(r, 9, SECONDS));
676 >            tasks.add(p.scheduleAtFixedRate(r, 9, 9, SECONDS));
677 >            tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
678 >        }
679 >        if (testImplementationDetails)
680 >            assertEquals(new HashSet(tasks), new HashSet(p.getQueue()));
681 >        final List<Runnable> queuedTasks;
682 >        try {
683 >            queuedTasks = p.shutdownNow();
684 >        } catch (SecurityException ok) {
685 >            return; // Allowed in case test doesn't have privs
686          }
687          assertTrue(p.isShutdown());
688 <        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
689 <        assertTrue(p.isTerminated());
688 >        assertTrue(p.getQueue().isEmpty());
689 >        if (testImplementationDetails)
690 >            assertEquals(new HashSet(tasks), new HashSet(queuedTasks));
691 >        assertEquals(tasks.size(), queuedTasks.size());
692          for (ScheduledFuture task : tasks) {
693 <            assertTrue(task.isDone());
693 >            assertFalse(task.isDone());
694              assertFalse(task.isCancelled());
695          }
696 +        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
697 +        assertTrue(p.isTerminated());
698      }
699  
700      /**
701 <     * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
702 <     * delayed tasks are cancelled at shutdown
703 <     */
704 <    public void testShutdown2() throws InterruptedException {
705 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
706 <        p.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
707 <        assertFalse(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
708 <        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
709 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
710 <        for (int i = 0; i < tasks.length; i++)
711 <            tasks[i] = p.schedule(new NoOpRunnable(),
712 <                                  SHORT_DELAY_MS, MILLISECONDS);
713 <        BlockingQueue q = p.getQueue();
714 <        assertEquals(tasks.length, q.size());
715 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
716 <        assertTrue(p.isShutdown());
717 <        assertTrue(q.isEmpty());
718 <        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
719 <        assertTrue(p.isTerminated());
720 <        for (ScheduledFuture task : tasks) {
721 <            assertTrue(task.isDone());
722 <            assertTrue(task.isCancelled());
701 >     * By default, periodic tasks are cancelled at shutdown.
702 >     * By default, delayed tasks keep running after shutdown.
703 >     * Check that changing the default values work:
704 >     * - setExecuteExistingDelayedTasksAfterShutdownPolicy
705 >     * - setContinueExistingPeriodicTasksAfterShutdownPolicy
706 >     */
707 >    @SuppressWarnings("FutureReturnValueIgnored")
708 >    public void testShutdown_cancellation() throws Exception {
709 >        final int poolSize = 4;
710 >        final ScheduledThreadPoolExecutor p
711 >            = new ScheduledThreadPoolExecutor(poolSize);
712 >        final BlockingQueue<Runnable> q = p.getQueue();
713 >        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
714 >        final long delay = rnd.nextInt(2);
715 >        final int rounds = rnd.nextInt(1, 3);
716 >        final boolean effectiveDelayedPolicy;
717 >        final boolean effectivePeriodicPolicy;
718 >        final boolean effectiveRemovePolicy;
719 >
720 >        if (rnd.nextBoolean())
721 >            p.setExecuteExistingDelayedTasksAfterShutdownPolicy(
722 >                effectiveDelayedPolicy = rnd.nextBoolean());
723 >        else
724 >            effectiveDelayedPolicy = true;
725 >        assertEquals(effectiveDelayedPolicy,
726 >                     p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
727 >
728 >        if (rnd.nextBoolean())
729 >            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(
730 >                effectivePeriodicPolicy = rnd.nextBoolean());
731 >        else
732 >            effectivePeriodicPolicy = false;
733 >        assertEquals(effectivePeriodicPolicy,
734 >                     p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
735 >
736 >        if (rnd.nextBoolean())
737 >            p.setRemoveOnCancelPolicy(
738 >                effectiveRemovePolicy = rnd.nextBoolean());
739 >        else
740 >            effectiveRemovePolicy = false;
741 >        assertEquals(effectiveRemovePolicy,
742 >                     p.getRemoveOnCancelPolicy());
743 >
744 >        final boolean periodicTasksContinue = effectivePeriodicPolicy && rnd.nextBoolean();
745 >
746 >        // Strategy: Wedge the pool with one wave of "blocker" tasks,
747 >        // then add a second wave that waits in the queue until unblocked.
748 >        final AtomicInteger ran = new AtomicInteger(0);
749 >        final CountDownLatch poolBlocked = new CountDownLatch(poolSize);
750 >        final CountDownLatch unblock = new CountDownLatch(1);
751 >        final RuntimeException exception = new RuntimeException();
752 >
753 >        class Task implements Runnable {
754 >            public void run() {
755 >                try {
756 >                    ran.getAndIncrement();
757 >                    poolBlocked.countDown();
758 >                    await(unblock);
759 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
760 >            }
761          }
687    }
762  
763 <    /**
764 <     * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
765 <     * periodic tasks are cancelled at shutdown
766 <     */
767 <    public void testShutdown3() throws InterruptedException {
768 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
769 <        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
770 <        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
771 <        p.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
772 <        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
773 <        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
774 <        long initialDelay = LONG_DELAY_MS;
775 <        ScheduledFuture task =
776 <            p.scheduleAtFixedRate(new NoOpRunnable(), initialDelay,
777 <                                  5, MILLISECONDS);
763 >        class PeriodicTask extends Task {
764 >            PeriodicTask(int rounds) { this.rounds = rounds; }
765 >            int rounds;
766 >            public void run() {
767 >                if (--rounds == 0) super.run();
768 >                // throw exception to surely terminate this periodic task,
769 >                // but in a separate execution and in a detectable way.
770 >                if (rounds == -1) throw exception;
771 >            }
772 >        }
773 >
774 >        Runnable task = new Task();
775 >
776 >        List<Future<?>> immediates = new ArrayList<>();
777 >        List<Future<?>> delayeds   = new ArrayList<>();
778 >        List<Future<?>> periodics  = new ArrayList<>();
779 >
780 >        immediates.add(p.submit(task));
781 >        delayeds.add(p.schedule(task, delay, MILLISECONDS));
782 >        periodics.add(p.scheduleAtFixedRate(
783 >                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
784 >        periodics.add(p.scheduleWithFixedDelay(
785 >                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
786 >
787 >        await(poolBlocked);
788 >
789 >        assertEquals(poolSize, ran.get());
790 >        assertEquals(poolSize, p.getActiveCount());
791 >        assertTrue(q.isEmpty());
792 >
793 >        // Add second wave of tasks.
794 >        immediates.add(p.submit(task));
795 >        delayeds.add(p.schedule(task, effectiveDelayedPolicy ? delay : LONG_DELAY_MS, MILLISECONDS));
796 >        periodics.add(p.scheduleAtFixedRate(
797 >                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
798 >        periodics.add(p.scheduleWithFixedDelay(
799 >                          new PeriodicTask(rounds), delay, 1, MILLISECONDS));
800 >
801 >        assertEquals(poolSize, q.size());
802 >        assertEquals(poolSize, ran.get());
803 >
804 >        immediates.forEach(
805 >            f -> assertTrue(((ScheduledFuture)f).getDelay(NANOSECONDS) <= 0L));
806 >
807 >        Stream.of(immediates, delayeds, periodics).flatMap(Collection::stream)
808 >            .forEach(f -> assertFalse(f.isDone()));
809 >
810          try { p.shutdown(); } catch (SecurityException ok) { return; }
811          assertTrue(p.isShutdown());
812 <        assertTrue(p.getQueue().isEmpty());
813 <        assertTrue(task.isDone());
708 <        assertTrue(task.isCancelled());
709 <        joinPool(p);
710 <    }
812 >        assertTrue(p.isTerminating());
813 >        assertFalse(p.isTerminated());
814  
815 <    /**
816 <     * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
817 <     * periodic tasks are not cancelled at shutdown
818 <     */
819 <    public void testShutdown4() throws InterruptedException {
820 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
821 <        final CountDownLatch counter = new CountDownLatch(2);
822 <        try {
823 <            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
824 <            assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
825 <            assertTrue(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
826 <            final Runnable r = new CheckedRunnable() {
827 <                public void realRun() {
828 <                    counter.countDown();
829 <                }};
830 <            ScheduledFuture task =
831 <                p.scheduleAtFixedRate(r, 1, 1, MILLISECONDS);
832 <            assertFalse(task.isDone());
833 <            assertFalse(task.isCancelled());
834 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
835 <            assertFalse(task.isCancelled());
836 <            assertFalse(p.isTerminated());
837 <            assertTrue(p.isShutdown());
838 <            assertTrue(counter.await(SMALL_DELAY_MS, MILLISECONDS));
839 <            assertFalse(task.isCancelled());
840 <            assertTrue(task.cancel(false));
841 <            assertTrue(task.isDone());
842 <            assertTrue(task.isCancelled());
843 <            assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
844 <            assertTrue(p.isTerminated());
845 <        }
846 <        finally {
847 <            joinPool(p);
815 >        if (rnd.nextBoolean())
816 >            assertThrows(
817 >                RejectedExecutionException.class,
818 >                () -> p.submit(task),
819 >                () -> p.schedule(task, 1, SECONDS),
820 >                () -> p.scheduleAtFixedRate(
821 >                    new PeriodicTask(1), 1, 1, SECONDS),
822 >                () -> p.scheduleWithFixedDelay(
823 >                    new PeriodicTask(2), 1, 1, SECONDS));
824 >
825 >        assertTrue(q.contains(immediates.get(1)));
826 >        assertTrue(!effectiveDelayedPolicy
827 >                   ^ q.contains(delayeds.get(1)));
828 >        assertTrue(!effectivePeriodicPolicy
829 >                   ^ q.containsAll(periodics.subList(2, 4)));
830 >
831 >        immediates.forEach(f -> assertFalse(f.isDone()));
832 >
833 >        assertFalse(delayeds.get(0).isDone());
834 >        if (effectiveDelayedPolicy)
835 >            assertFalse(delayeds.get(1).isDone());
836 >        else
837 >            assertTrue(delayeds.get(1).isCancelled());
838 >
839 >        if (effectivePeriodicPolicy)
840 >            periodics.forEach(
841 >                f -> {
842 >                    assertFalse(f.isDone());
843 >                    if (!periodicTasksContinue) {
844 >                        assertTrue(f.cancel(false));
845 >                        assertTrue(f.isCancelled());
846 >                    }
847 >                });
848 >        else {
849 >            periodics.subList(0, 2).forEach(f -> assertFalse(f.isDone()));
850 >            periodics.subList(2, 4).forEach(f -> assertTrue(f.isCancelled()));
851          }
852 +
853 +        unblock.countDown();    // Release all pool threads
854 +
855 +        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
856 +        assertFalse(p.isTerminating());
857 +        assertTrue(p.isTerminated());
858 +
859 +        assertTrue(q.isEmpty());
860 +
861 +        Stream.of(immediates, delayeds, periodics).flatMap(Collection::stream)
862 +            .forEach(f -> assertTrue(f.isDone()));
863 +
864 +        for (Future<?> f : immediates) assertNull(f.get());
865 +
866 +        assertNull(delayeds.get(0).get());
867 +        if (effectiveDelayedPolicy)
868 +            assertNull(delayeds.get(1).get());
869 +        else
870 +            assertTrue(delayeds.get(1).isCancelled());
871 +
872 +        if (periodicTasksContinue)
873 +            periodics.forEach(
874 +                f -> {
875 +                    try { f.get(); }
876 +                    catch (ExecutionException success) {
877 +                        assertSame(exception, success.getCause());
878 +                    }
879 +                    catch (Throwable fail) { threadUnexpectedException(fail); }
880 +                });
881 +        else
882 +            periodics.forEach(f -> assertTrue(f.isCancelled()));
883 +
884 +        assertEquals(poolSize + 1
885 +                     + (effectiveDelayedPolicy ? 1 : 0)
886 +                     + (periodicTasksContinue ? 2 : 0),
887 +                     ran.get());
888      }
889  
890      /**
891       * completed submit of callable returns result
892       */
893      public void testSubmitCallable() throws Exception {
894 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
895 <        try {
894 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
895 >        try (PoolCleaner cleaner = cleaner(e)) {
896              Future<String> future = e.submit(new StringTask());
897              String result = future.get();
898              assertSame(TEST_STRING, result);
757        } finally {
758            joinPool(e);
899          }
900      }
901  
# Line 763 | Line 903 | public class ScheduledExecutorTest exten
903       * completed submit of runnable returns successfully
904       */
905      public void testSubmitRunnable() throws Exception {
906 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
907 <        try {
906 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
907 >        try (PoolCleaner cleaner = cleaner(e)) {
908              Future<?> future = e.submit(new NoOpRunnable());
909              future.get();
910              assertTrue(future.isDone());
771        } finally {
772            joinPool(e);
911          }
912      }
913  
# Line 777 | Line 915 | public class ScheduledExecutorTest exten
915       * completed submit of (runnable, result) returns result
916       */
917      public void testSubmitRunnable2() throws Exception {
918 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
919 <        try {
918 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
919 >        try (PoolCleaner cleaner = cleaner(e)) {
920              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
921              String result = future.get();
922              assertSame(TEST_STRING, result);
785        } finally {
786            joinPool(e);
923          }
924      }
925  
926      /**
927 <     * invokeAny(null) throws NPE
927 >     * invokeAny(null) throws NullPointerException
928       */
929      public void testInvokeAny1() throws Exception {
930 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
931 <        try {
932 <            e.invokeAny(null);
933 <            shouldThrow();
934 <        } catch (NullPointerException success) {
935 <        } finally {
800 <            joinPool(e);
930 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
931 >        try (PoolCleaner cleaner = cleaner(e)) {
932 >            try {
933 >                e.invokeAny(null);
934 >                shouldThrow();
935 >            } catch (NullPointerException success) {}
936          }
937      }
938  
939      /**
940 <     * invokeAny(empty collection) throws IAE
940 >     * invokeAny(empty collection) throws IllegalArgumentException
941       */
942      public void testInvokeAny2() throws Exception {
943 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
944 <        try {
945 <            e.invokeAny(new ArrayList<Callable<String>>());
946 <            shouldThrow();
947 <        } catch (IllegalArgumentException success) {
948 <        } finally {
814 <            joinPool(e);
943 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
944 >        try (PoolCleaner cleaner = cleaner(e)) {
945 >            try {
946 >                e.invokeAny(new ArrayList<Callable<String>>());
947 >                shouldThrow();
948 >            } catch (IllegalArgumentException success) {}
949          }
950      }
951  
952      /**
953 <     * invokeAny(c) throws NPE if c has null elements
953 >     * invokeAny(c) throws NullPointerException if c has null elements
954       */
955      public void testInvokeAny3() throws Exception {
956          CountDownLatch latch = new CountDownLatch(1);
957 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
958 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
959 <        l.add(latchAwaitingStringTask(latch));
960 <        l.add(null);
961 <        try {
962 <            e.invokeAny(l);
963 <            shouldThrow();
964 <        } catch (NullPointerException success) {
965 <        } finally {
957 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
958 >        try (PoolCleaner cleaner = cleaner(e)) {
959 >            List<Callable<String>> l = new ArrayList<>();
960 >            l.add(latchAwaitingStringTask(latch));
961 >            l.add(null);
962 >            try {
963 >                e.invokeAny(l);
964 >                shouldThrow();
965 >            } catch (NullPointerException success) {}
966              latch.countDown();
833            joinPool(e);
967          }
968      }
969  
# Line 838 | Line 971 | public class ScheduledExecutorTest exten
971       * invokeAny(c) throws ExecutionException if no task completes
972       */
973      public void testInvokeAny4() throws Exception {
974 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
975 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
976 <        l.add(new NPETask());
977 <        try {
978 <            e.invokeAny(l);
979 <            shouldThrow();
980 <        } catch (ExecutionException success) {
981 <            assertTrue(success.getCause() instanceof NullPointerException);
982 <        } finally {
983 <            joinPool(e);
974 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
975 >        try (PoolCleaner cleaner = cleaner(e)) {
976 >            List<Callable<String>> l = new ArrayList<>();
977 >            l.add(new NPETask());
978 >            try {
979 >                e.invokeAny(l);
980 >                shouldThrow();
981 >            } catch (ExecutionException success) {
982 >                assertTrue(success.getCause() instanceof NullPointerException);
983 >            }
984          }
985      }
986  
# Line 855 | Line 988 | public class ScheduledExecutorTest exten
988       * invokeAny(c) returns result of some task
989       */
990      public void testInvokeAny5() throws Exception {
991 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
992 <        try {
993 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
991 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
992 >        try (PoolCleaner cleaner = cleaner(e)) {
993 >            List<Callable<String>> l = new ArrayList<>();
994              l.add(new StringTask());
995              l.add(new StringTask());
996              String result = e.invokeAny(l);
997              assertSame(TEST_STRING, result);
865        } finally {
866            joinPool(e);
998          }
999      }
1000  
# Line 871 | Line 1002 | public class ScheduledExecutorTest exten
1002       * invokeAll(null) throws NPE
1003       */
1004      public void testInvokeAll1() throws Exception {
1005 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1006 <        try {
1007 <            e.invokeAll(null);
1008 <            shouldThrow();
1009 <        } catch (NullPointerException success) {
1010 <        } finally {
880 <            joinPool(e);
1005 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1006 >        try (PoolCleaner cleaner = cleaner(e)) {
1007 >            try {
1008 >                e.invokeAll(null);
1009 >                shouldThrow();
1010 >            } catch (NullPointerException success) {}
1011          }
1012      }
1013  
1014      /**
1015 <     * invokeAll(empty collection) returns empty collection
1015 >     * invokeAll(empty collection) returns empty list
1016       */
1017      public void testInvokeAll2() throws Exception {
1018 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1019 <        try {
1020 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1018 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1019 >        final Collection<Callable<String>> emptyCollection
1020 >            = Collections.emptyList();
1021 >        try (PoolCleaner cleaner = cleaner(e)) {
1022 >            List<Future<String>> r = e.invokeAll(emptyCollection);
1023              assertTrue(r.isEmpty());
892        } finally {
893            joinPool(e);
1024          }
1025      }
1026  
# Line 898 | Line 1028 | public class ScheduledExecutorTest exten
1028       * invokeAll(c) throws NPE if c has null elements
1029       */
1030      public void testInvokeAll3() throws Exception {
1031 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1032 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1033 <        l.add(new StringTask());
1034 <        l.add(null);
1035 <        try {
1036 <            e.invokeAll(l);
1037 <            shouldThrow();
1038 <        } catch (NullPointerException success) {
1039 <        } finally {
910 <            joinPool(e);
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(null);
1036 >            try {
1037 >                e.invokeAll(l);
1038 >                shouldThrow();
1039 >            } catch (NullPointerException success) {}
1040          }
1041      }
1042  
# Line 915 | Line 1044 | public class ScheduledExecutorTest exten
1044       * get of invokeAll(c) throws exception on failed task
1045       */
1046      public void testInvokeAll4() throws Exception {
1047 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1048 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1049 <        l.add(new NPETask());
1050 <        List<Future<String>> futures = e.invokeAll(l);
1051 <        assertEquals(1, futures.size());
1052 <        try {
1053 <            futures.get(0).get();
1054 <            shouldThrow();
1055 <        } catch (ExecutionException success) {
1056 <            assertTrue(success.getCause() instanceof NullPointerException);
1057 <        } finally {
1058 <            joinPool(e);
1047 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1048 >        try (PoolCleaner cleaner = cleaner(e)) {
1049 >            List<Callable<String>> l = new ArrayList<>();
1050 >            l.add(new NPETask());
1051 >            List<Future<String>> futures = e.invokeAll(l);
1052 >            assertEquals(1, futures.size());
1053 >            try {
1054 >                futures.get(0).get();
1055 >                shouldThrow();
1056 >            } catch (ExecutionException success) {
1057 >                assertTrue(success.getCause() instanceof NullPointerException);
1058 >            }
1059          }
1060      }
1061  
# Line 934 | Line 1063 | public class ScheduledExecutorTest exten
1063       * invokeAll(c) returns results of all completed tasks
1064       */
1065      public void testInvokeAll5() throws Exception {
1066 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1067 <        try {
1068 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1066 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1067 >        try (PoolCleaner cleaner = cleaner(e)) {
1068 >            List<Callable<String>> l = new ArrayList<>();
1069              l.add(new StringTask());
1070              l.add(new StringTask());
1071              List<Future<String>> futures = e.invokeAll(l);
1072              assertEquals(2, futures.size());
1073              for (Future<String> future : futures)
1074                  assertSame(TEST_STRING, future.get());
946        } finally {
947            joinPool(e);
1075          }
1076      }
1077  
# Line 952 | Line 1079 | public class ScheduledExecutorTest exten
1079       * timed invokeAny(null) throws NPE
1080       */
1081      public void testTimedInvokeAny1() throws Exception {
1082 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1083 <        try {
1084 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1085 <            shouldThrow();
1086 <        } catch (NullPointerException success) {
1087 <        } finally {
961 <            joinPool(e);
1082 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1083 >        try (PoolCleaner cleaner = cleaner(e)) {
1084 >            try {
1085 >                e.invokeAny(null, randomTimeout(), randomTimeUnit());
1086 >                shouldThrow();
1087 >            } catch (NullPointerException success) {}
1088          }
1089      }
1090  
1091      /**
1092 <     * timed invokeAny(,,null) throws NPE
1092 >     * timed invokeAny(,,null) throws NullPointerException
1093       */
1094      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1095 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1096 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1097 <        l.add(new StringTask());
1098 <        try {
1099 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1100 <            shouldThrow();
1101 <        } catch (NullPointerException success) {
1102 <        } finally {
977 <            joinPool(e);
1095 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1096 >        try (PoolCleaner cleaner = cleaner(e)) {
1097 >            List<Callable<String>> l = new ArrayList<>();
1098 >            l.add(new StringTask());
1099 >            try {
1100 >                e.invokeAny(l, randomTimeout(), null);
1101 >                shouldThrow();
1102 >            } catch (NullPointerException success) {}
1103          }
1104      }
1105  
1106      /**
1107 <     * timed invokeAny(empty collection) throws IAE
1107 >     * timed invokeAny(empty collection) throws IllegalArgumentException
1108       */
1109      public void testTimedInvokeAny2() throws Exception {
1110 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1111 <        try {
1112 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1113 <            shouldThrow();
1114 <        } catch (IllegalArgumentException success) {
1115 <        } finally {
1116 <            joinPool(e);
1110 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1111 >        final Collection<Callable<String>> emptyCollection
1112 >            = Collections.emptyList();
1113 >        try (PoolCleaner cleaner = cleaner(e)) {
1114 >            try {
1115 >                e.invokeAny(emptyCollection, randomTimeout(), randomTimeUnit());
1116 >                shouldThrow();
1117 >            } catch (IllegalArgumentException success) {}
1118          }
1119      }
1120  
# Line 997 | Line 1123 | public class ScheduledExecutorTest exten
1123       */
1124      public void testTimedInvokeAny3() throws Exception {
1125          CountDownLatch latch = new CountDownLatch(1);
1126 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1127 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1128 <        l.add(latchAwaitingStringTask(latch));
1129 <        l.add(null);
1130 <        try {
1131 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1132 <            shouldThrow();
1133 <        } catch (NullPointerException success) {
1134 <        } finally {
1126 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1127 >        try (PoolCleaner cleaner = cleaner(e)) {
1128 >            List<Callable<String>> l = new ArrayList<>();
1129 >            l.add(latchAwaitingStringTask(latch));
1130 >            l.add(null);
1131 >            try {
1132 >                e.invokeAny(l, randomTimeout(), randomTimeUnit());
1133 >                shouldThrow();
1134 >            } catch (NullPointerException success) {}
1135              latch.countDown();
1010            joinPool(e);
1136          }
1137      }
1138  
# Line 1015 | Line 1140 | public class ScheduledExecutorTest exten
1140       * timed invokeAny(c) throws ExecutionException if no task completes
1141       */
1142      public void testTimedInvokeAny4() throws Exception {
1143 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1144 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1145 <        l.add(new NPETask());
1146 <        try {
1147 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1148 <            shouldThrow();
1149 <        } catch (ExecutionException success) {
1150 <            assertTrue(success.getCause() instanceof NullPointerException);
1151 <        } finally {
1152 <            joinPool(e);
1143 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1144 >        try (PoolCleaner cleaner = cleaner(e)) {
1145 >            long startTime = System.nanoTime();
1146 >            List<Callable<String>> l = new ArrayList<>();
1147 >            l.add(new NPETask());
1148 >            try {
1149 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1150 >                shouldThrow();
1151 >            } catch (ExecutionException success) {
1152 >                assertTrue(success.getCause() instanceof NullPointerException);
1153 >            }
1154 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1155          }
1156      }
1157  
# Line 1032 | Line 1159 | public class ScheduledExecutorTest exten
1159       * timed invokeAny(c) returns result of some task
1160       */
1161      public void testTimedInvokeAny5() throws Exception {
1162 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1163 <        try {
1164 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1162 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1163 >        try (PoolCleaner cleaner = cleaner(e)) {
1164 >            long startTime = System.nanoTime();
1165 >            List<Callable<String>> l = new ArrayList<>();
1166              l.add(new StringTask());
1167              l.add(new StringTask());
1168 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1168 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1169              assertSame(TEST_STRING, result);
1170 <        } finally {
1043 <            joinPool(e);
1170 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1171          }
1172      }
1173  
# Line 1048 | Line 1175 | public class ScheduledExecutorTest exten
1175       * timed invokeAll(null) throws NPE
1176       */
1177      public void testTimedInvokeAll1() throws Exception {
1178 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1179 <        try {
1180 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1181 <            shouldThrow();
1182 <        } catch (NullPointerException success) {
1183 <        } finally {
1057 <            joinPool(e);
1178 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1179 >        try (PoolCleaner cleaner = cleaner(e)) {
1180 >            try {
1181 >                e.invokeAll(null, randomTimeout(), randomTimeUnit());
1182 >                shouldThrow();
1183 >            } catch (NullPointerException success) {}
1184          }
1185      }
1186  
# Line 1062 | Line 1188 | public class ScheduledExecutorTest exten
1188       * timed invokeAll(,,null) throws NPE
1189       */
1190      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1191 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1192 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1193 <        l.add(new StringTask());
1194 <        try {
1195 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1196 <            shouldThrow();
1197 <        } catch (NullPointerException success) {
1198 <        } finally {
1073 <            joinPool(e);
1191 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1192 >        try (PoolCleaner cleaner = cleaner(e)) {
1193 >            List<Callable<String>> l = new ArrayList<>();
1194 >            l.add(new StringTask());
1195 >            try {
1196 >                e.invokeAll(l, randomTimeout(), null);
1197 >                shouldThrow();
1198 >            } catch (NullPointerException success) {}
1199          }
1200      }
1201  
1202      /**
1203 <     * timed invokeAll(empty collection) returns empty collection
1203 >     * timed invokeAll(empty collection) returns empty list
1204       */
1205      public void testTimedInvokeAll2() throws Exception {
1206 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1207 <        try {
1208 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1206 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1207 >        final Collection<Callable<String>> emptyCollection
1208 >            = Collections.emptyList();
1209 >        try (PoolCleaner cleaner = cleaner(e)) {
1210 >            List<Future<String>> r =
1211 >                e.invokeAll(emptyCollection, randomTimeout(), randomTimeUnit());
1212              assertTrue(r.isEmpty());
1085        } finally {
1086            joinPool(e);
1213          }
1214      }
1215  
# Line 1091 | Line 1217 | public class ScheduledExecutorTest exten
1217       * timed invokeAll(c) throws NPE if c has null elements
1218       */
1219      public void testTimedInvokeAll3() throws Exception {
1220 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1221 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1222 <        l.add(new StringTask());
1223 <        l.add(null);
1224 <        try {
1225 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1226 <            shouldThrow();
1227 <        } catch (NullPointerException success) {
1228 <        } finally {
1103 <            joinPool(e);
1220 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1221 >        try (PoolCleaner cleaner = cleaner(e)) {
1222 >            List<Callable<String>> l = new ArrayList<>();
1223 >            l.add(new StringTask());
1224 >            l.add(null);
1225 >            try {
1226 >                e.invokeAll(l, randomTimeout(), randomTimeUnit());
1227 >                shouldThrow();
1228 >            } catch (NullPointerException success) {}
1229          }
1230      }
1231  
# Line 1108 | Line 1233 | public class ScheduledExecutorTest exten
1233       * get of element of invokeAll(c) throws exception on failed task
1234       */
1235      public void testTimedInvokeAll4() throws Exception {
1236 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1237 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1238 <        l.add(new NPETask());
1239 <        List<Future<String>> futures =
1240 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1241 <        assertEquals(1, futures.size());
1242 <        try {
1243 <            futures.get(0).get();
1244 <            shouldThrow();
1245 <        } catch (ExecutionException success) {
1246 <            assertTrue(success.getCause() instanceof NullPointerException);
1247 <        } finally {
1248 <            joinPool(e);
1236 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1237 >        try (PoolCleaner cleaner = cleaner(e)) {
1238 >            List<Callable<String>> l = new ArrayList<>();
1239 >            l.add(new NPETask());
1240 >            List<Future<String>> futures =
1241 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1242 >            assertEquals(1, futures.size());
1243 >            try {
1244 >                futures.get(0).get();
1245 >                shouldThrow();
1246 >            } catch (ExecutionException success) {
1247 >                assertTrue(success.getCause() instanceof NullPointerException);
1248 >            }
1249          }
1250      }
1251  
# Line 1128 | Line 1253 | public class ScheduledExecutorTest exten
1253       * timed invokeAll(c) returns results of all completed tasks
1254       */
1255      public void testTimedInvokeAll5() throws Exception {
1256 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1257 <        try {
1258 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1256 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1257 >        try (PoolCleaner cleaner = cleaner(e)) {
1258 >            List<Callable<String>> l = new ArrayList<>();
1259              l.add(new StringTask());
1260              l.add(new StringTask());
1261              List<Future<String>> futures =
1262 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1262 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1263              assertEquals(2, futures.size());
1264              for (Future<String> future : futures)
1265                  assertSame(TEST_STRING, future.get());
1141        } finally {
1142            joinPool(e);
1266          }
1267      }
1268  
# Line 1147 | Line 1270 | public class ScheduledExecutorTest exten
1270       * timed invokeAll(c) cancels tasks not completed by timeout
1271       */
1272      public void testTimedInvokeAll6() throws Exception {
1273 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1274 <        try {
1275 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1276 <            l.add(new StringTask());
1277 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1278 <            l.add(new StringTask());
1279 <            List<Future<String>> futures =
1280 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1281 <            assertEquals(3, futures.size());
1282 <            Iterator<Future<String>> it = futures.iterator();
1283 <            Future<String> f1 = it.next();
1284 <            Future<String> f2 = it.next();
1285 <            Future<String> f3 = it.next();
1286 <            assertTrue(f1.isDone());
1287 <            assertTrue(f2.isDone());
1288 <            assertTrue(f3.isDone());
1289 <            assertFalse(f1.isCancelled());
1290 <            assertTrue(f2.isCancelled());
1291 <        } finally {
1292 <            joinPool(e);
1273 >        for (long timeout = timeoutMillis();;) {
1274 >            final CountDownLatch done = new CountDownLatch(1);
1275 >            final Callable<String> waiter = new CheckedCallable<String>() {
1276 >                public String realCall() {
1277 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1278 >                    catch (InterruptedException ok) {}
1279 >                    return "1"; }};
1280 >            final ExecutorService p = new ScheduledThreadPoolExecutor(2);
1281 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1282 >                List<Callable<String>> tasks = new ArrayList<>();
1283 >                tasks.add(new StringTask("0"));
1284 >                tasks.add(waiter);
1285 >                tasks.add(new StringTask("2"));
1286 >                long startTime = System.nanoTime();
1287 >                List<Future<String>> futures =
1288 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1289 >                assertEquals(tasks.size(), futures.size());
1290 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1291 >                for (Future future : futures)
1292 >                    assertTrue(future.isDone());
1293 >                assertTrue(futures.get(1).isCancelled());
1294 >                try {
1295 >                    assertEquals("0", futures.get(0).get());
1296 >                    assertEquals("2", futures.get(2).get());
1297 >                    break;
1298 >                } catch (CancellationException retryWithLongerTimeout) {
1299 >                    timeout *= 2;
1300 >                    if (timeout >= LONG_DELAY_MS / 2)
1301 >                        fail("expected exactly one task to be cancelled");
1302 >                }
1303 >            }
1304 >        }
1305 >    }
1306 >
1307 >    /**
1308 >     * A fixed delay task with overflowing period should not prevent a
1309 >     * one-shot task from executing.
1310 >     * https://bugs.openjdk.java.net/browse/JDK-8051859
1311 >     */
1312 >    @SuppressWarnings("FutureReturnValueIgnored")
1313 >    public void testScheduleWithFixedDelay_overflow() throws Exception {
1314 >        final CountDownLatch delayedDone = new CountDownLatch(1);
1315 >        final CountDownLatch immediateDone = new CountDownLatch(1);
1316 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
1317 >        try (PoolCleaner cleaner = cleaner(p)) {
1318 >            final Runnable delayed = () -> {
1319 >                delayedDone.countDown();
1320 >                p.submit(() -> immediateDone.countDown());
1321 >            };
1322 >            p.scheduleWithFixedDelay(delayed, 0L, Long.MAX_VALUE, SECONDS);
1323 >            await(delayedDone);
1324 >            await(immediateDone);
1325          }
1326      }
1327  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines