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.71 by jsr166, Tue Oct 6 05:22:25 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(LONG_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 >                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      /**
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 >                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  
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 >                    await(done);
319 >                }});
320 >            assertTrue(threadStarted.await(LONG_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, 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 >                        await(done);
383 >                        assertEquals(THREADS, p.getLargestPoolSize());
384 >                    }});
385 >            await(threadsStarted);
386 >            assertEquals(THREADS, p.getLargestPoolSize());
387 >        }
388 >        assertEquals(THREADS, p.getLargestPoolSize());
389      }
390  
391      /**
392 <     *   getPoolSize increases, but doesn't overestimate, when threads
393 <     *   become active
392 >     * getPoolSize increases, but doesn't overestimate, when threads
393 >     * become active
394       */
395      public void testGetPoolSize() throws InterruptedException {
396 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
397 <        assertEquals(0, p1.getPoolSize());
398 <        p1.execute(new SmallRunnable());
399 <        assertEquals(1, p1.getPoolSize());
400 <        joinPool(p1);
396 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
397 >        final CountDownLatch threadStarted = new CountDownLatch(1);
398 >        final CountDownLatch done = new CountDownLatch(1);
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 >                    await(done);
406 >                }});
407 >            await(threadStarted);
408 >            assertEquals(1, p.getPoolSize());
409 >        }
410      }
411  
412      /**
413 <     *    getTaskCount increases, but doesn't overestimate, when tasks
414 <     *    submitted
413 >     * getTaskCount increases, but doesn't overestimate, when tasks
414 >     * submitted
415       */
416      public void testGetTaskCount() throws InterruptedException {
417 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
418 <        assertEquals(0, p1.getTaskCount());
419 <        for (int i = 0; i < 5; i++)
420 <            p1.execute(new SmallRunnable());
421 <        Thread.sleep(SHORT_DELAY_MS);
422 <        assertEquals(5, p1.getTaskCount());
423 <        joinPool(p1);
417 >        final int TASKS = 3;
418 >        final CountDownLatch done = new CountDownLatch(1);
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 >            assertEquals(0, p.getCompletedTaskCount());
424 >            p.execute(new CheckedRunnable() {
425 >                public void realRun() throws InterruptedException {
426 >                    threadStarted.countDown();
427 >                    await(done);
428 >                }});
429 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
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 >                        assertEquals(1 + TASKS, p.getTaskCount());
438 >                        await(done);
439 >                    }});
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 346 | 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 {
354 <            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 <     *   is isShutDown is false before shutdown, true after
486 >     * isShutdown is false before shutdown, true after
487       */
488      public void testIsShutdown() {
489  
490 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
490 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
491          try {
492 <            assertFalse(p1.isShutdown());
492 >            assertFalse(p.isShutdown());
493          }
494          finally {
495 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
495 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
496          }
497 <        assertTrue(p1.isShutdown());
497 >        assertTrue(p.isShutdown());
498      }
499  
373
500      /**
501 <     *   isTerminated is false before termination, true after
501 >     * isTerminated is false before termination, true after
502       */
503      public void testIsTerminated() throws InterruptedException {
504 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
505 <        try {
506 <            p1.execute(new SmallRunnable());
507 <        } finally {
508 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
504 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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 >                    await(done);
514 >                }});
515 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
516 >            assertFalse(p.isTerminating());
517 >            done.countDown();
518 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
519 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
520 >            assertTrue(p.isTerminated());
521          }
384        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
385        assertTrue(p1.isTerminated());
522      }
523  
524      /**
525 <     *  isTerminating is not true when running or when terminated
525 >     * isTerminating is not true when running or when terminated
526       */
527      public void testIsTerminating() throws InterruptedException {
528 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
529 <        assertFalse(p1.isTerminating());
530 <        try {
531 <            p1.execute(new SmallRunnable());
532 <            assertFalse(p1.isTerminating());
533 <        } finally {
534 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
528 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
529 >        final CountDownLatch threadStarted = new CountDownLatch(1);
530 >        final CountDownLatch done = new CountDownLatch(1);
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 >                    await(done);
538 >                }});
539 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
540 >            assertFalse(p.isTerminating());
541 >            done.countDown();
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          }
400
401        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
402        assertTrue(p1.isTerminated());
403        assertFalse(p1.isTerminating());
547      }
548  
549      /**
550       * getQueue returns the work queue, which contains queued tasks
551       */
552      public void testGetQueue() throws InterruptedException {
553 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
554 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
555 <        for (int i = 0; i < 5; i++) {
556 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
557 <        }
558 <        try {
559 <            Thread.sleep(SHORT_DELAY_MS);
560 <            BlockingQueue<Runnable> q = p1.getQueue();
561 <            assertTrue(q.contains(tasks[4]));
553 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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 >                        await(done);
563 >                    }};
564 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
565 >            }
566 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
567 >            BlockingQueue<Runnable> q = p.getQueue();
568 >            assertTrue(q.contains(tasks[tasks.length - 1]));
569              assertFalse(q.contains(tasks[0]));
570 <        } finally {
421 <            joinPool(p1);
570 >            done.countDown();
571          }
572      }
573  
# Line 426 | Line 575 | public class ScheduledExecutorTest exten
575       * remove(task) removes queued task, and fails to remove active task
576       */
577      public void testRemove() throws InterruptedException {
578 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
579 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
580 <        for (int i = 0; i < 5; i++) {
581 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
582 <        }
583 <        try {
584 <            Thread.sleep(SHORT_DELAY_MS);
585 <            BlockingQueue<Runnable> q = p1.getQueue();
586 <            assertFalse(p1.remove((Runnable)tasks[0]));
578 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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 >                        await(done);
588 >                    }};
589 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
590 >            }
591 >            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
592 >            BlockingQueue<Runnable> q = p.getQueue();
593 >            assertFalse(p.remove((Runnable)tasks[0]));
594              assertTrue(q.contains((Runnable)tasks[4]));
595              assertTrue(q.contains((Runnable)tasks[3]));
596 <            assertTrue(p1.remove((Runnable)tasks[4]));
597 <            assertFalse(p1.remove((Runnable)tasks[4]));
596 >            assertTrue(p.remove((Runnable)tasks[4]));
597 >            assertFalse(p.remove((Runnable)tasks[4]));
598              assertFalse(q.contains((Runnable)tasks[4]));
599              assertTrue(q.contains((Runnable)tasks[3]));
600 <            assertTrue(p1.remove((Runnable)tasks[3]));
600 >            assertTrue(p.remove((Runnable)tasks[3]));
601              assertFalse(q.contains((Runnable)tasks[3]));
602 <        } finally {
447 <            joinPool(p1);
602 >            done.countDown();
603          }
604      }
605  
606      /**
607 <     *  purge removes cancelled tasks from the queue
607 >     * purge eventually removes cancelled tasks from the queue
608       */
609      public void testPurge() throws InterruptedException {
610 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
611 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
612 <        for (int i = 0; i < 5; i++) {
613 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
614 <        }
615 <        try {
616 <            int max = 5;
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;
622              // There must eventually be an interference-free point at
623              // which purge will not fail. (At worst, when queue is empty.)
624 <            int k;
625 <            for (k = 0; k < SMALL_DELAY_MS; ++k) {
626 <                p1.purge();
627 <                long count = p1.getTaskCount();
628 <                if (count >= 0 && count <= max)
629 <                    break;
630 <                Thread.sleep(1);
631 <            }
474 <            assertTrue(k < SMALL_DELAY_MS);
475 <        } finally {
476 <            joinPool(p1);
624 >            long startTime = System.nanoTime();
625 >            do {
626 >                p.purge();
627 >                long count = p.getTaskCount();
628 >                if (count == max)
629 >                    return;
630 >            } while (millisElapsedSince(startTime) < LONG_DELAY_MS);
631 >            fail("Purge failed to remove cancelled tasks");
632          }
633      }
634  
635      /**
636 <     *  shutDownNow returns a list containing tasks that were not run
637 <     */
638 <    public void testShutDownNow() throws InterruptedException {
639 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
640 <        for (int i = 0; i < 5; i++)
641 <            p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
642 <        List l;
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() 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 <            l = p1.shutdownNow();
660 >            queuedTasks = p.shutdownNow();
661          } catch (SecurityException ok) {
662 <            return;
662 >            return; // Allowed in case test doesn't have privs
663          }
664 <        assertTrue(p1.isShutdown());
665 <        assertTrue(l.size() > 0 && l.size() <= 5);
666 <        joinPool(p1);
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 {
678 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
679 <        assertTrue(p1.getExecuteExistingDelayedTasksAfterShutdownPolicy());
680 <        assertFalse(p1.getContinueExistingPeriodicTasksAfterShutdownPolicy());
681 <
682 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
683 <        for (int i = 0; i < 5; i++)
684 <            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
685 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
686 <        BlockingQueue q = p1.getQueue();
687 <        for (Iterator it = q.iterator(); it.hasNext();) {
688 <            ScheduledFuture t = (ScheduledFuture)it.next();
689 <            assertFalse(t.isCancelled());
677 >    public void testShutdownNow_delayedTasks() throws InterruptedException {
678 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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(p1.isShutdown());
695 <        Thread.sleep(SMALL_DELAY_MS);
696 <        for (int i = 0; i < 5; ++i) {
697 <            assertTrue(tasks[i].isDone());
698 <            assertFalse(tasks[i].isCancelled());
694 >        assertTrue(p.isShutdown());
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 >            assertFalse(task.isDone());
701 >            assertFalse(task.isCancelled());
702          }
703 <    }
704 <
524 <
525 <    /**
526 <     * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
527 <     * delayed tasks are cancelled at shutdown
528 <     */
529 <    public void testShutDown2() throws InterruptedException {
530 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
531 <        p1.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
532 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
533 <        for (int i = 0; i < 5; i++)
534 <            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
535 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
536 <        assertTrue(p1.isShutdown());
537 <        BlockingQueue q = p1.getQueue();
538 <        assertTrue(q.isEmpty());
539 <        Thread.sleep(SMALL_DELAY_MS);
540 <        assertTrue(p1.isTerminated());
541 <    }
542 <
543 <
544 <    /**
545 <     * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
546 <     * periodic tasks are not cancelled at shutdown
547 <     */
548 <    public void testShutDown3() throws InterruptedException {
549 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
550 <        p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
551 <        ScheduledFuture task =
552 <            p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, MILLISECONDS);
553 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
554 <        assertTrue(p1.isShutdown());
555 <        BlockingQueue q = p1.getQueue();
556 <        assertTrue(q.isEmpty());
557 <        Thread.sleep(SHORT_DELAY_MS);
558 <        assertTrue(p1.isTerminated());
703 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
704 >        assertTrue(p.isTerminated());
705      }
706  
707      /**
708 <     * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
709 <     * periodic tasks are cancelled at shutdown
710 <     */
711 <    public void testShutDown4() throws InterruptedException {
712 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
713 <        try {
714 <            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
715 <            ScheduledFuture task =
716 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 1, 1, MILLISECONDS);
717 <            assertFalse(task.isCancelled());
718 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
719 <            assertFalse(task.isCancelled());
720 <            assertFalse(p1.isTerminated());
721 <            assertTrue(p1.isShutdown());
722 <            Thread.sleep(SHORT_DELAY_MS);
723 <            assertFalse(task.isCancelled());
724 <            assertTrue(task.cancel(true));
725 <            assertTrue(task.isDone());
726 <            Thread.sleep(SHORT_DELAY_MS);
727 <            assertTrue(p1.isTerminated());
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 >        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(p1);
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);
597        } finally {
598            joinPool(e);
810          }
811      }
812  
# Line 603 | 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());
611        } finally {
612            joinPool(e);
822          }
823      }
824  
# Line 617 | 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);
625        } finally {
626            joinPool(e);
834          }
835      }
836  
# Line 631 | 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 {
640 <            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 645 | 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 {
654 <            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 659 | Line 864 | public class ScheduledExecutorTest exten
864       * invokeAny(c) throws NPE if c has null elements
865       */
866      public void testInvokeAny3() throws Exception {
867 <        final CountDownLatch latch = new CountDownLatch(1);
868 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
869 <        try {
870 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
871 <            l.add(new Callable<String>() {
667 <                      public String call() {
668 <                          try {
669 <                              latch.await();
670 <                          } catch (InterruptedException ok) {}
671 <                          return TEST_STRING;
672 <                      }});
867 >        CountDownLatch latch = new CountDownLatch(1);
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 <            e.invokeAny(l);
874 <            shouldThrow();
875 <        } catch (NullPointerException success) {
876 <        } finally {
873 >            try {
874 >                e.invokeAny(l);
875 >                shouldThrow();
876 >            } catch (NullPointerException success) {}
877              latch.countDown();
679            joinPool(e);
878          }
879      }
880  
# Line 684 | 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 <        try {
887 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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 <            e.invokeAny(l);
890 <            shouldThrow();
891 <        } catch (ExecutionException success) {
892 <            assertTrue(success.getCause() instanceof NullPointerException);
893 <        } finally {
894 <            joinPool(e);
889 >            try {
890 >                e.invokeAny(l);
891 >                shouldThrow();
892 >            } catch (ExecutionException success) {
893 >                assertTrue(success.getCause() instanceof NullPointerException);
894 >            }
895          }
896      }
897  
# Line 701 | 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 {
904 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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);
711        } finally {
712            joinPool(e);
909          }
910      }
911  
# Line 717 | 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 {
726 <            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 731 | 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());
738        } finally {
739            joinPool(e);
933          }
934      }
935  
# Line 744 | 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 <        try {
942 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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 <            e.invokeAll(l);
946 <            shouldThrow();
947 <        } catch (NullPointerException success) {
948 <        } finally {
756 <            joinPool(e);
945 >            try {
946 >                e.invokeAll(l);
947 >                shouldThrow();
948 >            } catch (NullPointerException success) {}
949          }
950      }
951  
# Line 761 | 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 <        try {
958 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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>> result = e.invokeAll(l);
961 <            assertEquals(1, result.size());
962 <            for (Future<String> future : result)
963 <                future.get();
964 <            shouldThrow();
965 <        } catch (ExecutionException success) {
966 <            assertTrue(success.getCause() instanceof NullPointerException);
967 <        } finally {
776 <            joinPool(e);
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 781 | 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 {
977 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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());
980 <            List<Future<String>> result = e.invokeAll(l);
981 <            assertEquals(2, result.size());
982 <            for (Future<String> future : result)
980 >            List<Future<String>> futures = e.invokeAll(l);
981 >            assertEquals(2, futures.size());
982 >            for (Future<String> future : futures)
983                  assertSame(TEST_STRING, future.get());
793        } finally {
794            joinPool(e);
984          }
985      }
986  
# Line 799 | 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 {
808 <            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 813 | 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 <        try {
1006 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
1009 <            shouldThrow();
1010 <        } catch (NullPointerException success) {
1011 <        } finally {
824 <            joinPool(e);
1008 >            try {
1009 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1010 >                shouldThrow();
1011 >            } catch (NullPointerException success) {}
1012          }
1013      }
1014  
# Line 829 | 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 {
838 <            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 843 | Line 1029 | public class ScheduledExecutorTest exten
1029       * timed invokeAny(c) throws NPE if c has null elements
1030       */
1031      public void testTimedInvokeAny3() throws Exception {
1032 <        final CountDownLatch latch = new CountDownLatch(1);
1033 <        ExecutorService e = new ScheduledThreadPoolExecutor(2);
1034 <        try {
1035 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1036 <            l.add(new Callable<String>() {
851 <                      public String call() {
852 <                          try {
853 <                              latch.await();
854 <                          } catch (InterruptedException ok) {}
855 <                          return TEST_STRING;
856 <                      }});
1032 >        CountDownLatch latch = new CountDownLatch(1);
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 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1039 <            shouldThrow();
1040 <        } catch (NullPointerException success) {
1041 <        } finally {
1038 >            try {
1039 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1040 >                shouldThrow();
1041 >            } catch (NullPointerException success) {}
1042              latch.countDown();
863            joinPool(e);
1043          }
1044      }
1045  
# Line 868 | 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 <        try {
1052 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1055 <            shouldThrow();
1056 <        } catch (ExecutionException success) {
1057 <            assertTrue(success.getCause() instanceof NullPointerException);
1058 <        } finally {
1059 <            joinPool(e);
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 885 | 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 {
1069 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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);
895        } finally {
896            joinPool(e);
1074          }
1075      }
1076  
# Line 901 | 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 {
910 <            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 915 | 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 <        try {
1096 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
1099 <            shouldThrow();
1100 <        } catch (NullPointerException success) {
1101 <        } finally {
926 <            joinPool(e);
1098 >            try {
1099 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1100 >                shouldThrow();
1101 >            } catch (NullPointerException success) {}
1102          }
1103      }
1104  
# Line 931 | 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());
938        } finally {
939            joinPool(e);
1114          }
1115      }
1116  
# Line 944 | 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 <        try {
1123 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1127 <            shouldThrow();
1128 <        } catch (NullPointerException success) {
1129 <        } finally {
956 <            joinPool(e);
1126 >            try {
1127 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1128 >                shouldThrow();
1129 >            } catch (NullPointerException success) {}
1130          }
1131      }
1132  
# Line 961 | 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 <        try {
1139 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1142 <            assertEquals(1, result.size());
1143 <            for (Future<String> future : result)
1144 <                future.get();
1145 <            shouldThrow();
1146 <        } catch (ExecutionException success) {
1147 <            assertTrue(success.getCause() instanceof NullPointerException);
1148 <        } finally {
1149 <            joinPool(e);
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 981 | 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 {
1159 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1163 <            assertEquals(2, result.size());
1164 <            for (Future<String> future : result)
1162 >            List<Future<String>> futures =
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());
993        } finally {
994            joinPool(e);
1167          }
1168      }
1169  
# Line 999 | 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 <            ArrayList<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>> result = e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1181 <            assertEquals(3, result.size());
1182 <            Iterator<Future<String>> it = result.iterator();
1183 <            Future<String> f1 = it.next();
1184 <            Future<String> f2 = it.next();
1185 <            Future<String> f3 = it.next();
1186 <            assertTrue(f1.isDone());
1187 <            assertTrue(f2.isDone());
1188 <            assertTrue(f3.isDone());
1189 <            assertFalse(f1.isCancelled());
1190 <            assertTrue(f2.isCancelled());
1191 <        } finally {
1192 <            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  
1024
1202   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines