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.26 by jsr166, Sat Nov 21 02:07:27 2009 UTC vs.
Revision 1.62 by jsr166, Sun Oct 4 08:07:31 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
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 <        TrackedShortRunnable runnable =new TrackedShortRunnable();
46 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
47 <        p1.execute(runnable);
48 <        assertFalse(runnable.done);
49 <        Thread.sleep(SHORT_DELAY_MS);
50 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
51 <        Thread.sleep(MEDIUM_DELAY_MS);
52 <        assertTrue(runnable.done);
36 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
37 <        joinPool(p1);
45 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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));
52 >        }
53      }
54  
40
55      /**
56       * delayed schedule of callable successfully executes after delay
57       */
58      public void testSchedule1() throws Exception {
59 <        TrackedCallable callable = new TrackedCallable();
60 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
61 <        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
62 <        assertFalse(callable.done);
63 <        Thread.sleep(MEDIUM_DELAY_MS);
64 <        assertTrue(callable.done);
65 <        assertEquals(Boolean.TRUE, f.get());
66 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
67 <        joinPool(p1);
59 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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(millisElapsedSince(startTime) >= timeoutMillis());
67 >                    return Boolean.TRUE;
68 >                }};
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));
73 >        }
74      }
75  
76      /**
77 <     *  delayed schedule of runnable successfully executes after delay
78 <     */
79 <    public void testSchedule3() throws InterruptedException {
80 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
81 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
82 <        p1.schedule(runnable, SMALL_DELAY_MS, MILLISECONDS);
83 <        Thread.sleep(SHORT_DELAY_MS);
84 <        assertFalse(runnable.done);
85 <        Thread.sleep(MEDIUM_DELAY_MS);
86 <        assertTrue(runnable.done);
87 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
88 <        joinPool(p1);
77 >     * delayed schedule of runnable successfully executes after delay
78 >     */
79 >    public void testSchedule3() throws Exception {
80 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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(millisElapsedSince(startTime) >= timeoutMillis());
88 >                }};
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  
96      /**
97       * scheduleAtFixedRate executes runnable after given initial delay
98       */
99 <    public void testSchedule4() throws InterruptedException {
100 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
101 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
102 <        ScheduledFuture h = p1.scheduleAtFixedRate(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, MILLISECONDS);
103 <        assertFalse(runnable.done);
104 <        Thread.sleep(MEDIUM_DELAY_MS);
105 <        assertTrue(runnable.done);
106 <        h.cancel(true);
107 <        joinPool(p1);
108 <    }
109 <
110 <    static class RunnableCounter implements Runnable {
111 <        AtomicInteger count = new AtomicInteger(0);
112 <        public void run() { count.getAndIncrement(); }
99 >    public void testSchedule4() throws Exception {
100 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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(millisElapsedSince(startTime) >= timeoutMillis());
108 >                }};
109 >            ScheduledFuture f =
110 >                p.scheduleAtFixedRate(task, timeoutMillis(),
111 >                                      LONG_DELAY_MS, MILLISECONDS);
112 >            await(done);
113 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
114 >            f.cancel(true);
115 >        }
116      }
117  
118      /**
119       * scheduleWithFixedDelay executes runnable after given initial delay
120       */
121 <    public void testSchedule5() throws InterruptedException {
122 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
123 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
124 <        ScheduledFuture h = p1.scheduleWithFixedDelay(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, MILLISECONDS);
125 <        assertFalse(runnable.done);
126 <        Thread.sleep(MEDIUM_DELAY_MS);
127 <        assertTrue(runnable.done);
128 <        h.cancel(true);
129 <        joinPool(p1);
121 >    public void testSchedule5() throws Exception {
122 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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(millisElapsedSince(startTime) >= timeoutMillis());
130 >                }};
131 >            ScheduledFuture f =
132 >                p.scheduleWithFixedDelay(task, timeoutMillis(),
133 >                                         LONG_DELAY_MS, MILLISECONDS);
134 >            await(done);
135 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
136 >            f.cancel(true);
137 >        }
138 >    }
139 >
140 >    static class RunnableCounter implements Runnable {
141 >        AtomicInteger count = new AtomicInteger(0);
142 >        public void run() { count.getAndIncrement(); }
143      }
144  
145      /**
146       * scheduleAtFixedRate executes series of tasks at given rate
147       */
148      public void testFixedRateSequence() throws InterruptedException {
149 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
150 <        RunnableCounter counter = new RunnableCounter();
151 <        ScheduledFuture h =
152 <            p1.scheduleAtFixedRate(counter, 0, 1, MILLISECONDS);
153 <        Thread.sleep(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(p1);
149 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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 >                done.await();
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      /**
172       * scheduleWithFixedDelay executes series of tasks with given period
173       */
174      public void testFixedDelaySequence() throws InterruptedException {
175 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
176 <        RunnableCounter counter = new RunnableCounter();
177 <        ScheduledFuture h =
178 <            p1.scheduleWithFixedDelay(counter, 0, 1, MILLISECONDS);
179 <        Thread.sleep(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(p1);
175 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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 >                done.await();
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  
138
197      /**
198 <     *  execute (null) throws NPE
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 <
150 <        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
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          }
179
180        joinPool(se);
181
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          }
197        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) {
259 >    public void testSchedule3_RejectedExecutionException() throws InterruptedException {
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          }
213         joinPool(se);
270      }
271  
272      /**
273 <     *  scheduleAtFixedRate throws RejectedExecutionException if shutdown
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          }
229        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          }
245        joinPool(se);
302      }
303  
304      /**
305 <     *  getActiveCount increases but doesn't overestimate, when a
306 <     *  thread becomes active
305 >     * getActiveCount increases but doesn't overestimate, when a
306 >     * thread becomes active
307       */
308      public void testGetActiveCount() throws InterruptedException {
309 <        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
310 <        assertEquals(0, p2.getActiveCount());
311 <        p2.execute(new SmallRunnable());
312 <        Thread.sleep(SHORT_DELAY_MS);
313 <        assertEquals(1, p2.getActiveCount());
314 <        joinPool(p2);
309 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
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();
319 >                }});
320 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
321 >            assertEquals(1, p.getActiveCount());
322 >            done.countDown();
323 >        }
324      }
325  
326      /**
327 <     *    getCompletedTaskCount increases, but doesn't overestimate,
328 <     *   when tasks complete
327 >     * getCompletedTaskCount increases, but doesn't overestimate,
328 >     * when tasks complete
329       */
330      public void testGetCompletedTaskCount() throws InterruptedException {
331 <        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
332 <        assertEquals(0, p2.getCompletedTaskCount());
333 <        p2.execute(new SmallRunnable());
334 <        Thread.sleep(MEDIUM_DELAY_MS);
335 <        assertEquals(1, p2.getCompletedTaskCount());
336 <        joinPool(p2);
331 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
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 {
339 >                    threadStarted.countDown();
340 >                    assertEquals(0, p.getCompletedTaskCount());
341 >                    threadProceed.await();
342 >                    threadDone.countDown();
343 >                }});
344 >            await(threadStarted);
345 >            assertEquals(0, p.getCompletedTaskCount());
346 >            threadProceed.countDown();
347 >            threadDone.await();
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  
357      /**
358 <     *  getCorePoolSize returns size given in constructor if not otherwise set
358 >     * getCorePoolSize returns size given in constructor if not otherwise set
359       */
360      public void testGetCorePoolSize() throws InterruptedException {
361 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
362 <        assertEquals(1, p1.getCorePoolSize());
363 <        joinPool(p1);
361 >        ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
362 >        try (PoolCleaner cleaner = cleaner(p)) {
363 >            assertEquals(1, p.getCorePoolSize());
364 >        }
365      }
366  
367      /**
368 <     *    getLargestPoolSize increases, but doesn't overestimate, when
369 <     *   multiple threads active
368 >     * getLargestPoolSize increases, but doesn't overestimate, when
369 >     * multiple threads active
370       */
371      public void testGetLargestPoolSize() throws InterruptedException {
372 <        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
373 <        assertEquals(0, p2.getLargestPoolSize());
374 <        p2.execute(new SmallRunnable());
375 <        p2.execute(new SmallRunnable());
376 <        Thread.sleep(SHORT_DELAY_MS);
377 <        assertEquals(2, p2.getLargestPoolSize());
378 <        joinPool(p2);
372 >        final int THREADS = 3;
373 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(THREADS);
374 >        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
375 >        final CountDownLatch done = new CountDownLatch(1);
376 >        try (PoolCleaner cleaner = cleaner(p)) {
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();
383 >                        assertEquals(THREADS, p.getLargestPoolSize());
384 >                    }});
385 >            assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
386 >            assertEquals(THREADS, p.getLargestPoolSize());
387 >            done.countDown();
388 >        }
389 >        assertEquals(THREADS, p.getLargestPoolSize());
390      }
391  
392      /**
393 <     *   getPoolSize increases, but doesn't overestimate, when threads
394 <     *   become active
393 >     * getPoolSize increases, but doesn't overestimate, when threads
394 >     * become active
395       */
396      public void testGetPoolSize() throws InterruptedException {
397 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
398 <        assertEquals(0, p1.getPoolSize());
399 <        p1.execute(new SmallRunnable());
400 <        assertEquals(1, p1.getPoolSize());
401 <        joinPool(p1);
397 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
398 >        final CountDownLatch threadStarted = new CountDownLatch(1);
399 >        final CountDownLatch done = new CountDownLatch(1);
400 >        try (PoolCleaner cleaner = cleaner(p)) {
401 >            assertEquals(0, p.getPoolSize());
402 >            p.execute(new CheckedRunnable() {
403 >                public void realRun() throws InterruptedException {
404 >                    threadStarted.countDown();
405 >                    assertEquals(1, p.getPoolSize());
406 >                    done.await();
407 >                }});
408 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
409 >            assertEquals(1, p.getPoolSize());
410 >            done.countDown();
411 >        }
412      }
413  
414      /**
415 <     *    getTaskCount increases, but doesn't overestimate, when tasks
416 <     *    submitted
415 >     * getTaskCount increases, but doesn't overestimate, when tasks
416 >     * submitted
417       */
418      public void testGetTaskCount() throws InterruptedException {
419 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
420 <        assertEquals(0, p1.getTaskCount());
421 <        for (int i = 0; i < 5; i++)
422 <            p1.execute(new SmallRunnable());
423 <        Thread.sleep(SHORT_DELAY_MS);
424 <        assertEquals(5, p1.getTaskCount());
425 <        joinPool(p1);
419 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
420 >        try (PoolCleaner cleaner = cleaner(p)) {
421 >            final CountDownLatch threadStarted = new CountDownLatch(1);
422 >            final CountDownLatch done = new CountDownLatch(1);
423 >            final int TASKS = 5;
424 >            assertEquals(0, p.getTaskCount());
425 >            for (int i = 0; i < TASKS; i++)
426 >                p.execute(new CheckedRunnable() {
427 >                    public void realRun() throws InterruptedException {
428 >                        threadStarted.countDown();
429 >                        done.await();
430 >                    }});
431 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
432 >            assertEquals(TASKS, p.getTaskCount());
433 >            done.countDown();
434 >        }
435      }
436  
437      /**
438       * getThreadFactory returns factory in constructor if not set
439       */
440      public void testGetThreadFactory() throws InterruptedException {
441 <        ThreadFactory tf = new SimpleThreadFactory();
442 <        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, tf);
443 <        assertSame(tf, p.getThreadFactory());
441 >        ThreadFactory threadFactory = new SimpleThreadFactory();
442 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, threadFactory);
443 >        assertSame(threadFactory, p.getThreadFactory());
444          joinPool(p);
445      }
446  
# Line 334 | Line 448 | public class ScheduledExecutorTest exten
448       * setThreadFactory sets the thread factory returned by getThreadFactory
449       */
450      public void testSetThreadFactory() throws InterruptedException {
451 <        ThreadFactory tf = new SimpleThreadFactory();
451 >        ThreadFactory threadFactory = new SimpleThreadFactory();
452          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
453 <        p.setThreadFactory(tf);
454 <        assertSame(tf, p.getThreadFactory());
455 <        joinPool(p);
453 >        try (PoolCleaner cleaner = cleaner(p)) {
454 >            p.setThreadFactory(threadFactory);
455 >            assertSame(threadFactory, p.getThreadFactory());
456 >        }
457      }
458  
459      /**
# Line 346 | Line 461 | public class ScheduledExecutorTest exten
461       */
462      public void testSetThreadFactoryNull() throws InterruptedException {
463          ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
464 <        try {
465 <            p.setThreadFactory(null);
466 <            shouldThrow();
467 <        } catch (NullPointerException success) {
468 <        } finally {
354 <            joinPool(p);
464 >        try (PoolCleaner cleaner = cleaner(p)) {
465 >            try {
466 >                p.setThreadFactory(null);
467 >                shouldThrow();
468 >            } catch (NullPointerException success) {}
469          }
470      }
471  
472      /**
473 <     *   is isShutDown is false before shutdown, true after
473 >     * isShutdown is false before shutdown, true after
474       */
475      public void testIsShutdown() {
476  
477 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
477 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
478          try {
479 <            assertFalse(p1.isShutdown());
479 >            assertFalse(p.isShutdown());
480          }
481          finally {
482 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
482 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
483          }
484 <        assertTrue(p1.isShutdown());
484 >        assertTrue(p.isShutdown());
485      }
486  
373
487      /**
488 <     *   isTerminated is false before termination, true after
488 >     * isTerminated is false before termination, true after
489       */
490      public void testIsTerminated() throws InterruptedException {
491 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
492 <        try {
493 <            p1.execute(new SmallRunnable());
494 <        } finally {
495 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
491 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
492 >        try (PoolCleaner cleaner = cleaner(p)) {
493 >            final CountDownLatch threadStarted = new CountDownLatch(1);
494 >            final CountDownLatch done = new CountDownLatch(1);
495 >            assertFalse(p.isTerminated());
496 >            p.execute(new CheckedRunnable() {
497 >                public void realRun() throws InterruptedException {
498 >                    assertFalse(p.isTerminated());
499 >                    threadStarted.countDown();
500 >                    done.await();
501 >                }});
502 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
503 >            assertFalse(p.isTerminating());
504 >            done.countDown();
505 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
506 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
507 >            assertTrue(p.isTerminated());
508          }
384        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
385        assertTrue(p1.isTerminated());
509      }
510  
511      /**
512 <     *  isTerminating is not true when running or when terminated
512 >     * isTerminating is not true when running or when terminated
513       */
514      public void testIsTerminating() throws InterruptedException {
515 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
516 <        assertFalse(p1.isTerminating());
517 <        try {
518 <            p1.execute(new SmallRunnable());
519 <            assertFalse(p1.isTerminating());
520 <        } finally {
521 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
515 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
516 >        final CountDownLatch threadStarted = new CountDownLatch(1);
517 >        final CountDownLatch done = new CountDownLatch(1);
518 >        try (PoolCleaner cleaner = cleaner(p)) {
519 >            assertFalse(p.isTerminating());
520 >            p.execute(new CheckedRunnable() {
521 >                public void realRun() throws InterruptedException {
522 >                    assertFalse(p.isTerminating());
523 >                    threadStarted.countDown();
524 >                    done.await();
525 >                }});
526 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
527 >            assertFalse(p.isTerminating());
528 >            done.countDown();
529 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
530 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
531 >            assertTrue(p.isTerminated());
532 >            assertFalse(p.isTerminating());
533          }
400
401        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
402        assertTrue(p1.isTerminated());
403        assertFalse(p1.isTerminating());
534      }
535  
536      /**
537       * getQueue returns the work queue, which contains queued tasks
538       */
539      public void testGetQueue() throws InterruptedException {
540 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
541 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
542 <        for (int i = 0; i < 5; i++) {
543 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
544 <        }
545 <        try {
546 <            Thread.sleep(SHORT_DELAY_MS);
547 <            BlockingQueue<Runnable> q = p1.getQueue();
548 <            assertTrue(q.contains(tasks[4]));
540 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
541 >        try (PoolCleaner cleaner = cleaner(p)) {
542 >            final CountDownLatch threadStarted = new CountDownLatch(1);
543 >            final CountDownLatch done = new CountDownLatch(1);
544 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
545 >            for (int i = 0; i < tasks.length; i++) {
546 >                Runnable r = new CheckedRunnable() {
547 >                    public void realRun() throws InterruptedException {
548 >                        threadStarted.countDown();
549 >                        done.await();
550 >                    }};
551 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
552 >            }
553 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
554 >            BlockingQueue<Runnable> q = p.getQueue();
555 >            assertTrue(q.contains(tasks[tasks.length - 1]));
556              assertFalse(q.contains(tasks[0]));
557 <        } finally {
421 <            joinPool(p1);
557 >            done.countDown();
558          }
559      }
560  
# Line 426 | Line 562 | public class ScheduledExecutorTest exten
562       * remove(task) removes queued task, and fails to remove active task
563       */
564      public void testRemove() throws InterruptedException {
565 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
566 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
567 <        for (int i = 0; i < 5; i++) {
568 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
569 <        }
570 <        try {
571 <            Thread.sleep(SHORT_DELAY_MS);
572 <            BlockingQueue<Runnable> q = p1.getQueue();
573 <            assertFalse(p1.remove((Runnable)tasks[0]));
565 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
566 >        try (PoolCleaner cleaner = cleaner(p)) {
567 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
568 >            final CountDownLatch threadStarted = new CountDownLatch(1);
569 >            final CountDownLatch done = new CountDownLatch(1);
570 >            for (int i = 0; i < tasks.length; i++) {
571 >                Runnable r = new CheckedRunnable() {
572 >                    public void realRun() throws InterruptedException {
573 >                        threadStarted.countDown();
574 >                        done.await();
575 >                    }};
576 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
577 >            }
578 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
579 >            BlockingQueue<Runnable> q = p.getQueue();
580 >            assertFalse(p.remove((Runnable)tasks[0]));
581              assertTrue(q.contains((Runnable)tasks[4]));
582              assertTrue(q.contains((Runnable)tasks[3]));
583 <            assertTrue(p1.remove((Runnable)tasks[4]));
584 <            assertFalse(p1.remove((Runnable)tasks[4]));
583 >            assertTrue(p.remove((Runnable)tasks[4]));
584 >            assertFalse(p.remove((Runnable)tasks[4]));
585              assertFalse(q.contains((Runnable)tasks[4]));
586              assertTrue(q.contains((Runnable)tasks[3]));
587 <            assertTrue(p1.remove((Runnable)tasks[3]));
587 >            assertTrue(p.remove((Runnable)tasks[3]));
588              assertFalse(q.contains((Runnable)tasks[3]));
589 <        } finally {
447 <            joinPool(p1);
589 >            done.countDown();
590          }
591      }
592  
593      /**
594 <     *  purge removes cancelled tasks from the queue
594 >     * purge eventually removes cancelled tasks from the queue
595       */
596      public void testPurge() throws InterruptedException {
597 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
597 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
598          ScheduledFuture[] tasks = new ScheduledFuture[5];
599 <        for (int i = 0; i < 5; i++) {
600 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
601 <        }
599 >        for (int i = 0; i < tasks.length; i++)
600 >            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
601 >                                  LONG_DELAY_MS, MILLISECONDS);
602          try {
603 <            int max = 5;
603 >            int max = tasks.length;
604              if (tasks[4].cancel(true)) --max;
605              if (tasks[3].cancel(true)) --max;
606              // There must eventually be an interference-free point at
607              // which purge will not fail. (At worst, when queue is empty.)
608 <            int k;
609 <            for (k = 0; k < SMALL_DELAY_MS; ++k) {
610 <                p1.purge();
611 <                long count = p1.getTaskCount();
612 <                if (count >= 0 && count <= max)
613 <                    break;
614 <                Thread.sleep(1);
615 <            }
474 <            assertTrue(k < SMALL_DELAY_MS);
608 >            long startTime = System.nanoTime();
609 >            do {
610 >                p.purge();
611 >                long count = p.getTaskCount();
612 >                if (count == max)
613 >                    return;
614 >            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
615 >            fail("Purge failed to remove cancelled tasks");
616          } finally {
617 <            joinPool(p1);
617 >            for (ScheduledFuture task : tasks)
618 >                task.cancel(true);
619 >            joinPool(p);
620          }
621      }
622  
623      /**
624 <     *  shutDownNow returns a list containing tasks that were not run
624 >     * shutdownNow returns a list containing tasks that were not run,
625 >     * and those tasks are drained from the queue
626       */
627 <    public void testShutDownNow() throws InterruptedException {
628 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
629 <        for (int i = 0; i < 5; i++)
630 <            p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
631 <        List l;
627 >    public void testShutdownNow() throws InterruptedException {
628 >        final int poolSize = 2;
629 >        final int count = 5;
630 >        final AtomicInteger ran = new AtomicInteger(0);
631 >        final ScheduledThreadPoolExecutor p =
632 >            new ScheduledThreadPoolExecutor(poolSize);
633 >        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
634 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
635 >            threadsStarted.countDown();
636 >            try {
637 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
638 >            } catch (InterruptedException success) {}
639 >            ran.getAndIncrement();
640 >        }};
641 >        for (int i = 0; i < count; i++)
642 >            p.execute(waiter);
643 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
644 >        assertEquals(poolSize, p.getActiveCount());
645 >        assertEquals(0, p.getCompletedTaskCount());
646 >        final List<Runnable> queuedTasks;
647          try {
648 <            l = p1.shutdownNow();
648 >            queuedTasks = p.shutdownNow();
649          } catch (SecurityException ok) {
650 <            return;
650 >            return; // Allowed in case test doesn't have privs
651          }
652 <        assertTrue(p1.isShutdown());
653 <        assertTrue(l.size() > 0 && l.size() <= 5);
654 <        joinPool(p1);
652 >        assertTrue(p.isShutdown());
653 >        assertTrue(p.getQueue().isEmpty());
654 >        assertEquals(count - poolSize, queuedTasks.size());
655 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
656 >        assertTrue(p.isTerminated());
657 >        assertEquals(poolSize, ran.get());
658 >        assertEquals(poolSize, p.getCompletedTaskCount());
659      }
660  
661      /**
662 <     * In default setting, shutdown cancels periodic but not delayed
663 <     * tasks at shutdown
662 >     * shutdownNow returns a list containing tasks that were not run,
663 >     * and those tasks are drained from the queue
664       */
665 <    public void testShutDown1() throws InterruptedException {
666 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
667 <        assertTrue(p1.getExecuteExistingDelayedTasksAfterShutdownPolicy());
668 <        assertFalse(p1.getContinueExistingPeriodicTasksAfterShutdownPolicy());
669 <
670 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
671 <        for (int i = 0; i < 5; i++)
672 <            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
673 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
674 <        BlockingQueue q = p1.getQueue();
675 <        for (Iterator it = q.iterator(); it.hasNext();) {
676 <            ScheduledFuture t = (ScheduledFuture)it.next();
677 <            assertFalse(t.isCancelled());
665 >    public void testShutdownNow_delayedTasks() throws InterruptedException {
666 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
667 >        List<ScheduledFuture> tasks = new ArrayList<>();
668 >        for (int i = 0; i < 3; i++) {
669 >            Runnable r = new NoOpRunnable();
670 >            tasks.add(p.schedule(r, 9, SECONDS));
671 >            tasks.add(p.scheduleAtFixedRate(r, 9, 9, SECONDS));
672 >            tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
673 >        }
674 >        if (testImplementationDetails)
675 >            assertEquals(new HashSet(tasks), new HashSet(p.getQueue()));
676 >        final List<Runnable> queuedTasks;
677 >        try {
678 >            queuedTasks = p.shutdownNow();
679 >        } catch (SecurityException ok) {
680 >            return; // Allowed in case test doesn't have privs
681          }
682 <        assertTrue(p1.isShutdown());
683 <        Thread.sleep(SMALL_DELAY_MS);
684 <        for (int i = 0; i < 5; ++i) {
685 <            assertTrue(tasks[i].isDone());
686 <            assertFalse(tasks[i].isCancelled());
682 >        assertTrue(p.isShutdown());
683 >        assertTrue(p.getQueue().isEmpty());
684 >        if (testImplementationDetails)
685 >            assertEquals(new HashSet(tasks), new HashSet(queuedTasks));
686 >        assertEquals(tasks.size(), queuedTasks.size());
687 >        for (ScheduledFuture task : tasks) {
688 >            assertFalse(task.isDone());
689 >            assertFalse(task.isCancelled());
690          }
691 +        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
692 +        assertTrue(p.isTerminated());
693      }
694  
524
695      /**
696 <     * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
697 <     * delayed tasks are cancelled at shutdown
698 <     */
699 <    public void testShutDown2() throws InterruptedException {
700 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
701 <        p1.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
702 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
703 <        for (int i = 0; i < 5; i++)
704 <            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
705 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
706 <        assertTrue(p1.isShutdown());
707 <        BlockingQueue q = p1.getQueue();
708 <        assertTrue(q.isEmpty());
709 <        Thread.sleep(SMALL_DELAY_MS);
710 <        assertTrue(p1.isTerminated());
711 <    }
712 <
713 <
714 <    /**
715 <     * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
716 <     * periodic tasks are not cancelled at shutdown
717 <     */
718 <    public void testShutDown3() throws InterruptedException {
719 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
720 <        p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
721 <        ScheduledFuture task =
722 <            p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, MILLISECONDS);
723 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
724 <        assertTrue(p1.isShutdown());
725 <        BlockingQueue q = p1.getQueue();
726 <        assertTrue(q.isEmpty());
727 <        Thread.sleep(SHORT_DELAY_MS);
728 <        assertTrue(p1.isTerminated());
729 <    }
730 <
731 <    /**
732 <     * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
733 <     * periodic tasks are cancelled at shutdown
734 <     */
735 <    public void testShutDown4() throws InterruptedException {
736 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
737 <        try {
738 <            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
739 <            ScheduledFuture task =
740 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 1, 1, MILLISECONDS);
741 <            assertFalse(task.isCancelled());
742 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
743 <            assertFalse(task.isCancelled());
744 <            assertFalse(p1.isTerminated());
745 <            assertTrue(p1.isShutdown());
746 <            Thread.sleep(SHORT_DELAY_MS);
747 <            assertFalse(task.isCancelled());
748 <            assertTrue(task.cancel(true));
749 <            assertTrue(task.isDone());
750 <            Thread.sleep(SHORT_DELAY_MS);
751 <            assertTrue(p1.isTerminated());
696 >     * By default, periodic tasks are cancelled at shutdown.
697 >     * By default, delayed tasks keep running after shutdown.
698 >     * Check that changing the default values work:
699 >     * - setExecuteExistingDelayedTasksAfterShutdownPolicy
700 >     * - setContinueExistingPeriodicTasksAfterShutdownPolicy
701 >     */
702 >    public void testShutdown_cancellation() throws Exception {
703 >        Boolean[] allBooleans = { null, Boolean.FALSE, Boolean.TRUE };
704 >        for (Boolean policy : allBooleans)
705 >    {
706 >        final int poolSize = 2;
707 >        final ScheduledThreadPoolExecutor p
708 >            = new ScheduledThreadPoolExecutor(poolSize);
709 >        final boolean effectiveDelayedPolicy = (policy != Boolean.FALSE);
710 >        final boolean effectivePeriodicPolicy = (policy == Boolean.TRUE);
711 >        final boolean effectiveRemovePolicy = (policy == Boolean.TRUE);
712 >        if (policy != null) {
713 >            p.setExecuteExistingDelayedTasksAfterShutdownPolicy(policy);
714 >            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(policy);
715 >            p.setRemoveOnCancelPolicy(policy);
716 >        }
717 >        assertEquals(effectiveDelayedPolicy,
718 >                     p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
719 >        assertEquals(effectivePeriodicPolicy,
720 >                     p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
721 >        assertEquals(effectiveRemovePolicy,
722 >                     p.getRemoveOnCancelPolicy());
723 >        // Strategy: Wedge the pool with poolSize "blocker" threads
724 >        final AtomicInteger ran = new AtomicInteger(0);
725 >        final CountDownLatch poolBlocked = new CountDownLatch(poolSize);
726 >        final CountDownLatch unblock = new CountDownLatch(1);
727 >        final CountDownLatch periodicLatch1 = new CountDownLatch(2);
728 >        final CountDownLatch periodicLatch2 = new CountDownLatch(2);
729 >        Runnable task = new CheckedRunnable() { public void realRun()
730 >                                                    throws InterruptedException {
731 >            poolBlocked.countDown();
732 >            assertTrue(unblock.await(LONG_DELAY_MS, MILLISECONDS));
733 >            ran.getAndIncrement();
734 >        }};
735 >        List<Future<?>> blockers = new ArrayList<>();
736 >        List<Future<?>> periodics = new ArrayList<>();
737 >        List<Future<?>> delayeds = new ArrayList<>();
738 >        for (int i = 0; i < poolSize; i++)
739 >            blockers.add(p.submit(task));
740 >        assertTrue(poolBlocked.await(LONG_DELAY_MS, MILLISECONDS));
741 >
742 >        periodics.add(p.scheduleAtFixedRate(countDowner(periodicLatch1),
743 >                                            1, 1, MILLISECONDS));
744 >        periodics.add(p.scheduleWithFixedDelay(countDowner(periodicLatch2),
745 >                                               1, 1, MILLISECONDS));
746 >        delayeds.add(p.schedule(task, 1, MILLISECONDS));
747 >
748 >        assertTrue(p.getQueue().containsAll(periodics));
749 >        assertTrue(p.getQueue().containsAll(delayeds));
750 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
751 >        assertTrue(p.isShutdown());
752 >        assertFalse(p.isTerminated());
753 >        for (Future<?> periodic : periodics) {
754 >            assertTrue(effectivePeriodicPolicy ^ periodic.isCancelled());
755 >            assertTrue(effectivePeriodicPolicy ^ periodic.isDone());
756 >        }
757 >        for (Future<?> delayed : delayeds) {
758 >            assertTrue(effectiveDelayedPolicy ^ delayed.isCancelled());
759 >            assertTrue(effectiveDelayedPolicy ^ delayed.isDone());
760 >        }
761 >        if (testImplementationDetails) {
762 >            assertEquals(effectivePeriodicPolicy,
763 >                         p.getQueue().containsAll(periodics));
764 >            assertEquals(effectiveDelayedPolicy,
765 >                         p.getQueue().containsAll(delayeds));
766 >        }
767 >        // Release all pool threads
768 >        unblock.countDown();
769 >
770 >        for (Future<?> delayed : delayeds) {
771 >            if (effectiveDelayedPolicy) {
772 >                assertNull(delayed.get());
773 >            }
774          }
775 <        finally {
776 <            joinPool(p1);
775 >        if (effectivePeriodicPolicy) {
776 >            assertTrue(periodicLatch1.await(LONG_DELAY_MS, MILLISECONDS));
777 >            assertTrue(periodicLatch2.await(LONG_DELAY_MS, MILLISECONDS));
778 >            for (Future<?> periodic : periodics) {
779 >                assertTrue(periodic.cancel(false));
780 >                assertTrue(periodic.isCancelled());
781 >                assertTrue(periodic.isDone());
782 >            }
783          }
784 <    }
784 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
785 >        assertTrue(p.isTerminated());
786 >        assertEquals(2 + (effectiveDelayedPolicy ? 1 : 0), ran.get());
787 >    }}
788  
789      /**
790       * completed submit of callable returns result
791       */
792      public void testSubmitCallable() throws Exception {
793 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
794 <        try {
793 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
794 >        try (PoolCleaner cleaner = cleaner(e)) {
795              Future<String> future = e.submit(new StringTask());
796              String result = future.get();
797              assertSame(TEST_STRING, result);
597        } finally {
598            joinPool(e);
798          }
799      }
800  
# Line 603 | Line 802 | public class ScheduledExecutorTest exten
802       * completed submit of runnable returns successfully
803       */
804      public void testSubmitRunnable() 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<?> future = e.submit(new NoOpRunnable());
808              future.get();
809              assertTrue(future.isDone());
611        } finally {
612            joinPool(e);
810          }
811      }
812  
# Line 617 | Line 814 | public class ScheduledExecutorTest exten
814       * completed submit of (runnable, result) returns result
815       */
816      public void testSubmitRunnable2() 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<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
820              String result = future.get();
821              assertSame(TEST_STRING, result);
625        } finally {
626            joinPool(e);
822          }
823      }
824  
# Line 631 | Line 826 | public class ScheduledExecutorTest exten
826       * invokeAny(null) throws NPE
827       */
828      public void testInvokeAny1() throws Exception {
829 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
830 <        try {
831 <            e.invokeAny(null);
832 <            shouldThrow();
833 <        } catch (NullPointerException success) {
834 <        } finally {
640 <            joinPool(e);
829 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
830 >        try (PoolCleaner cleaner = cleaner(e)) {
831 >            try {
832 >                e.invokeAny(null);
833 >                shouldThrow();
834 >            } catch (NullPointerException success) {}
835          }
836      }
837  
# Line 645 | Line 839 | public class ScheduledExecutorTest exten
839       * invokeAny(empty collection) throws IAE
840       */
841      public void testInvokeAny2() throws Exception {
842 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
843 <        try {
844 <            e.invokeAny(new ArrayList<Callable<String>>());
845 <            shouldThrow();
846 <        } catch (IllegalArgumentException success) {
847 <        } finally {
654 <            joinPool(e);
842 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
843 >        try (PoolCleaner cleaner = cleaner(e)) {
844 >            try {
845 >                e.invokeAny(new ArrayList<Callable<String>>());
846 >                shouldThrow();
847 >            } catch (IllegalArgumentException success) {}
848          }
849      }
850  
# Line 659 | Line 852 | public class ScheduledExecutorTest exten
852       * invokeAny(c) throws NPE if c has null elements
853       */
854      public void testInvokeAny3() throws Exception {
855 <        final CountDownLatch latch = new CountDownLatch(1);
856 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
857 <        try {
858 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
859 <            l.add(new Callable<String>() {
667 <                      public String call() {
668 <                          try {
669 <                              latch.await();
670 <                          } catch (InterruptedException ok) {}
671 <                          return TEST_STRING;
672 <                      }});
855 >        CountDownLatch latch = new CountDownLatch(1);
856 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
857 >        try (PoolCleaner cleaner = cleaner(e)) {
858 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
859 >            l.add(latchAwaitingStringTask(latch));
860              l.add(null);
861 <            e.invokeAny(l);
862 <            shouldThrow();
863 <        } catch (NullPointerException success) {
864 <        } finally {
861 >            try {
862 >                e.invokeAny(l);
863 >                shouldThrow();
864 >            } catch (NullPointerException success) {}
865              latch.countDown();
679            joinPool(e);
866          }
867      }
868  
# Line 684 | Line 870 | public class ScheduledExecutorTest exten
870       * invokeAny(c) throws ExecutionException if no task completes
871       */
872      public void testInvokeAny4() throws Exception {
873 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
874 <        try {
875 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
873 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
874 >        try (PoolCleaner cleaner = cleaner(e)) {
875 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
876              l.add(new NPETask());
877 <            e.invokeAny(l);
878 <            shouldThrow();
879 <        } catch (ExecutionException success) {
880 <            assertTrue(success.getCause() instanceof NullPointerException);
881 <        } finally {
882 <            joinPool(e);
877 >            try {
878 >                e.invokeAny(l);
879 >                shouldThrow();
880 >            } catch (ExecutionException success) {
881 >                assertTrue(success.getCause() instanceof NullPointerException);
882 >            }
883          }
884      }
885  
# Line 701 | Line 887 | public class ScheduledExecutorTest exten
887       * invokeAny(c) returns result of some task
888       */
889      public void testInvokeAny5() throws Exception {
890 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
891 <        try {
892 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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(new StringTask());
894              l.add(new StringTask());
895              String result = e.invokeAny(l);
896              assertSame(TEST_STRING, result);
711        } finally {
712            joinPool(e);
897          }
898      }
899  
# Line 717 | Line 901 | public class ScheduledExecutorTest exten
901       * invokeAll(null) throws NPE
902       */
903      public void testInvokeAll1() throws Exception {
904 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
905 <        try {
906 <            e.invokeAll(null);
907 <            shouldThrow();
908 <        } catch (NullPointerException success) {
909 <        } finally {
726 <            joinPool(e);
904 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
905 >        try (PoolCleaner cleaner = cleaner(e)) {
906 >            try {
907 >                e.invokeAll(null);
908 >                shouldThrow();
909 >            } catch (NullPointerException success) {}
910          }
911      }
912  
# Line 731 | Line 914 | public class ScheduledExecutorTest exten
914       * invokeAll(empty collection) returns empty collection
915       */
916      public void testInvokeAll2() throws Exception {
917 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
918 <        try {
917 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
918 >        try (PoolCleaner cleaner = cleaner(e)) {
919              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
920              assertTrue(r.isEmpty());
738        } finally {
739            joinPool(e);
921          }
922      }
923  
# Line 744 | Line 925 | public class ScheduledExecutorTest exten
925       * invokeAll(c) throws NPE if c has null elements
926       */
927      public void testInvokeAll3() throws Exception {
928 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
929 <        try {
930 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
928 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
929 >        try (PoolCleaner cleaner = cleaner(e)) {
930 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
931              l.add(new StringTask());
932              l.add(null);
933 <            e.invokeAll(l);
934 <            shouldThrow();
935 <        } catch (NullPointerException success) {
936 <        } finally {
756 <            joinPool(e);
933 >            try {
934 >                e.invokeAll(l);
935 >                shouldThrow();
936 >            } catch (NullPointerException success) {}
937          }
938      }
939  
# Line 761 | Line 941 | public class ScheduledExecutorTest exten
941       * get of invokeAll(c) throws exception on failed task
942       */
943      public void testInvokeAll4() throws Exception {
944 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
945 <        try {
946 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
944 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
945 >        try (PoolCleaner cleaner = cleaner(e)) {
946 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
947              l.add(new NPETask());
948 <            List<Future<String>> result = e.invokeAll(l);
949 <            assertEquals(1, result.size());
950 <            for (Future<String> future : result)
951 <                future.get();
952 <            shouldThrow();
953 <        } catch (ExecutionException success) {
954 <            assertTrue(success.getCause() instanceof NullPointerException);
955 <        } finally {
776 <            joinPool(e);
948 >            List<Future<String>> futures = e.invokeAll(l);
949 >            assertEquals(1, futures.size());
950 >            try {
951 >                futures.get(0).get();
952 >                shouldThrow();
953 >            } catch (ExecutionException success) {
954 >                assertTrue(success.getCause() instanceof NullPointerException);
955 >            }
956          }
957      }
958  
# Line 781 | Line 960 | public class ScheduledExecutorTest exten
960       * invokeAll(c) returns results of all completed tasks
961       */
962      public void testInvokeAll5() throws Exception {
963 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
964 <        try {
965 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
963 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
964 >        try (PoolCleaner cleaner = cleaner(e)) {
965 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
966              l.add(new StringTask());
967              l.add(new StringTask());
968 <            List<Future<String>> result = e.invokeAll(l);
969 <            assertEquals(2, result.size());
970 <            for (Future<String> future : result)
968 >            List<Future<String>> futures = e.invokeAll(l);
969 >            assertEquals(2, futures.size());
970 >            for (Future<String> future : futures)
971                  assertSame(TEST_STRING, future.get());
793        } finally {
794            joinPool(e);
972          }
973      }
974  
# Line 799 | Line 976 | public class ScheduledExecutorTest exten
976       * timed invokeAny(null) throws NPE
977       */
978      public void testTimedInvokeAny1() throws Exception {
979 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
980 <        try {
981 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
982 <            shouldThrow();
983 <        } catch (NullPointerException success) {
984 <        } finally {
808 <            joinPool(e);
979 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
980 >        try (PoolCleaner cleaner = cleaner(e)) {
981 >            try {
982 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
983 >                shouldThrow();
984 >            } catch (NullPointerException success) {}
985          }
986      }
987  
# Line 813 | Line 989 | public class ScheduledExecutorTest exten
989       * timed invokeAny(,,null) throws NPE
990       */
991      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
992 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
993 <        try {
994 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
992 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
993 >        try (PoolCleaner cleaner = cleaner(e)) {
994 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
995              l.add(new StringTask());
996 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
997 <            shouldThrow();
998 <        } catch (NullPointerException success) {
999 <        } finally {
824 <            joinPool(e);
996 >            try {
997 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
998 >                shouldThrow();
999 >            } catch (NullPointerException success) {}
1000          }
1001      }
1002  
# Line 829 | Line 1004 | public class ScheduledExecutorTest exten
1004       * timed invokeAny(empty collection) throws IAE
1005       */
1006      public void testTimedInvokeAny2() throws Exception {
1007 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1008 <        try {
1009 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1010 <            shouldThrow();
1011 <        } catch (IllegalArgumentException success) {
1012 <        } finally {
838 <            joinPool(e);
1007 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1008 >        try (PoolCleaner cleaner = cleaner(e)) {
1009 >            try {
1010 >                e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1011 >                shouldThrow();
1012 >            } catch (IllegalArgumentException success) {}
1013          }
1014      }
1015  
# Line 843 | Line 1017 | public class ScheduledExecutorTest exten
1017       * timed invokeAny(c) throws NPE if c has null elements
1018       */
1019      public void testTimedInvokeAny3() throws Exception {
1020 <        final CountDownLatch latch = new CountDownLatch(1);
1021 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1022 <        try {
1023 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1024 <            l.add(new Callable<String>() {
851 <                      public String call() {
852 <                          try {
853 <                              latch.await();
854 <                          } catch (InterruptedException ok) {}
855 <                          return TEST_STRING;
856 <                      }});
1020 >        CountDownLatch latch = new CountDownLatch(1);
1021 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1022 >        try (PoolCleaner cleaner = cleaner(e)) {
1023 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1024 >            l.add(latchAwaitingStringTask(latch));
1025              l.add(null);
1026 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1027 <            shouldThrow();
1028 <        } catch (NullPointerException success) {
1029 <        } finally {
1026 >            try {
1027 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1028 >                shouldThrow();
1029 >            } catch (NullPointerException success) {}
1030              latch.countDown();
863            joinPool(e);
1031          }
1032      }
1033  
# Line 868 | Line 1035 | public class ScheduledExecutorTest exten
1035       * timed invokeAny(c) throws ExecutionException if no task completes
1036       */
1037      public void testTimedInvokeAny4() throws Exception {
1038 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1039 <        try {
1040 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1038 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1039 >        try (PoolCleaner cleaner = cleaner(e)) {
1040 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1041              l.add(new NPETask());
1042 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1043 <            shouldThrow();
1044 <        } catch (ExecutionException success) {
1045 <            assertTrue(success.getCause() instanceof NullPointerException);
1046 <        } finally {
1047 <            joinPool(e);
1042 >            try {
1043 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1044 >                shouldThrow();
1045 >            } catch (ExecutionException success) {
1046 >                assertTrue(success.getCause() instanceof NullPointerException);
1047 >            }
1048          }
1049      }
1050  
# Line 885 | Line 1052 | public class ScheduledExecutorTest exten
1052       * timed invokeAny(c) returns result of some task
1053       */
1054      public void testTimedInvokeAny5() throws Exception {
1055 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1056 <        try {
1057 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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(new StringTask());
1059              l.add(new StringTask());
1060              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1061              assertSame(TEST_STRING, result);
895        } finally {
896            joinPool(e);
1062          }
1063      }
1064  
# Line 901 | Line 1066 | public class ScheduledExecutorTest exten
1066       * timed invokeAll(null) throws NPE
1067       */
1068      public void testTimedInvokeAll1() throws Exception {
1069 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1070 <        try {
1071 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1072 <            shouldThrow();
1073 <        } catch (NullPointerException success) {
1074 <        } finally {
910 <            joinPool(e);
1069 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1070 >        try (PoolCleaner cleaner = cleaner(e)) {
1071 >            try {
1072 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1073 >                shouldThrow();
1074 >            } catch (NullPointerException success) {}
1075          }
1076      }
1077  
# Line 915 | Line 1079 | public class ScheduledExecutorTest exten
1079       * timed invokeAll(,,null) throws NPE
1080       */
1081      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1082 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1083 <        try {
1084 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1082 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1083 >        try (PoolCleaner cleaner = cleaner(e)) {
1084 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1085              l.add(new StringTask());
1086 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1087 <            shouldThrow();
1088 <        } catch (NullPointerException success) {
1089 <        } finally {
926 <            joinPool(e);
1086 >            try {
1087 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1088 >                shouldThrow();
1089 >            } catch (NullPointerException success) {}
1090          }
1091      }
1092  
# Line 931 | Line 1094 | public class ScheduledExecutorTest exten
1094       * timed invokeAll(empty collection) returns empty collection
1095       */
1096      public void testTimedInvokeAll2() throws Exception {
1097 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1098 <        try {
1099 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1097 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1098 >        try (PoolCleaner cleaner = cleaner(e)) {
1099 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1100 >                                                 MEDIUM_DELAY_MS, MILLISECONDS);
1101              assertTrue(r.isEmpty());
938        } finally {
939            joinPool(e);
1102          }
1103      }
1104  
# Line 944 | Line 1106 | public class ScheduledExecutorTest exten
1106       * timed invokeAll(c) throws NPE if c has null elements
1107       */
1108      public void testTimedInvokeAll3() throws Exception {
1109 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1110 <        try {
1111 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1109 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1110 >        try (PoolCleaner cleaner = cleaner(e)) {
1111 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1112              l.add(new StringTask());
1113              l.add(null);
1114 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1115 <            shouldThrow();
1116 <        } catch (NullPointerException success) {
1117 <        } finally {
956 <            joinPool(e);
1114 >            try {
1115 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1116 >                shouldThrow();
1117 >            } catch (NullPointerException success) {}
1118          }
1119      }
1120  
# Line 961 | Line 1122 | public class ScheduledExecutorTest exten
1122       * get of element of invokeAll(c) throws exception on failed task
1123       */
1124      public void testTimedInvokeAll4() throws Exception {
1125 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1126 <        try {
1127 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1125 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1126 >        try (PoolCleaner cleaner = cleaner(e)) {
1127 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1128              l.add(new NPETask());
1129 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1130 <            assertEquals(1, result.size());
1131 <            for (Future<String> future : result)
1132 <                future.get();
1133 <            shouldThrow();
1134 <        } catch (ExecutionException success) {
1135 <            assertTrue(success.getCause() instanceof NullPointerException);
1136 <        } finally {
1137 <            joinPool(e);
1129 >            List<Future<String>> futures =
1130 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1131 >            assertEquals(1, futures.size());
1132 >            try {
1133 >                futures.get(0).get();
1134 >                shouldThrow();
1135 >            } catch (ExecutionException success) {
1136 >                assertTrue(success.getCause() instanceof NullPointerException);
1137 >            }
1138          }
1139      }
1140  
# Line 981 | Line 1142 | public class ScheduledExecutorTest exten
1142       * timed invokeAll(c) returns results of all completed tasks
1143       */
1144      public void testTimedInvokeAll5() throws Exception {
1145 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1146 <        try {
1147 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1145 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1146 >        try (PoolCleaner cleaner = cleaner(e)) {
1147 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1148              l.add(new StringTask());
1149              l.add(new StringTask());
1150 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1151 <            assertEquals(2, result.size());
1152 <            for (Future<String> future : result)
1150 >            List<Future<String>> futures =
1151 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1152 >            assertEquals(2, futures.size());
1153 >            for (Future<String> future : futures)
1154                  assertSame(TEST_STRING, future.get());
993        } finally {
994            joinPool(e);
1155          }
1156      }
1157  
# Line 999 | Line 1159 | public class ScheduledExecutorTest exten
1159       * timed invokeAll(c) cancels tasks not completed by timeout
1160       */
1161      public void testTimedInvokeAll6() throws Exception {
1162 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1163 <        try {
1164 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1165 <            l.add(new StringTask());
1166 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1167 <            l.add(new StringTask());
1168 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1169 <            assertEquals(3, result.size());
1170 <            Iterator<Future<String>> it = result.iterator();
1171 <            Future<String> f1 = it.next();
1172 <            Future<String> f2 = it.next();
1173 <            Future<String> f3 = it.next();
1174 <            assertTrue(f1.isDone());
1175 <            assertTrue(f2.isDone());
1176 <            assertTrue(f3.isDone());
1177 <            assertFalse(f1.isCancelled());
1178 <            assertTrue(f2.isCancelled());
1179 <        } finally {
1180 <            joinPool(e);
1162 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1163 >        try (PoolCleaner cleaner = cleaner(e)) {
1164 >            for (long timeout = timeoutMillis();;) {
1165 >                List<Callable<String>> tasks = new ArrayList<>();
1166 >                tasks.add(new StringTask("0"));
1167 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1168 >                tasks.add(new StringTask("2"));
1169 >                long startTime = System.nanoTime();
1170 >                List<Future<String>> futures =
1171 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1172 >                assertEquals(tasks.size(), futures.size());
1173 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1174 >                for (Future future : futures)
1175 >                    assertTrue(future.isDone());
1176 >                assertTrue(futures.get(1).isCancelled());
1177 >                try {
1178 >                    assertEquals("0", futures.get(0).get());
1179 >                    assertEquals("2", futures.get(2).get());
1180 >                    break;
1181 >                } catch (CancellationException retryWithLongerTimeout) {
1182 >                    timeout *= 2;
1183 >                    if (timeout >= LONG_DELAY_MS / 2)
1184 >                        fail("expected exactly one task to be cancelled");
1185 >                }
1186 >            }
1187          }
1188      }
1189  
1024
1190   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines