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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines