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.81 by jsr166, Wed Aug 24 22:22:39 2016 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.HashSet;
15 > import java.util.List;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.Callable;
18 > import java.util.concurrent.CancellationException;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.ExecutionException;
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.ThreadPoolExecutor;
28 > import java.util.concurrent.atomic.AtomicBoolean;
29 > import java.util.concurrent.atomic.AtomicInteger;
30 > import java.util.concurrent.atomic.AtomicLong;
31 >
32 > import junit.framework.Test;
33 > import junit.framework.TestSuite;
34  
35   public class ScheduledExecutorTest extends JSR166TestCase {
36      public static void main(String[] args) {
37 <        junit.textui.TestRunner.run(suite());
37 >        main(suite(), args);
38      }
39      public static Test suite() {
40          return new TestSuite(ScheduledExecutorTest.class);
# Line 24 | Line 44 | public class ScheduledExecutorTest exten
44       * execute successfully executes a runnable
45       */
46      public void testExecute() throws InterruptedException {
47 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
48 <        final CountDownLatch done = new CountDownLatch(1);
49 <        final Runnable task = new CheckedRunnable() {
50 <            public void realRun() {
51 <                done.countDown();
32 <            }};
33 <        try {
47 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
48 >        try (PoolCleaner cleaner = cleaner(p)) {
49 >            final CountDownLatch done = new CountDownLatch(1);
50 >            final Runnable task = new CheckedRunnable() {
51 >                public void realRun() { done.countDown(); }};
52              p.execute(task);
53 <            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
36 <        } finally {
37 <            joinPool(p);
53 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
54          }
55      }
56  
# Line 42 | Line 58 | public class ScheduledExecutorTest exten
58       * delayed schedule of callable successfully executes after delay
59       */
60      public void testSchedule1() throws Exception {
61 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
62 <        final long startTime = System.nanoTime();
63 <        final CountDownLatch done = new CountDownLatch(1);
64 <        try {
61 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
62 >        try (PoolCleaner cleaner = cleaner(p)) {
63 >            final long startTime = System.nanoTime();
64 >            final CountDownLatch done = new CountDownLatch(1);
65              Callable task = new CheckedCallable<Boolean>() {
66                  public Boolean realCall() {
67                      done.countDown();
# Line 56 | Line 72 | public class ScheduledExecutorTest exten
72              assertSame(Boolean.TRUE, f.get());
73              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
74              assertTrue(done.await(0L, MILLISECONDS));
59        } finally {
60            joinPool(p);
75          }
76      }
77  
# Line 65 | Line 79 | public class ScheduledExecutorTest exten
79       * delayed schedule of runnable successfully executes after delay
80       */
81      public void testSchedule3() throws Exception {
82 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
83 <        final long startTime = System.nanoTime();
84 <        final CountDownLatch done = new CountDownLatch(1);
85 <        try {
82 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
83 >        try (PoolCleaner cleaner = cleaner(p)) {
84 >            final long startTime = System.nanoTime();
85 >            final CountDownLatch done = new CountDownLatch(1);
86              Runnable task = new CheckedRunnable() {
87                  public void realRun() {
88                      done.countDown();
# Line 78 | Line 92 | public class ScheduledExecutorTest exten
92              await(done);
93              assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
94              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
81        } finally {
82            joinPool(p);
95          }
96      }
97  
# Line 87 | Line 99 | public class ScheduledExecutorTest exten
99       * scheduleAtFixedRate executes runnable after given initial delay
100       */
101      public void testSchedule4() throws Exception {
102 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
103 <        final long startTime = System.nanoTime();
104 <        final CountDownLatch done = new CountDownLatch(1);
105 <        try {
102 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
103 >        try (PoolCleaner cleaner = cleaner(p)) {
104 >            final long startTime = System.nanoTime();
105 >            final CountDownLatch done = new CountDownLatch(1);
106              Runnable task = new CheckedRunnable() {
107                  public void realRun() {
108                      done.countDown();
# Line 102 | Line 114 | public class ScheduledExecutorTest exten
114              await(done);
115              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
116              f.cancel(true);
105        } finally {
106            joinPool(p);
117          }
118      }
119  
# Line 111 | Line 121 | public class ScheduledExecutorTest exten
121       * scheduleWithFixedDelay executes runnable after given initial delay
122       */
123      public void testSchedule5() throws Exception {
124 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
125 <        final long startTime = System.nanoTime();
126 <        final CountDownLatch done = new CountDownLatch(1);
127 <        try {
124 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
125 >        try (PoolCleaner cleaner = cleaner(p)) {
126 >            final long startTime = System.nanoTime();
127 >            final CountDownLatch done = new CountDownLatch(1);
128              Runnable task = new CheckedRunnable() {
129                  public void realRun() {
130                      done.countDown();
# Line 126 | Line 136 | public class ScheduledExecutorTest exten
136              await(done);
137              assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
138              f.cancel(true);
129        } finally {
130            joinPool(p);
139          }
140      }
141  
# Line 137 | Line 145 | public class ScheduledExecutorTest exten
145      }
146  
147      /**
148 <     * scheduleAtFixedRate executes series of tasks at given rate
148 >     * scheduleAtFixedRate executes series of tasks at given rate.
149 >     * Eventually, it must hold that:
150 >     *   cycles - 1 <= elapsedMillis/delay < cycles
151       */
152      public void testFixedRateSequence() throws InterruptedException {
153 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
154 <        RunnableCounter counter = new RunnableCounter();
155 <        ScheduledFuture h =
156 <            p.scheduleAtFixedRate(counter, 0, 1, MILLISECONDS);
157 <        delay(SMALL_DELAY_MS);
158 <        h.cancel(true);
159 <        int c = counter.count.get();
160 <        // By time scaling conventions, we must have at least
161 <        // an execution per SHORT delay, but no more than one SHORT more
162 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
163 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
164 <        joinPool(p);
153 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
154 >        try (PoolCleaner cleaner = cleaner(p)) {
155 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
156 >                final long startTime = System.nanoTime();
157 >                final int cycles = 8;
158 >                final CountDownLatch done = new CountDownLatch(cycles);
159 >                final Runnable task = new CheckedRunnable() {
160 >                    public void realRun() { done.countDown(); }};
161 >                final ScheduledFuture periodicTask =
162 >                    p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
163 >                final int totalDelayMillis = (cycles - 1) * delay;
164 >                await(done, totalDelayMillis + LONG_DELAY_MS);
165 >                periodicTask.cancel(true);
166 >                final long elapsedMillis = millisElapsedSince(startTime);
167 >                assertTrue(elapsedMillis >= totalDelayMillis);
168 >                if (elapsedMillis <= cycles * delay)
169 >                    return;
170 >                // else retry with longer delay
171 >            }
172 >            fail("unexpected execution rate");
173 >        }
174      }
175  
176      /**
177 <     * scheduleWithFixedDelay executes series of tasks with given period
177 >     * scheduleWithFixedDelay executes series of tasks with given period.
178 >     * Eventually, it must hold that each task starts at least delay and at
179 >     * most 2 * delay after the termination of the previous task.
180       */
181      public void testFixedDelaySequence() throws InterruptedException {
182 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
183 <        RunnableCounter counter = new RunnableCounter();
184 <        ScheduledFuture h =
185 <            p.scheduleWithFixedDelay(counter, 0, 1, MILLISECONDS);
186 <        delay(SMALL_DELAY_MS);
187 <        h.cancel(true);
188 <        int c = counter.count.get();
189 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
190 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
191 <        joinPool(p);
182 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
183 >        try (PoolCleaner cleaner = cleaner(p)) {
184 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
185 >                final long startTime = System.nanoTime();
186 >                final AtomicLong previous = new AtomicLong(startTime);
187 >                final AtomicBoolean tryLongerDelay = new AtomicBoolean(false);
188 >                final int cycles = 8;
189 >                final CountDownLatch done = new CountDownLatch(cycles);
190 >                final int d = delay;
191 >                final Runnable task = new CheckedRunnable() {
192 >                    public void realRun() {
193 >                        long now = System.nanoTime();
194 >                        long elapsedMillis
195 >                            = NANOSECONDS.toMillis(now - previous.get());
196 >                        if (done.getCount() == cycles) { // first execution
197 >                            if (elapsedMillis >= d)
198 >                                tryLongerDelay.set(true);
199 >                        } else {
200 >                            assertTrue(elapsedMillis >= d);
201 >                            if (elapsedMillis >= 2 * d)
202 >                                tryLongerDelay.set(true);
203 >                        }
204 >                        previous.set(now);
205 >                        done.countDown();
206 >                    }};
207 >                final ScheduledFuture periodicTask =
208 >                    p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
209 >                final int totalDelayMillis = (cycles - 1) * delay;
210 >                await(done, totalDelayMillis + cycles * LONG_DELAY_MS);
211 >                periodicTask.cancel(true);
212 >                final long elapsedMillis = millisElapsedSince(startTime);
213 >                assertTrue(elapsedMillis >= totalDelayMillis);
214 >                if (!tryLongerDelay.get())
215 >                    return;
216 >                // else retry with longer delay
217 >            }
218 >            fail("unexpected execution rate");
219 >        }
220      }
221  
222      /**
223       * execute(null) throws NPE
224       */
225      public void testExecuteNull() throws InterruptedException {
226 <        ScheduledThreadPoolExecutor se = null;
227 <        try {
228 <            se = new ScheduledThreadPoolExecutor(1);
229 <            se.execute(null);
230 <            shouldThrow();
231 <        } catch (NullPointerException success) {}
232 <
184 <        joinPool(se);
226 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
227 >        try (PoolCleaner cleaner = cleaner(p)) {
228 >            try {
229 >                p.execute(null);
230 >                shouldThrow();
231 >            } catch (NullPointerException success) {}
232 >        }
233      }
234  
235      /**
236       * schedule(null) throws NPE
237       */
238      public void testScheduleNull() throws InterruptedException {
239 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
240 <        try {
241 <            TrackedCallable callable = null;
242 <            Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
243 <            shouldThrow();
244 <        } catch (NullPointerException success) {}
245 <        joinPool(se);
239 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
240 >        try (PoolCleaner cleaner = cleaner(p)) {
241 >            try {
242 >                TrackedCallable callable = null;
243 >                Future f = p.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
244 >                shouldThrow();
245 >            } catch (NullPointerException success) {}
246 >        }
247      }
248  
249      /**
250       * execute throws RejectedExecutionException if shutdown
251       */
252      public void testSchedule1_RejectedExecutionException() throws InterruptedException {
253 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
254 <        try {
255 <            se.shutdown();
256 <            se.schedule(new NoOpRunnable(),
257 <                        MEDIUM_DELAY_MS, MILLISECONDS);
258 <            shouldThrow();
259 <        } catch (RejectedExecutionException success) {
260 <        } catch (SecurityException ok) {
253 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
254 >        try (PoolCleaner cleaner = cleaner(p)) {
255 >            try {
256 >                p.shutdown();
257 >                p.schedule(new NoOpRunnable(),
258 >                           MEDIUM_DELAY_MS, MILLISECONDS);
259 >                shouldThrow();
260 >            } catch (RejectedExecutionException success) {
261 >            } catch (SecurityException ok) {}
262          }
213
214        joinPool(se);
263      }
264  
265      /**
266       * schedule throws RejectedExecutionException if shutdown
267       */
268      public void testSchedule2_RejectedExecutionException() throws InterruptedException {
269 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
270 <        try {
271 <            se.shutdown();
272 <            se.schedule(new NoOpCallable(),
273 <                        MEDIUM_DELAY_MS, MILLISECONDS);
274 <            shouldThrow();
275 <        } catch (RejectedExecutionException success) {
276 <        } catch (SecurityException ok) {
269 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
270 >        try (PoolCleaner cleaner = cleaner(p)) {
271 >            try {
272 >                p.shutdown();
273 >                p.schedule(new NoOpCallable(),
274 >                           MEDIUM_DELAY_MS, MILLISECONDS);
275 >                shouldThrow();
276 >            } catch (RejectedExecutionException success) {
277 >            } catch (SecurityException ok) {}
278          }
230        joinPool(se);
279      }
280  
281      /**
282       * schedule callable throws RejectedExecutionException if shutdown
283       */
284      public void testSchedule3_RejectedExecutionException() throws InterruptedException {
285 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
286 <        try {
287 <            se.shutdown();
288 <            se.schedule(new NoOpCallable(),
289 <                        MEDIUM_DELAY_MS, MILLISECONDS);
290 <            shouldThrow();
291 <        } catch (RejectedExecutionException success) {
292 <        } catch (SecurityException ok) {
285 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
286 >        try (PoolCleaner cleaner = cleaner(p)) {
287 >            try {
288 >                p.shutdown();
289 >                p.schedule(new NoOpCallable(),
290 >                           MEDIUM_DELAY_MS, MILLISECONDS);
291 >                shouldThrow();
292 >            } catch (RejectedExecutionException success) {
293 >            } catch (SecurityException ok) {}
294          }
246        joinPool(se);
295      }
296  
297      /**
298       * scheduleAtFixedRate throws RejectedExecutionException if shutdown
299       */
300      public void testScheduleAtFixedRate1_RejectedExecutionException() throws InterruptedException {
301 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
302 <        try {
303 <            se.shutdown();
304 <            se.scheduleAtFixedRate(new NoOpRunnable(),
305 <                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
306 <            shouldThrow();
307 <        } catch (RejectedExecutionException success) {
308 <        } catch (SecurityException ok) {
301 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
302 >        try (PoolCleaner cleaner = cleaner(p)) {
303 >            try {
304 >                p.shutdown();
305 >                p.scheduleAtFixedRate(new NoOpRunnable(),
306 >                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
307 >                shouldThrow();
308 >            } catch (RejectedExecutionException success) {
309 >            } catch (SecurityException ok) {}
310          }
262        joinPool(se);
311      }
312  
313      /**
314       * scheduleWithFixedDelay throws RejectedExecutionException if shutdown
315       */
316      public void testScheduleWithFixedDelay1_RejectedExecutionException() throws InterruptedException {
317 <        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
318 <        try {
319 <            se.shutdown();
320 <            se.scheduleWithFixedDelay(new NoOpRunnable(),
321 <                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
322 <            shouldThrow();
323 <        } catch (RejectedExecutionException success) {
324 <        } catch (SecurityException ok) {
317 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
318 >        try (PoolCleaner cleaner = cleaner(p)) {
319 >            try {
320 >                p.shutdown();
321 >                p.scheduleWithFixedDelay(new NoOpRunnable(),
322 >                                         MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
323 >                shouldThrow();
324 >            } catch (RejectedExecutionException success) {
325 >            } catch (SecurityException ok) {}
326          }
278        joinPool(se);
327      }
328  
329      /**
# Line 283 | Line 331 | public class ScheduledExecutorTest exten
331       * thread becomes active
332       */
333      public void testGetActiveCount() throws InterruptedException {
286        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
287        final CountDownLatch threadStarted = new CountDownLatch(1);
334          final CountDownLatch done = new CountDownLatch(1);
335 <        try {
335 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
336 >        try (PoolCleaner cleaner = cleaner(p, done)) {
337 >            final CountDownLatch threadStarted = new CountDownLatch(1);
338              assertEquals(0, p.getActiveCount());
339              p.execute(new CheckedRunnable() {
340                  public void realRun() throws InterruptedException {
341                      threadStarted.countDown();
342                      assertEquals(1, p.getActiveCount());
343 <                    done.await();
343 >                    await(done);
344                  }});
345 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
345 >            await(threadStarted);
346              assertEquals(1, p.getActiveCount());
299        } finally {
300            done.countDown();
301            joinPool(p);
347          }
348      }
349  
# Line 308 | Line 353 | public class ScheduledExecutorTest exten
353       */
354      public void testGetCompletedTaskCount() throws InterruptedException {
355          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
356 <        final CountDownLatch threadStarted = new CountDownLatch(1);
357 <        final CountDownLatch threadProceed = new CountDownLatch(1);
358 <        final CountDownLatch threadDone = new CountDownLatch(1);
359 <        try {
356 >        try (PoolCleaner cleaner = cleaner(p)) {
357 >            final CountDownLatch threadStarted = new CountDownLatch(1);
358 >            final CountDownLatch threadProceed = new CountDownLatch(1);
359 >            final CountDownLatch threadDone = new CountDownLatch(1);
360              assertEquals(0, p.getCompletedTaskCount());
361              p.execute(new CheckedRunnable() {
362                  public void realRun() throws InterruptedException {
# Line 320 | Line 365 | public class ScheduledExecutorTest exten
365                      threadProceed.await();
366                      threadDone.countDown();
367                  }});
368 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
368 >            await(threadStarted);
369              assertEquals(0, p.getCompletedTaskCount());
370              threadProceed.countDown();
371              threadDone.await();
# Line 330 | Line 375 | public class ScheduledExecutorTest exten
375                      fail("timed out");
376                  Thread.yield();
377              }
333        } finally {
334            joinPool(p);
378          }
379      }
380  
# Line 340 | Line 383 | public class ScheduledExecutorTest exten
383       */
384      public void testGetCorePoolSize() throws InterruptedException {
385          ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
386 <        assertEquals(1, p.getCorePoolSize());
387 <        joinPool(p);
386 >        try (PoolCleaner cleaner = cleaner(p)) {
387 >            assertEquals(1, p.getCorePoolSize());
388 >        }
389      }
390  
391      /**
# Line 353 | Line 397 | public class ScheduledExecutorTest exten
397          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(THREADS);
398          final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
399          final CountDownLatch done = new CountDownLatch(1);
400 <        try {
400 >        try (PoolCleaner cleaner = cleaner(p, done)) {
401              assertEquals(0, p.getLargestPoolSize());
402              for (int i = 0; i < THREADS; i++)
403                  p.execute(new CheckedRunnable() {
404                      public void realRun() throws InterruptedException {
405                          threadsStarted.countDown();
406 <                        done.await();
406 >                        await(done);
407                          assertEquals(THREADS, p.getLargestPoolSize());
408                      }});
409 <            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
366 <            assertEquals(THREADS, p.getLargestPoolSize());
367 <        } finally {
368 <            done.countDown();
369 <            joinPool(p);
409 >            await(threadsStarted);
410              assertEquals(THREADS, p.getLargestPoolSize());
411          }
412 +        assertEquals(THREADS, p.getLargestPoolSize());
413      }
414  
415      /**
# Line 379 | Line 420 | public class ScheduledExecutorTest exten
420          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
421          final CountDownLatch threadStarted = new CountDownLatch(1);
422          final CountDownLatch done = new CountDownLatch(1);
423 <        try {
423 >        try (PoolCleaner cleaner = cleaner(p, done)) {
424              assertEquals(0, p.getPoolSize());
425              p.execute(new CheckedRunnable() {
426                  public void realRun() throws InterruptedException {
427                      threadStarted.countDown();
428                      assertEquals(1, p.getPoolSize());
429 <                    done.await();
429 >                    await(done);
430                  }});
431 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
431 >            await(threadStarted);
432              assertEquals(1, p.getPoolSize());
392        } finally {
393            done.countDown();
394            joinPool(p);
433          }
434      }
435  
# Line 400 | Line 438 | public class ScheduledExecutorTest exten
438       * submitted
439       */
440      public void testGetTaskCount() throws InterruptedException {
441 <        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
404 <        final CountDownLatch threadStarted = new CountDownLatch(1);
441 >        final int TASKS = 3;
442          final CountDownLatch done = new CountDownLatch(1);
443 <        final int TASKS = 5;
444 <        try {
443 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
444 >        try (PoolCleaner cleaner = cleaner(p, done)) {
445 >            final CountDownLatch threadStarted = new CountDownLatch(1);
446              assertEquals(0, p.getTaskCount());
447 <            for (int i = 0; i < TASKS; i++)
447 >            assertEquals(0, p.getCompletedTaskCount());
448 >            p.execute(new CheckedRunnable() {
449 >                public void realRun() throws InterruptedException {
450 >                    threadStarted.countDown();
451 >                    await(done);
452 >                }});
453 >            await(threadStarted);
454 >            assertEquals(1, p.getTaskCount());
455 >            assertEquals(0, p.getCompletedTaskCount());
456 >            for (int i = 0; i < TASKS; i++) {
457 >                assertEquals(1 + i, p.getTaskCount());
458                  p.execute(new CheckedRunnable() {
459                      public void realRun() throws InterruptedException {
460                          threadStarted.countDown();
461 <                        done.await();
461 >                        assertEquals(1 + TASKS, p.getTaskCount());
462 >                        await(done);
463                      }});
464 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
465 <            assertEquals(TASKS, p.getTaskCount());
466 <        } finally {
418 <            done.countDown();
419 <            joinPool(p);
464 >            }
465 >            assertEquals(1 + TASKS, p.getTaskCount());
466 >            assertEquals(0, p.getCompletedTaskCount());
467          }
468 +        assertEquals(1 + TASKS, p.getTaskCount());
469 +        assertEquals(1 + TASKS, p.getCompletedTaskCount());
470      }
471  
472      /**
473       * getThreadFactory returns factory in constructor if not set
474       */
475      public void testGetThreadFactory() throws InterruptedException {
476 <        ThreadFactory tf = new SimpleThreadFactory();
477 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, tf);
478 <        assertSame(tf, p.getThreadFactory());
479 <        joinPool(p);
476 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
477 >        final ScheduledThreadPoolExecutor p =
478 >            new ScheduledThreadPoolExecutor(1, threadFactory);
479 >        try (PoolCleaner cleaner = cleaner(p)) {
480 >            assertSame(threadFactory, p.getThreadFactory());
481 >        }
482      }
483  
484      /**
485       * setThreadFactory sets the thread factory returned by getThreadFactory
486       */
487      public void testSetThreadFactory() throws InterruptedException {
488 <        ThreadFactory tf = new SimpleThreadFactory();
489 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
490 <        p.setThreadFactory(tf);
491 <        assertSame(tf, p.getThreadFactory());
492 <        joinPool(p);
488 >        ThreadFactory threadFactory = new SimpleThreadFactory();
489 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
490 >        try (PoolCleaner cleaner = cleaner(p)) {
491 >            p.setThreadFactory(threadFactory);
492 >            assertSame(threadFactory, p.getThreadFactory());
493 >        }
494      }
495  
496      /**
497       * setThreadFactory(null) throws NPE
498       */
499      public void testSetThreadFactoryNull() throws InterruptedException {
500 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
501 <        try {
502 <            p.setThreadFactory(null);
503 <            shouldThrow();
504 <        } catch (NullPointerException success) {
505 <        } finally {
454 <            joinPool(p);
500 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
501 >        try (PoolCleaner cleaner = cleaner(p)) {
502 >            try {
503 >                p.setThreadFactory(null);
504 >                shouldThrow();
505 >            } catch (NullPointerException success) {}
506          }
507      }
508  
# Line 460 | Line 511 | public class ScheduledExecutorTest exten
511       */
512      public void testIsShutdown() {
513  
514 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
514 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
515          try {
516              assertFalse(p.isShutdown());
517          }
# Line 475 | Line 526 | public class ScheduledExecutorTest exten
526       */
527      public void testIsTerminated() throws InterruptedException {
528          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
529 <        final CountDownLatch threadStarted = new CountDownLatch(1);
530 <        final CountDownLatch done = new CountDownLatch(1);
531 <        assertFalse(p.isTerminated());
532 <        try {
529 >        try (PoolCleaner cleaner = cleaner(p)) {
530 >            final CountDownLatch threadStarted = new CountDownLatch(1);
531 >            final CountDownLatch done = new CountDownLatch(1);
532 >            assertFalse(p.isTerminated());
533              p.execute(new CheckedRunnable() {
534                  public void realRun() throws InterruptedException {
535                      assertFalse(p.isTerminated());
536                      threadStarted.countDown();
537 <                    done.await();
537 >                    await(done);
538                  }});
539 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
539 >            await(threadStarted);
540              assertFalse(p.isTerminating());
541              done.countDown();
491        } finally {
542              try { p.shutdown(); } catch (SecurityException ok) { return; }
543 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
544 +            assertTrue(p.isTerminated());
545          }
494        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
495        assertTrue(p.isTerminated());
546      }
547  
548      /**
# Line 502 | Line 552 | public class ScheduledExecutorTest exten
552          final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
553          final CountDownLatch threadStarted = new CountDownLatch(1);
554          final CountDownLatch done = new CountDownLatch(1);
555 <        try {
555 >        try (PoolCleaner cleaner = cleaner(p)) {
556              assertFalse(p.isTerminating());
557              p.execute(new CheckedRunnable() {
558                  public void realRun() throws InterruptedException {
559                      assertFalse(p.isTerminating());
560                      threadStarted.countDown();
561 <                    done.await();
561 >                    await(done);
562                  }});
563 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
563 >            await(threadStarted);
564              assertFalse(p.isTerminating());
565              done.countDown();
516        } finally {
566              try { p.shutdown(); } catch (SecurityException ok) { return; }
567 +            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
568 +            assertTrue(p.isTerminated());
569 +            assertFalse(p.isTerminating());
570          }
519        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
520        assertTrue(p.isTerminated());
521        assertFalse(p.isTerminating());
571      }
572  
573      /**
574       * getQueue returns the work queue, which contains queued tasks
575       */
576      public void testGetQueue() throws InterruptedException {
528        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
529        final CountDownLatch threadStarted = new CountDownLatch(1);
577          final CountDownLatch done = new CountDownLatch(1);
578 <        try {
578 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
579 >        try (PoolCleaner cleaner = cleaner(p, done)) {
580 >            final CountDownLatch threadStarted = new CountDownLatch(1);
581              ScheduledFuture[] tasks = new ScheduledFuture[5];
582              for (int i = 0; i < tasks.length; i++) {
583                  Runnable r = new CheckedRunnable() {
584                      public void realRun() throws InterruptedException {
585                          threadStarted.countDown();
586 <                        done.await();
586 >                        await(done);
587                      }};
588                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
589              }
590 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
590 >            await(threadStarted);
591              BlockingQueue<Runnable> q = p.getQueue();
592              assertTrue(q.contains(tasks[tasks.length - 1]));
593              assertFalse(q.contains(tasks[0]));
545        } finally {
546            done.countDown();
547            joinPool(p);
594          }
595      }
596  
# Line 552 | Line 598 | public class ScheduledExecutorTest exten
598       * remove(task) removes queued task, and fails to remove active task
599       */
600      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);
601          final CountDownLatch done = new CountDownLatch(1);
602 <        try {
602 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
603 >        try (PoolCleaner cleaner = cleaner(p, done)) {
604 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
605 >            final CountDownLatch threadStarted = new CountDownLatch(1);
606              for (int i = 0; i < tasks.length; i++) {
607                  Runnable r = new CheckedRunnable() {
608                      public void realRun() throws InterruptedException {
609                          threadStarted.countDown();
610 <                        done.await();
610 >                        await(done);
611                      }};
612                  tasks[i] = p.schedule(r, 1, MILLISECONDS);
613              }
614 <            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
614 >            await(threadStarted);
615              BlockingQueue<Runnable> q = p.getQueue();
616              assertFalse(p.remove((Runnable)tasks[0]));
617              assertTrue(q.contains((Runnable)tasks[4]));
# Line 576 | Line 622 | public class ScheduledExecutorTest exten
622              assertTrue(q.contains((Runnable)tasks[3]));
623              assertTrue(p.remove((Runnable)tasks[3]));
624              assertFalse(q.contains((Runnable)tasks[3]));
579        } finally {
580            done.countDown();
581            joinPool(p);
625          }
626      }
627  
# Line 586 | Line 629 | public class ScheduledExecutorTest exten
629       * purge eventually removes cancelled tasks from the queue
630       */
631      public void testPurge() throws InterruptedException {
632 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
633 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
634 <        for (int i = 0; i < tasks.length; i++)
635 <            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
636 <                                  LONG_DELAY_MS, MILLISECONDS);
637 <        try {
632 >        final ScheduledFuture[] tasks = new ScheduledFuture[5];
633 >        final Runnable releaser = new Runnable() { public void run() {
634 >            for (ScheduledFuture task : tasks)
635 >                if (task != null) task.cancel(true); }};
636 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
637 >        try (PoolCleaner cleaner = cleaner(p, releaser)) {
638 >            for (int i = 0; i < tasks.length; i++)
639 >                tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
640 >                                      LONG_DELAY_MS, MILLISECONDS);
641              int max = tasks.length;
642              if (tasks[4].cancel(true)) --max;
643              if (tasks[3].cancel(true)) --max;
# Line 603 | Line 649 | public class ScheduledExecutorTest exten
649                  long count = p.getTaskCount();
650                  if (count == max)
651                      return;
652 <            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
652 >            } while (millisElapsedSince(startTime) < LONG_DELAY_MS);
653              fail("Purge failed to remove cancelled tasks");
608        } finally {
609            for (ScheduledFuture task : tasks)
610                task.cancel(true);
611            joinPool(p);
654          }
655      }
656  
657      /**
658 <     * shutdownNow returns a list containing tasks that were not run
658 >     * shutdownNow returns a list containing tasks that were not run,
659 >     * and those tasks are drained from the queue
660       */
661 <    public void testShutdownNow() {
662 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
663 <        for (int i = 0; i < 5; i++)
664 <            p.schedule(new SmallPossiblyInterruptedRunnable(),
665 <                       LONG_DELAY_MS, MILLISECONDS);
661 >    public void testShutdownNow() throws InterruptedException {
662 >        final int poolSize = 2;
663 >        final int count = 5;
664 >        final AtomicInteger ran = new AtomicInteger(0);
665 >        final ScheduledThreadPoolExecutor p =
666 >            new ScheduledThreadPoolExecutor(poolSize);
667 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
668 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
669 >            threadsStarted.countDown();
670 >            try {
671 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
672 >            } catch (InterruptedException success) {}
673 >            ran.getAndIncrement();
674 >        }};
675 >        for (int i = 0; i < count; i++)
676 >            p.execute(waiter);
677 >        await(threadsStarted);
678 >        assertEquals(poolSize, p.getActiveCount());
679 >        assertEquals(0, p.getCompletedTaskCount());
680 >        final List<Runnable> queuedTasks;
681          try {
682 <            List<Runnable> l = p.shutdownNow();
625 <            assertTrue(p.isShutdown());
626 <            assertEquals(5, l.size());
682 >            queuedTasks = p.shutdownNow();
683          } catch (SecurityException ok) {
684 <            // Allowed in case test doesn't have privs
629 <        } finally {
630 <            joinPool(p);
684 >            return; // Allowed in case test doesn't have privs
685          }
686 +        assertTrue(p.isShutdown());
687 +        assertTrue(p.getQueue().isEmpty());
688 +        assertEquals(count - poolSize, queuedTasks.size());
689 +        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
690 +        assertTrue(p.isTerminated());
691 +        assertEquals(poolSize, ran.get());
692 +        assertEquals(poolSize, p.getCompletedTaskCount());
693      }
694  
695      /**
696 <     * In default setting, shutdown cancels periodic but not delayed
697 <     * tasks at shutdown
696 >     * shutdownNow returns a list containing tasks that were not run,
697 >     * and those tasks are drained from the queue
698       */
699 <    public void testShutdown1() throws InterruptedException {
700 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
701 <        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
702 <        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
703 <
704 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
705 <        for (int i = 0; i < tasks.length; i++)
706 <            tasks[i] = p.schedule(new NoOpRunnable(),
707 <                                  SHORT_DELAY_MS, MILLISECONDS);
708 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
709 <        BlockingQueue<Runnable> q = p.getQueue();
710 <        for (ScheduledFuture task : tasks) {
711 <            assertFalse(task.isDone());
712 <            assertFalse(task.isCancelled());
713 <            assertTrue(q.contains(task));
699 >    public void testShutdownNow_delayedTasks() throws InterruptedException {
700 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
701 >        List<ScheduledFuture> tasks = new ArrayList<>();
702 >        for (int i = 0; i < 3; i++) {
703 >            Runnable r = new NoOpRunnable();
704 >            tasks.add(p.schedule(r, 9, SECONDS));
705 >            tasks.add(p.scheduleAtFixedRate(r, 9, 9, SECONDS));
706 >            tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
707 >        }
708 >        if (testImplementationDetails)
709 >            assertEquals(new HashSet(tasks), new HashSet(p.getQueue()));
710 >        final List<Runnable> queuedTasks;
711 >        try {
712 >            queuedTasks = p.shutdownNow();
713 >        } catch (SecurityException ok) {
714 >            return; // Allowed in case test doesn't have privs
715          }
716          assertTrue(p.isShutdown());
717 <        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
718 <        assertTrue(p.isTerminated());
717 >        assertTrue(p.getQueue().isEmpty());
718 >        if (testImplementationDetails)
719 >            assertEquals(new HashSet(tasks), new HashSet(queuedTasks));
720 >        assertEquals(tasks.size(), queuedTasks.size());
721          for (ScheduledFuture task : tasks) {
722 <            assertTrue(task.isDone());
722 >            assertFalse(task.isDone());
723              assertFalse(task.isCancelled());
724          }
725 <    }
662 <
663 <    /**
664 <     * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
665 <     * delayed tasks are cancelled at shutdown
666 <     */
667 <    public void testShutdown2() throws InterruptedException {
668 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
669 <        p.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
670 <        assertFalse(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
671 <        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
672 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
673 <        for (int i = 0; i < tasks.length; i++)
674 <            tasks[i] = p.schedule(new NoOpRunnable(),
675 <                                  SHORT_DELAY_MS, MILLISECONDS);
676 <        BlockingQueue q = p.getQueue();
677 <        assertEquals(tasks.length, q.size());
678 <        try { p.shutdown(); } catch (SecurityException ok) { return; }
679 <        assertTrue(p.isShutdown());
680 <        assertTrue(q.isEmpty());
681 <        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
725 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
726          assertTrue(p.isTerminated());
683        for (ScheduledFuture task : tasks) {
684            assertTrue(task.isDone());
685            assertTrue(task.isCancelled());
686        }
727      }
728  
729      /**
730 <     * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
731 <     * periodic tasks are cancelled at shutdown
732 <     */
733 <    public void testShutdown3() throws InterruptedException {
734 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
735 <        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
736 <        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
737 <        p.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
738 <        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
739 <        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
740 <        long initialDelay = LONG_DELAY_MS;
741 <        ScheduledFuture task =
742 <            p.scheduleAtFixedRate(new NoOpRunnable(), initialDelay,
743 <                                  5, MILLISECONDS);
730 >     * By default, periodic tasks are cancelled at shutdown.
731 >     * By default, delayed tasks keep running after shutdown.
732 >     * Check that changing the default values work:
733 >     * - setExecuteExistingDelayedTasksAfterShutdownPolicy
734 >     * - setContinueExistingPeriodicTasksAfterShutdownPolicy
735 >     */
736 >    public void testShutdown_cancellation() throws Exception {
737 >        Boolean[] allBooleans = { null, Boolean.FALSE, Boolean.TRUE };
738 >        for (Boolean policy : allBooleans)
739 >    {
740 >        final int poolSize = 2;
741 >        final ScheduledThreadPoolExecutor p
742 >            = new ScheduledThreadPoolExecutor(poolSize);
743 >        final boolean effectiveDelayedPolicy = (policy != Boolean.FALSE);
744 >        final boolean effectivePeriodicPolicy = (policy == Boolean.TRUE);
745 >        final boolean effectiveRemovePolicy = (policy == Boolean.TRUE);
746 >        if (policy != null) {
747 >            p.setExecuteExistingDelayedTasksAfterShutdownPolicy(policy);
748 >            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(policy);
749 >            p.setRemoveOnCancelPolicy(policy);
750 >        }
751 >        assertEquals(effectiveDelayedPolicy,
752 >                     p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
753 >        assertEquals(effectivePeriodicPolicy,
754 >                     p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
755 >        assertEquals(effectiveRemovePolicy,
756 >                     p.getRemoveOnCancelPolicy());
757 >        // Strategy: Wedge the pool with poolSize "blocker" threads
758 >        final AtomicInteger ran = new AtomicInteger(0);
759 >        final CountDownLatch poolBlocked = new CountDownLatch(poolSize);
760 >        final CountDownLatch unblock = new CountDownLatch(1);
761 >        final CountDownLatch periodicLatch1 = new CountDownLatch(2);
762 >        final CountDownLatch periodicLatch2 = new CountDownLatch(2);
763 >        Runnable task = new CheckedRunnable() { public void realRun()
764 >                                                    throws InterruptedException {
765 >            poolBlocked.countDown();
766 >            assertTrue(unblock.await(LONG_DELAY_MS, MILLISECONDS));
767 >            ran.getAndIncrement();
768 >        }};
769 >        List<Future<?>> blockers = new ArrayList<>();
770 >        List<Future<?>> periodics = new ArrayList<>();
771 >        List<Future<?>> delayeds = new ArrayList<>();
772 >        for (int i = 0; i < poolSize; i++)
773 >            blockers.add(p.submit(task));
774 >        assertTrue(poolBlocked.await(LONG_DELAY_MS, MILLISECONDS));
775 >
776 >        periodics.add(p.scheduleAtFixedRate(countDowner(periodicLatch1),
777 >                                            1, 1, MILLISECONDS));
778 >        periodics.add(p.scheduleWithFixedDelay(countDowner(periodicLatch2),
779 >                                               1, 1, MILLISECONDS));
780 >        delayeds.add(p.schedule(task, 1, MILLISECONDS));
781 >
782 >        assertTrue(p.getQueue().containsAll(periodics));
783 >        assertTrue(p.getQueue().containsAll(delayeds));
784          try { p.shutdown(); } catch (SecurityException ok) { return; }
785          assertTrue(p.isShutdown());
786 <        assertTrue(p.getQueue().isEmpty());
787 <        assertTrue(task.isDone());
788 <        assertTrue(task.isCancelled());
789 <        joinPool(p);
790 <    }
791 <
792 <    /**
793 <     * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
794 <     * periodic tasks are not cancelled at shutdown
795 <     */
796 <    public void testShutdown4() throws InterruptedException {
797 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
798 <        final CountDownLatch counter = new CountDownLatch(2);
799 <        try {
800 <            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
801 <            assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
802 <            assertTrue(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
803 <            final Runnable r = new CheckedRunnable() {
804 <                public void realRun() {
805 <                    counter.countDown();
806 <                }};
807 <            ScheduledFuture task =
728 <                p.scheduleAtFixedRate(r, 1, 1, MILLISECONDS);
729 <            assertFalse(task.isDone());
730 <            assertFalse(task.isCancelled());
731 <            try { p.shutdown(); } catch (SecurityException ok) { return; }
732 <            assertFalse(task.isCancelled());
733 <            assertFalse(p.isTerminated());
734 <            assertTrue(p.isShutdown());
735 <            assertTrue(counter.await(SMALL_DELAY_MS, MILLISECONDS));
736 <            assertFalse(task.isCancelled());
737 <            assertTrue(task.cancel(false));
738 <            assertTrue(task.isDone());
739 <            assertTrue(task.isCancelled());
740 <            assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
741 <            assertTrue(p.isTerminated());
786 >        assertFalse(p.isTerminated());
787 >        for (Future<?> periodic : periodics) {
788 >            assertTrue(effectivePeriodicPolicy ^ periodic.isCancelled());
789 >            assertTrue(effectivePeriodicPolicy ^ periodic.isDone());
790 >        }
791 >        for (Future<?> delayed : delayeds) {
792 >            assertTrue(effectiveDelayedPolicy ^ delayed.isCancelled());
793 >            assertTrue(effectiveDelayedPolicy ^ delayed.isDone());
794 >        }
795 >        if (testImplementationDetails) {
796 >            assertEquals(effectivePeriodicPolicy,
797 >                         p.getQueue().containsAll(periodics));
798 >            assertEquals(effectiveDelayedPolicy,
799 >                         p.getQueue().containsAll(delayeds));
800 >        }
801 >        // Release all pool threads
802 >        unblock.countDown();
803 >
804 >        for (Future<?> delayed : delayeds) {
805 >            if (effectiveDelayedPolicy) {
806 >                assertNull(delayed.get());
807 >            }
808          }
809 <        finally {
810 <            joinPool(p);
809 >        if (effectivePeriodicPolicy) {
810 >            assertTrue(periodicLatch1.await(LONG_DELAY_MS, MILLISECONDS));
811 >            assertTrue(periodicLatch2.await(LONG_DELAY_MS, MILLISECONDS));
812 >            for (Future<?> periodic : periodics) {
813 >                assertTrue(periodic.cancel(false));
814 >                assertTrue(periodic.isCancelled());
815 >                assertTrue(periodic.isDone());
816 >            }
817          }
818 <    }
818 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
819 >        assertTrue(p.isTerminated());
820 >        assertEquals(2 + (effectiveDelayedPolicy ? 1 : 0), ran.get());
821 >    }}
822  
823      /**
824       * completed submit of callable returns result
825       */
826      public void testSubmitCallable() throws Exception {
827 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
828 <        try {
827 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
828 >        try (PoolCleaner cleaner = cleaner(e)) {
829              Future<String> future = e.submit(new StringTask());
830              String result = future.get();
831              assertSame(TEST_STRING, result);
757        } finally {
758            joinPool(e);
832          }
833      }
834  
# Line 763 | Line 836 | public class ScheduledExecutorTest exten
836       * completed submit of runnable returns successfully
837       */
838      public void testSubmitRunnable() throws Exception {
839 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
840 <        try {
839 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
840 >        try (PoolCleaner cleaner = cleaner(e)) {
841              Future<?> future = e.submit(new NoOpRunnable());
842              future.get();
843              assertTrue(future.isDone());
771        } finally {
772            joinPool(e);
844          }
845      }
846  
# Line 777 | Line 848 | public class ScheduledExecutorTest exten
848       * completed submit of (runnable, result) returns result
849       */
850      public void testSubmitRunnable2() throws Exception {
851 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
852 <        try {
851 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
852 >        try (PoolCleaner cleaner = cleaner(e)) {
853              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
854              String result = future.get();
855              assertSame(TEST_STRING, result);
785        } finally {
786            joinPool(e);
856          }
857      }
858  
# Line 791 | Line 860 | public class ScheduledExecutorTest exten
860       * invokeAny(null) throws NPE
861       */
862      public void testInvokeAny1() throws Exception {
863 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
864 <        try {
865 <            e.invokeAny(null);
866 <            shouldThrow();
867 <        } catch (NullPointerException success) {
868 <        } finally {
800 <            joinPool(e);
863 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
864 >        try (PoolCleaner cleaner = cleaner(e)) {
865 >            try {
866 >                e.invokeAny(null);
867 >                shouldThrow();
868 >            } catch (NullPointerException success) {}
869          }
870      }
871  
# Line 805 | Line 873 | public class ScheduledExecutorTest exten
873       * invokeAny(empty collection) throws IAE
874       */
875      public void testInvokeAny2() throws Exception {
876 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
877 <        try {
878 <            e.invokeAny(new ArrayList<Callable<String>>());
879 <            shouldThrow();
880 <        } catch (IllegalArgumentException success) {
881 <        } finally {
814 <            joinPool(e);
876 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
877 >        try (PoolCleaner cleaner = cleaner(e)) {
878 >            try {
879 >                e.invokeAny(new ArrayList<Callable<String>>());
880 >                shouldThrow();
881 >            } catch (IllegalArgumentException success) {}
882          }
883      }
884  
# Line 820 | Line 887 | public class ScheduledExecutorTest exten
887       */
888      public void testInvokeAny3() throws Exception {
889          CountDownLatch latch = new CountDownLatch(1);
890 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
891 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
892 <        l.add(latchAwaitingStringTask(latch));
893 <        l.add(null);
894 <        try {
895 <            e.invokeAny(l);
896 <            shouldThrow();
897 <        } catch (NullPointerException success) {
898 <        } finally {
890 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
891 >        try (PoolCleaner cleaner = cleaner(e)) {
892 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
893 >            l.add(latchAwaitingStringTask(latch));
894 >            l.add(null);
895 >            try {
896 >                e.invokeAny(l);
897 >                shouldThrow();
898 >            } catch (NullPointerException success) {}
899              latch.countDown();
833            joinPool(e);
900          }
901      }
902  
# Line 838 | Line 904 | public class ScheduledExecutorTest exten
904       * invokeAny(c) throws ExecutionException if no task completes
905       */
906      public void testInvokeAny4() throws Exception {
907 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
908 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
909 <        l.add(new NPETask());
910 <        try {
911 <            e.invokeAny(l);
912 <            shouldThrow();
913 <        } catch (ExecutionException success) {
914 <            assertTrue(success.getCause() instanceof NullPointerException);
915 <        } finally {
916 <            joinPool(e);
907 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
908 >        try (PoolCleaner cleaner = cleaner(e)) {
909 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
910 >            l.add(new NPETask());
911 >            try {
912 >                e.invokeAny(l);
913 >                shouldThrow();
914 >            } catch (ExecutionException success) {
915 >                assertTrue(success.getCause() instanceof NullPointerException);
916 >            }
917          }
918      }
919  
# Line 855 | Line 921 | public class ScheduledExecutorTest exten
921       * invokeAny(c) returns result of some task
922       */
923      public void testInvokeAny5() throws Exception {
924 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
925 <        try {
924 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
925 >        try (PoolCleaner cleaner = cleaner(e)) {
926              List<Callable<String>> l = new ArrayList<Callable<String>>();
927              l.add(new StringTask());
928              l.add(new StringTask());
929              String result = e.invokeAny(l);
930              assertSame(TEST_STRING, result);
865        } finally {
866            joinPool(e);
931          }
932      }
933  
# Line 871 | Line 935 | public class ScheduledExecutorTest exten
935       * invokeAll(null) throws NPE
936       */
937      public void testInvokeAll1() throws Exception {
938 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
939 <        try {
940 <            e.invokeAll(null);
941 <            shouldThrow();
942 <        } catch (NullPointerException success) {
943 <        } finally {
880 <            joinPool(e);
938 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
939 >        try (PoolCleaner cleaner = cleaner(e)) {
940 >            try {
941 >                e.invokeAll(null);
942 >                shouldThrow();
943 >            } catch (NullPointerException success) {}
944          }
945      }
946  
# Line 885 | Line 948 | public class ScheduledExecutorTest exten
948       * invokeAll(empty collection) returns empty collection
949       */
950      public void testInvokeAll2() throws Exception {
951 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
952 <        try {
951 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
952 >        try (PoolCleaner cleaner = cleaner(e)) {
953              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
954              assertTrue(r.isEmpty());
892        } finally {
893            joinPool(e);
955          }
956      }
957  
# Line 898 | Line 959 | public class ScheduledExecutorTest exten
959       * invokeAll(c) throws NPE if c has null elements
960       */
961      public void testInvokeAll3() throws Exception {
962 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
963 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
964 <        l.add(new StringTask());
965 <        l.add(null);
966 <        try {
967 <            e.invokeAll(l);
968 <            shouldThrow();
969 <        } catch (NullPointerException success) {
970 <        } finally {
910 <            joinPool(e);
962 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
963 >        try (PoolCleaner cleaner = cleaner(e)) {
964 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
965 >            l.add(new StringTask());
966 >            l.add(null);
967 >            try {
968 >                e.invokeAll(l);
969 >                shouldThrow();
970 >            } catch (NullPointerException success) {}
971          }
972      }
973  
# Line 915 | Line 975 | public class ScheduledExecutorTest exten
975       * get of invokeAll(c) throws exception on failed task
976       */
977      public void testInvokeAll4() throws Exception {
978 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
979 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
980 <        l.add(new NPETask());
981 <        List<Future<String>> futures = e.invokeAll(l);
982 <        assertEquals(1, futures.size());
983 <        try {
984 <            futures.get(0).get();
985 <            shouldThrow();
986 <        } catch (ExecutionException success) {
987 <            assertTrue(success.getCause() instanceof NullPointerException);
988 <        } finally {
989 <            joinPool(e);
978 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
979 >        try (PoolCleaner cleaner = cleaner(e)) {
980 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
981 >            l.add(new NPETask());
982 >            List<Future<String>> futures = e.invokeAll(l);
983 >            assertEquals(1, futures.size());
984 >            try {
985 >                futures.get(0).get();
986 >                shouldThrow();
987 >            } catch (ExecutionException success) {
988 >                assertTrue(success.getCause() instanceof NullPointerException);
989 >            }
990          }
991      }
992  
# Line 934 | Line 994 | public class ScheduledExecutorTest exten
994       * invokeAll(c) returns results of all completed tasks
995       */
996      public void testInvokeAll5() throws Exception {
997 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
998 <        try {
997 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
998 >        try (PoolCleaner cleaner = cleaner(e)) {
999              List<Callable<String>> l = new ArrayList<Callable<String>>();
1000              l.add(new StringTask());
1001              l.add(new StringTask());
# Line 943 | Line 1003 | public class ScheduledExecutorTest exten
1003              assertEquals(2, futures.size());
1004              for (Future<String> future : futures)
1005                  assertSame(TEST_STRING, future.get());
946        } finally {
947            joinPool(e);
1006          }
1007      }
1008  
# Line 952 | Line 1010 | public class ScheduledExecutorTest exten
1010       * timed invokeAny(null) throws NPE
1011       */
1012      public void testTimedInvokeAny1() throws Exception {
1013 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1014 <        try {
1015 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1016 <            shouldThrow();
1017 <        } catch (NullPointerException success) {
1018 <        } finally {
961 <            joinPool(e);
1013 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1014 >        try (PoolCleaner cleaner = cleaner(e)) {
1015 >            try {
1016 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1017 >                shouldThrow();
1018 >            } catch (NullPointerException success) {}
1019          }
1020      }
1021  
# Line 966 | Line 1023 | public class ScheduledExecutorTest exten
1023       * timed invokeAny(,,null) throws NPE
1024       */
1025      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1026 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1027 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1028 <        l.add(new StringTask());
1029 <        try {
1030 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1031 <            shouldThrow();
1032 <        } catch (NullPointerException success) {
1033 <        } finally {
977 <            joinPool(e);
1026 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1027 >        try (PoolCleaner cleaner = cleaner(e)) {
1028 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1029 >            l.add(new StringTask());
1030 >            try {
1031 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1032 >                shouldThrow();
1033 >            } catch (NullPointerException success) {}
1034          }
1035      }
1036  
# Line 982 | Line 1038 | public class ScheduledExecutorTest exten
1038       * timed invokeAny(empty collection) throws IAE
1039       */
1040      public void testTimedInvokeAny2() throws Exception {
1041 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1042 <        try {
1043 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1044 <            shouldThrow();
1045 <        } catch (IllegalArgumentException success) {
1046 <        } finally {
991 <            joinPool(e);
1041 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1042 >        try (PoolCleaner cleaner = cleaner(e)) {
1043 >            try {
1044 >                e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1045 >                shouldThrow();
1046 >            } catch (IllegalArgumentException success) {}
1047          }
1048      }
1049  
# Line 997 | Line 1052 | public class ScheduledExecutorTest exten
1052       */
1053      public void testTimedInvokeAny3() throws Exception {
1054          CountDownLatch latch = new CountDownLatch(1);
1055 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1056 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1057 <        l.add(latchAwaitingStringTask(latch));
1058 <        l.add(null);
1059 <        try {
1060 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1061 <            shouldThrow();
1062 <        } catch (NullPointerException success) {
1063 <        } finally {
1055 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1056 >        try (PoolCleaner cleaner = cleaner(e)) {
1057 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1058 >            l.add(latchAwaitingStringTask(latch));
1059 >            l.add(null);
1060 >            try {
1061 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1062 >                shouldThrow();
1063 >            } catch (NullPointerException success) {}
1064              latch.countDown();
1010            joinPool(e);
1065          }
1066      }
1067  
# Line 1015 | Line 1069 | public class ScheduledExecutorTest exten
1069       * timed invokeAny(c) throws ExecutionException if no task completes
1070       */
1071      public void testTimedInvokeAny4() throws Exception {
1072 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1073 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1074 <        l.add(new NPETask());
1075 <        try {
1076 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1077 <            shouldThrow();
1078 <        } catch (ExecutionException success) {
1079 <            assertTrue(success.getCause() instanceof NullPointerException);
1080 <        } finally {
1081 <            joinPool(e);
1072 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1073 >        try (PoolCleaner cleaner = cleaner(e)) {
1074 >            long startTime = System.nanoTime();
1075 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1076 >            l.add(new NPETask());
1077 >            try {
1078 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1079 >                shouldThrow();
1080 >            } catch (ExecutionException success) {
1081 >                assertTrue(success.getCause() instanceof NullPointerException);
1082 >            }
1083 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1084          }
1085      }
1086  
# Line 1032 | Line 1088 | public class ScheduledExecutorTest exten
1088       * timed invokeAny(c) returns result of some task
1089       */
1090      public void testTimedInvokeAny5() throws Exception {
1091 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1092 <        try {
1091 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1092 >        try (PoolCleaner cleaner = cleaner(e)) {
1093 >            long startTime = System.nanoTime();
1094              List<Callable<String>> l = new ArrayList<Callable<String>>();
1095              l.add(new StringTask());
1096              l.add(new StringTask());
1097 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1097 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1098              assertSame(TEST_STRING, result);
1099 <        } finally {
1043 <            joinPool(e);
1099 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1100          }
1101      }
1102  
# Line 1048 | Line 1104 | public class ScheduledExecutorTest exten
1104       * timed invokeAll(null) throws NPE
1105       */
1106      public void testTimedInvokeAll1() throws Exception {
1107 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1108 <        try {
1109 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1110 <            shouldThrow();
1111 <        } catch (NullPointerException success) {
1112 <        } finally {
1057 <            joinPool(e);
1107 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1108 >        try (PoolCleaner cleaner = cleaner(e)) {
1109 >            try {
1110 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1111 >                shouldThrow();
1112 >            } catch (NullPointerException success) {}
1113          }
1114      }
1115  
# Line 1062 | Line 1117 | public class ScheduledExecutorTest exten
1117       * timed invokeAll(,,null) throws NPE
1118       */
1119      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1120 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1121 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1122 <        l.add(new StringTask());
1123 <        try {
1124 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1125 <            shouldThrow();
1126 <        } catch (NullPointerException success) {
1127 <        } finally {
1073 <            joinPool(e);
1120 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1121 >        try (PoolCleaner cleaner = cleaner(e)) {
1122 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1123 >            l.add(new StringTask());
1124 >            try {
1125 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1126 >                shouldThrow();
1127 >            } catch (NullPointerException success) {}
1128          }
1129      }
1130  
# Line 1078 | Line 1132 | public class ScheduledExecutorTest exten
1132       * timed invokeAll(empty collection) returns empty collection
1133       */
1134      public void testTimedInvokeAll2() throws Exception {
1135 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1136 <        try {
1137 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1135 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1136 >        try (PoolCleaner cleaner = cleaner(e)) {
1137 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1138 >                                                 MEDIUM_DELAY_MS, MILLISECONDS);
1139              assertTrue(r.isEmpty());
1085        } finally {
1086            joinPool(e);
1140          }
1141      }
1142  
# Line 1091 | Line 1144 | public class ScheduledExecutorTest exten
1144       * timed invokeAll(c) throws NPE if c has null elements
1145       */
1146      public void testTimedInvokeAll3() throws Exception {
1147 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1148 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1149 <        l.add(new StringTask());
1150 <        l.add(null);
1151 <        try {
1152 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1153 <            shouldThrow();
1154 <        } catch (NullPointerException success) {
1155 <        } finally {
1103 <            joinPool(e);
1147 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1148 >        try (PoolCleaner cleaner = cleaner(e)) {
1149 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1150 >            l.add(new StringTask());
1151 >            l.add(null);
1152 >            try {
1153 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1154 >                shouldThrow();
1155 >            } catch (NullPointerException success) {}
1156          }
1157      }
1158  
# Line 1108 | Line 1160 | public class ScheduledExecutorTest exten
1160       * get of element of invokeAll(c) throws exception on failed task
1161       */
1162      public void testTimedInvokeAll4() throws Exception {
1163 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1164 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
1165 <        l.add(new NPETask());
1166 <        List<Future<String>> futures =
1167 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1168 <        assertEquals(1, futures.size());
1169 <        try {
1170 <            futures.get(0).get();
1171 <            shouldThrow();
1172 <        } catch (ExecutionException success) {
1173 <            assertTrue(success.getCause() instanceof NullPointerException);
1174 <        } finally {
1175 <            joinPool(e);
1163 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1164 >        try (PoolCleaner cleaner = cleaner(e)) {
1165 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1166 >            l.add(new NPETask());
1167 >            List<Future<String>> futures =
1168 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1169 >            assertEquals(1, futures.size());
1170 >            try {
1171 >                futures.get(0).get();
1172 >                shouldThrow();
1173 >            } catch (ExecutionException success) {
1174 >                assertTrue(success.getCause() instanceof NullPointerException);
1175 >            }
1176          }
1177      }
1178  
# Line 1128 | Line 1180 | public class ScheduledExecutorTest exten
1180       * timed invokeAll(c) returns results of all completed tasks
1181       */
1182      public void testTimedInvokeAll5() throws Exception {
1183 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1184 <        try {
1183 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1184 >        try (PoolCleaner cleaner = cleaner(e)) {
1185              List<Callable<String>> l = new ArrayList<Callable<String>>();
1186              l.add(new StringTask());
1187              l.add(new StringTask());
1188              List<Future<String>> futures =
1189 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1189 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1190              assertEquals(2, futures.size());
1191              for (Future<String> future : futures)
1192                  assertSame(TEST_STRING, future.get());
1141        } finally {
1142            joinPool(e);
1193          }
1194      }
1195  
# Line 1147 | Line 1197 | public class ScheduledExecutorTest exten
1197       * timed invokeAll(c) cancels tasks not completed by timeout
1198       */
1199      public void testTimedInvokeAll6() throws Exception {
1200 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1201 <        try {
1202 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1203 <            l.add(new StringTask());
1204 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1205 <            l.add(new StringTask());
1206 <            List<Future<String>> futures =
1207 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1208 <            assertEquals(3, futures.size());
1209 <            Iterator<Future<String>> it = futures.iterator();
1210 <            Future<String> f1 = it.next();
1211 <            Future<String> f2 = it.next();
1212 <            Future<String> f3 = it.next();
1213 <            assertTrue(f1.isDone());
1214 <            assertTrue(f2.isDone());
1215 <            assertTrue(f3.isDone());
1216 <            assertFalse(f1.isCancelled());
1217 <            assertTrue(f2.isCancelled());
1218 <        } finally {
1219 <            joinPool(e);
1200 >        for (long timeout = timeoutMillis();;) {
1201 >            final CountDownLatch done = new CountDownLatch(1);
1202 >            final Callable<String> waiter = new CheckedCallable<String>() {
1203 >                public String realCall() {
1204 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1205 >                    catch (InterruptedException ok) {}
1206 >                    return "1"; }};
1207 >            final ExecutorService p = new ScheduledThreadPoolExecutor(2);
1208 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1209 >                List<Callable<String>> tasks = new ArrayList<>();
1210 >                tasks.add(new StringTask("0"));
1211 >                tasks.add(waiter);
1212 >                tasks.add(new StringTask("2"));
1213 >                long startTime = System.nanoTime();
1214 >                List<Future<String>> futures =
1215 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1216 >                assertEquals(tasks.size(), futures.size());
1217 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1218 >                for (Future future : futures)
1219 >                    assertTrue(future.isDone());
1220 >                assertTrue(futures.get(1).isCancelled());
1221 >                try {
1222 >                    assertEquals("0", futures.get(0).get());
1223 >                    assertEquals("2", futures.get(2).get());
1224 >                    break;
1225 >                } catch (CancellationException retryWithLongerTimeout) {
1226 >                    timeout *= 2;
1227 >                    if (timeout >= LONG_DELAY_MS / 2)
1228 >                        fail("expected exactly one task to be cancelled");
1229 >                }
1230 >            }
1231 >        }
1232 >    }
1233 >
1234 >    /**
1235 >     * A fixed delay task with overflowing period should not prevent a
1236 >     * one-shot task from executing.
1237 >     * https://bugs.openjdk.java.net/browse/JDK-8051859
1238 >     */
1239 >    public void testScheduleWithFixedDelay_overflow() throws Exception {
1240 >        final CountDownLatch delayedDone = new CountDownLatch(1);
1241 >        final CountDownLatch immediateDone = new CountDownLatch(1);
1242 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
1243 >        try (PoolCleaner cleaner = cleaner(p)) {
1244 >            final Runnable immediate = new Runnable() { public void run() {
1245 >                immediateDone.countDown();
1246 >            }};
1247 >            final Runnable delayed = new Runnable() { public void run() {
1248 >                delayedDone.countDown();
1249 >                p.submit(immediate);
1250 >            }};
1251 >            p.scheduleWithFixedDelay(delayed, 0L, Long.MAX_VALUE, SECONDS);
1252 >            await(delayedDone);
1253 >            await(immediateDone);
1254          }
1255      }
1256  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines