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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines