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.13 by dl, Sat Dec 27 19:26:43 2003 UTC vs.
Revision 1.57 by jsr166, Mon Sep 28 03:05:23 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
5 < * Other contributors include Andrew Wright, Jeffrey Hayes,
6 < * Pat Fisher, Mike Judd.
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 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  
21
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 <            p1.shutdown();
52 <            try {
53 <                Thread.sleep(MEDIUM_DELAY_MS);
54 <            } catch(InterruptedException e){
55 <                unexpectedException();
37 <            }
38 <            assertTrue(runnable.done);
39 <            p1.shutdown();
40 <            joinPool(p1);
41 <        }
42 <        catch(Exception e){
43 <            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          }
45        
57      }
58  
48
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 <            p1.shutdown();
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 <            p1.shutdown();
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 <    
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 <            p1.shutdown();
117 <            joinPool(p1);
118 <        } catch(Exception e){
119 <            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  
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 <            p1.shutdown();
141 <            joinPool(p1);
142 <        } catch(Exception e){
143 <            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() 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() 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 <    
212 >
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){}
223 <        catch(Exception e){
224 <            unexpectedException();
139 <        }
140 <        
141 <        joinPool(se);
222 >        } catch (NullPointerException success) {}
223 >
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){
155 <            unexpectedException();
156 <        }
157 <        joinPool(se);
236 >        } catch (NullPointerException success) {}
237 >        joinPool(se);
238      }
239 <  
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){
250 >        } catch (RejectedExecutionException success) {
251 >        } catch (SecurityException ok) {
252          }
172        joinPool(se);
253  
254 +        joinPool(se);
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){
267 >        } catch (RejectedExecutionException success) {
268 >        } catch (SecurityException ok) {
269          }
270          joinPool(se);
271      }
# Line 191 | 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 <        }
285 <         joinPool(se);
283 >        } catch (RejectedExecutionException success) {
284 >        } catch (SecurityException ok) {
285 >        }
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 <        }
299 >        } catch (RejectedExecutionException success) {
300 >        } catch (SecurityException ok) {
301 >        }
302          joinPool(se);
303      }
304 <    
304 >
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 <        }
315 >        } catch (RejectedExecutionException success) {
316 >        } catch (SecurityException ok) {
317 >        }
318          joinPool(se);
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          }
249        assertEquals(1, p2.getActiveCount());
250        joinPool(p2);
343      }
344 <    
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          }
266        assertEquals(1, p2.getCompletedTaskCount());
267        joinPool(p2);
376      }
377 <    
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 <    
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          }
293        assertEquals(2, p2.getLargestPoolSize());
294        joinPool(p2);
412      }
413 <    
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 <    
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          }
323        assertEquals(5, p1.getTaskCount());
324        joinPool(p1);
461      }
462  
463 <    /**
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());
334        p.shutdown();
470          joinPool(p);
471      }
472  
473 <    /**
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());
346        p.shutdown();
481          joinPool(p);
482      }
483  
484 <    /**
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 360 | Line 494 | public class ScheduledExecutorTest exten
494              joinPool(p);
495          }
496      }
497 <    
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);
502 >
503 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
504          try {
505 <            assertFalse(p1.isShutdown());
505 >            assertFalse(p.isShutdown());
506          }
507          finally {
508 <            p1.shutdown();
508 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
509          }
510 <        assertTrue(p1.isShutdown());
510 >        assertTrue(p.isShutdown());
511      }
512  
379        
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 <            p1.shutdown();
532 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
533          }
534 <        try {
535 <            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
392 <            assertTrue(p1.isTerminated());
393 <        } catch(Exception e){
394 <            unexpectedException();
395 <        }      
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 <            p1.shutdown();
557 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
558          }
559 <        try {
560 <            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
561 <            assertTrue(p1.isTerminated());
413 <            assertFalse(p1.isTerminating());
414 <        } catch(Exception e){
415 <            unexpectedException();
416 <        }      
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++){
426 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, TimeUnit.MILLISECONDS);
427 <        }
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]));
433            p1.shutdownNow();
434        } catch(Exception e) {
435            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);
449 <        }
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]));
462            p1.shutdownNow();
463        } catch(Exception e) {
464            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(), 1, TimeUnit.MILLISECONDS);
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 = 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 >            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 >            for (ScheduledFuture task : tasks)
650 >                task.cancel(true);
651 >            joinPool(p);
652          }
479        int max = 5;
480        if (tasks[4].cancel(true)) --max;
481        if (tasks[3].cancel(true)) --max;
482        p1.purge();
483        long count = p1.getTaskCount();
484        assertTrue(count > 0 && count <= max);
485        joinPool(p1);
653      }
654  
655      /**
656 <     *  shutDownNow returns a list containing tasks that were not run
657 <     */
658 <    public void testShutDownNow() {
659 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
660 <        for(int i = 0; i < 5; i++)
661 <            p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
662 <        List l = p1.shutdownNow();
663 <        assertTrue(p1.isShutdown());
664 <        assertTrue(l.size() > 0 && l.size() <= 5);
665 <        joinPool(p1);
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() 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 >        CheckedRunnable 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 >            queuedTasks = p.shutdownNow();
681 >        } catch (SecurityException ok) {
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 >
693 >    /**
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 >            queuedTasks = p.shutdownNow();
711 >        } catch (SecurityException ok) {
712 >            return; // Allowed in case test doesn't have privs
713 >        }
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  
727      /**
728       * In default setting, shutdown cancels periodic but not delayed
729       * tasks at shutdown
730       */
731 <    public void testShutDown1() {
732 <        try {
733 <            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
734 <            assertTrue(p1.getExecuteExistingDelayedTasksAfterShutdownPolicy());
509 <            assertFalse(p1.getContinueExistingPeriodicTasksAfterShutdownPolicy());
731 >    public void testShutdown1() throws InterruptedException {
732 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
733 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
734 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
735  
736 <            ScheduledFuture[] tasks = new ScheduledFuture[5];
737 <            for(int i = 0; i < 5; i++)
738 <                tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
739 <            p1.shutdown();
740 <            BlockingQueue q = p1.getQueue();
741 <            for (Iterator it = q.iterator(); it.hasNext();) {
742 <                ScheduledFuture t = (ScheduledFuture)it.next();
743 <                assertFalse(t.isCancelled());
744 <            }
745 <            assertTrue(p1.isShutdown());
521 <            Thread.sleep(SMALL_DELAY_MS);
522 <            for (int i = 0; i < 5; ++i) {
523 <                assertTrue(tasks[i].isDone());
524 <                assertFalse(tasks[i].isCancelled());
525 <            }
526 <            
736 >        ScheduledFuture[] tasks = new ScheduledFuture[5];
737 >        for (int i = 0; i < tasks.length; i++)
738 >            tasks[i] = p.schedule(new NoOpRunnable(),
739 >                                  SHORT_DELAY_MS, MILLISECONDS);
740 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
741 >        BlockingQueue<Runnable> q = p.getQueue();
742 >        for (ScheduledFuture task : tasks) {
743 >            assertFalse(task.isDone());
744 >            assertFalse(task.isCancelled());
745 >            assertTrue(q.contains(task));
746          }
747 <        catch(Exception ex) {
748 <            unexpectedException();
747 >        assertTrue(p.isShutdown());
748 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
749 >        assertTrue(p.isTerminated());
750 >        for (ScheduledFuture task : tasks) {
751 >            assertTrue(task.isDone());
752 >            assertFalse(task.isCancelled());
753          }
754      }
755  
533
756      /**
757       * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
758       * delayed tasks are cancelled at shutdown
759       */
760 <    public void testShutDown2() {
761 <        try {
762 <            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
763 <            p1.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
764 <            ScheduledFuture[] tasks = new ScheduledFuture[5];
765 <            for(int i = 0; i < 5; i++)
766 <                tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
767 <            p1.shutdown();
768 <            assertTrue(p1.isShutdown());
769 <            BlockingQueue q = p1.getQueue();
770 <            assertTrue(q.isEmpty());
771 <            Thread.sleep(SMALL_DELAY_MS);
772 <            assertTrue(p1.isTerminated());
773 <        }
774 <        catch(Exception ex) {
775 <            unexpectedException();
760 >    public void testShutdown2() throws InterruptedException {
761 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
762 >        p.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
763 >        assertFalse(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
764 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
765 >        ScheduledFuture[] tasks = new ScheduledFuture[5];
766 >        for (int i = 0; i < tasks.length; i++)
767 >            tasks[i] = p.schedule(new NoOpRunnable(),
768 >                                  SHORT_DELAY_MS, MILLISECONDS);
769 >        BlockingQueue q = p.getQueue();
770 >        assertEquals(tasks.length, q.size());
771 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
772 >        assertTrue(p.isShutdown());
773 >        assertTrue(q.isEmpty());
774 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
775 >        assertTrue(p.isTerminated());
776 >        for (ScheduledFuture task : tasks) {
777 >            assertTrue(task.isDone());
778 >            assertTrue(task.isCancelled());
779          }
780      }
781  
557
782      /**
783       * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
784 <     * periodic tasks are not cancelled at shutdown
784 >     * periodic tasks are cancelled at shutdown
785       */
786 <    public void testShutDown3() {
787 <        try {
788 <            ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
789 <            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
790 <            ScheduledFuture task =
791 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, TimeUnit.MILLISECONDS);
792 <            p1.shutdown();
793 <            assertTrue(p1.isShutdown());
794 <            BlockingQueue q = p1.getQueue();
795 <            assertTrue(q.isEmpty());
796 <            Thread.sleep(SHORT_DELAY_MS);
797 <            assertTrue(p1.isTerminated());
798 <        }
799 <        catch(Exception ex) {
800 <            unexpectedException();
801 <        }
786 >    public void testShutdown3() throws InterruptedException {
787 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
788 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
789 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
790 >        p.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
791 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
792 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
793 >        long initialDelay = LONG_DELAY_MS;
794 >        ScheduledFuture task =
795 >            p.scheduleAtFixedRate(new NoOpRunnable(), initialDelay,
796 >                                  5, MILLISECONDS);
797 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
798 >        assertTrue(p.isShutdown());
799 >        assertTrue(p.getQueue().isEmpty());
800 >        assertTrue(task.isDone());
801 >        assertTrue(task.isCancelled());
802 >        joinPool(p);
803      }
804  
805      /**
806       * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
807 <     * periodic tasks are cancelled at shutdown
807 >     * periodic tasks are not cancelled at shutdown
808       */
809 <    public void testShutDown4() {
810 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
811 <        try {
812 <            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
809 >    public void testShutdown4() throws InterruptedException {
810 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
811 >        final CountDownLatch counter = new CountDownLatch(2);
812 >        try {
813 >            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
814 >            assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
815 >            assertTrue(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
816 >            final Runnable r = new CheckedRunnable() {
817 >                public void realRun() {
818 >                    counter.countDown();
819 >                }};
820              ScheduledFuture task =
821 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, TimeUnit.MILLISECONDS);
821 >                p.scheduleAtFixedRate(r, 1, 1, MILLISECONDS);
822 >            assertFalse(task.isDone());
823              assertFalse(task.isCancelled());
824 <            p1.shutdown();
824 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
825              assertFalse(task.isCancelled());
826 <            assertFalse(p1.isTerminated());
827 <            assertTrue(p1.isShutdown());
828 <            Thread.sleep(SHORT_DELAY_MS);
826 >            assertFalse(p.isTerminated());
827 >            assertTrue(p.isShutdown());
828 >            assertTrue(counter.await(SMALL_DELAY_MS, MILLISECONDS));
829              assertFalse(task.isCancelled());
830 <            task.cancel(true);
830 >            assertTrue(task.cancel(false));
831 >            assertTrue(task.isDone());
832              assertTrue(task.isCancelled());
833 <            Thread.sleep(SHORT_DELAY_MS);
834 <            assertTrue(p1.isTerminated());
601 <        }
602 <        catch(Exception ex) {
603 <            unexpectedException();
833 >            assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
834 >            assertTrue(p.isTerminated());
835          }
836          finally {
837 <            p1.shutdownNow();
837 >            joinPool(p);
838          }
839      }
840  
841      /**
842       * completed submit of callable returns result
843       */
844 <    public void testSubmitCallable() {
844 >    public void testSubmitCallable() throws Exception {
845          ExecutorService e = new ScheduledThreadPoolExecutor(2);
846          try {
847              Future<String> future = e.submit(new StringTask());
848              String result = future.get();
849              assertSame(TEST_STRING, result);
619        }
620        catch (ExecutionException ex) {
621            unexpectedException();
622        }
623        catch (InterruptedException ex) {
624            unexpectedException();
850          } finally {
851              joinPool(e);
852          }
# Line 630 | Line 855 | public class ScheduledExecutorTest exten
855      /**
856       * completed submit of runnable returns successfully
857       */
858 <    public void testSubmitRunnable() {
858 >    public void testSubmitRunnable() throws Exception {
859          ExecutorService e = new ScheduledThreadPoolExecutor(2);
860          try {
861              Future<?> future = e.submit(new NoOpRunnable());
862              future.get();
863              assertTrue(future.isDone());
639        }
640        catch (ExecutionException ex) {
641            unexpectedException();
642        }
643        catch (InterruptedException ex) {
644            unexpectedException();
864          } finally {
865              joinPool(e);
866          }
# Line 650 | Line 869 | public class ScheduledExecutorTest exten
869      /**
870       * completed submit of (runnable, result) returns result
871       */
872 <    public void testSubmitRunnable2() {
872 >    public void testSubmitRunnable2() throws Exception {
873          ExecutorService e = new ScheduledThreadPoolExecutor(2);
874          try {
875              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
876              String result = future.get();
877              assertSame(TEST_STRING, result);
659        }
660        catch (ExecutionException ex) {
661            unexpectedException();
662        }
663        catch (InterruptedException ex) {
664            unexpectedException();
878          } finally {
879              joinPool(e);
880          }
881      }
882  
670
671
672
673
883      /**
884       * invokeAny(null) throws NPE
885       */
886 <    public void testInvokeAny1() {
886 >    public void testInvokeAny1() throws Exception {
887          ExecutorService e = new ScheduledThreadPoolExecutor(2);
888          try {
889              e.invokeAny(null);
890 +            shouldThrow();
891          } catch (NullPointerException success) {
682        } catch(Exception ex) {
683            unexpectedException();
892          } finally {
893              joinPool(e);
894          }
# Line 689 | Line 897 | public class ScheduledExecutorTest exten
897      /**
898       * invokeAny(empty collection) throws IAE
899       */
900 <    public void testInvokeAny2() {
900 >    public void testInvokeAny2() throws Exception {
901          ExecutorService e = new ScheduledThreadPoolExecutor(2);
902          try {
903              e.invokeAny(new ArrayList<Callable<String>>());
904 +            shouldThrow();
905          } catch (IllegalArgumentException success) {
697        } catch(Exception ex) {
698            unexpectedException();
906          } finally {
907              joinPool(e);
908          }
# Line 704 | Line 911 | public class ScheduledExecutorTest exten
911      /**
912       * invokeAny(c) throws NPE if c has null elements
913       */
914 <    public void testInvokeAny3() {
914 >    public void testInvokeAny3() throws Exception {
915 >        CountDownLatch latch = new CountDownLatch(1);
916          ExecutorService e = new ScheduledThreadPoolExecutor(2);
917 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
918 +        l.add(latchAwaitingStringTask(latch));
919 +        l.add(null);
920          try {
710            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
711            l.add(new StringTask());
712            l.add(null);
921              e.invokeAny(l);
922 +            shouldThrow();
923          } catch (NullPointerException success) {
715        } catch(Exception ex) {
716            unexpectedException();
924          } finally {
925 +            latch.countDown();
926              joinPool(e);
927          }
928      }
# Line 722 | Line 930 | public class ScheduledExecutorTest exten
930      /**
931       * invokeAny(c) throws ExecutionException if no task completes
932       */
933 <    public void testInvokeAny4() {
933 >    public void testInvokeAny4() throws Exception {
934          ExecutorService e = new ScheduledThreadPoolExecutor(2);
935 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
936 +        l.add(new NPETask());
937          try {
728            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
729            l.add(new NPETask());
938              e.invokeAny(l);
939 +            shouldThrow();
940          } catch (ExecutionException success) {
941 <        } catch(Exception ex) {
733 <            unexpectedException();
941 >            assertTrue(success.getCause() instanceof NullPointerException);
942          } finally {
943              joinPool(e);
944          }
# Line 739 | Line 947 | public class ScheduledExecutorTest exten
947      /**
948       * invokeAny(c) returns result of some task
949       */
950 <    public void testInvokeAny5() {
950 >    public void testInvokeAny5() throws Exception {
951          ExecutorService e = new ScheduledThreadPoolExecutor(2);
952          try {
953 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
953 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
954              l.add(new StringTask());
955              l.add(new StringTask());
956              String result = e.invokeAny(l);
957              assertSame(TEST_STRING, result);
750        } catch (ExecutionException success) {
751        } catch(Exception ex) {
752            unexpectedException();
958          } finally {
959              joinPool(e);
960          }
# Line 758 | Line 963 | public class ScheduledExecutorTest exten
963      /**
964       * invokeAll(null) throws NPE
965       */
966 <    public void testInvokeAll1() {
966 >    public void testInvokeAll1() throws Exception {
967          ExecutorService e = new ScheduledThreadPoolExecutor(2);
968          try {
969              e.invokeAll(null);
970 +            shouldThrow();
971          } catch (NullPointerException success) {
766        } catch(Exception ex) {
767            unexpectedException();
972          } finally {
973              joinPool(e);
974          }
# Line 773 | Line 977 | public class ScheduledExecutorTest exten
977      /**
978       * invokeAll(empty collection) returns empty collection
979       */
980 <    public void testInvokeAll2() {
980 >    public void testInvokeAll2() throws Exception {
981          ExecutorService e = new ScheduledThreadPoolExecutor(2);
982          try {
983              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
984              assertTrue(r.isEmpty());
781        } catch(Exception ex) {
782            unexpectedException();
985          } finally {
986              joinPool(e);
987          }
# Line 788 | Line 990 | public class ScheduledExecutorTest exten
990      /**
991       * invokeAll(c) throws NPE if c has null elements
992       */
993 <    public void testInvokeAll3() {
993 >    public void testInvokeAll3() throws Exception {
994          ExecutorService e = new ScheduledThreadPoolExecutor(2);
995 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
996 +        l.add(new StringTask());
997 +        l.add(null);
998          try {
794            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
795            l.add(new StringTask());
796            l.add(null);
999              e.invokeAll(l);
1000 +            shouldThrow();
1001          } catch (NullPointerException success) {
799        } catch(Exception ex) {
800            unexpectedException();
1002          } finally {
1003              joinPool(e);
1004          }
# Line 806 | Line 1007 | public class ScheduledExecutorTest exten
1007      /**
1008       * get of invokeAll(c) throws exception on failed task
1009       */
1010 <    public void testInvokeAll4() {
1010 >    public void testInvokeAll4() throws Exception {
1011          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1012 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1013 +        l.add(new NPETask());
1014 +        List<Future<String>> futures = e.invokeAll(l);
1015 +        assertEquals(1, futures.size());
1016          try {
1017 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1018 <            l.add(new NPETask());
1019 <            List<Future<String>> result = e.invokeAll(l);
1020 <            assertEquals(1, result.size());
816 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
817 <                it.next().get();
818 <        } catch(ExecutionException success) {
819 <        } catch(Exception ex) {
820 <            unexpectedException();
1017 >            futures.get(0).get();
1018 >            shouldThrow();
1019 >        } catch (ExecutionException success) {
1020 >            assertTrue(success.getCause() instanceof NullPointerException);
1021          } finally {
1022              joinPool(e);
1023          }
# Line 826 | Line 1026 | public class ScheduledExecutorTest exten
1026      /**
1027       * invokeAll(c) returns results of all completed tasks
1028       */
1029 <    public void testInvokeAll5() {
1029 >    public void testInvokeAll5() throws Exception {
1030          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1031          try {
1032 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1032 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1033              l.add(new StringTask());
1034              l.add(new StringTask());
1035 <            List<Future<String>> result = e.invokeAll(l);
1036 <            assertEquals(2, result.size());
1037 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1038 <                assertSame(TEST_STRING, it.next().get());
839 <        } catch (ExecutionException success) {
840 <        } catch(Exception ex) {
841 <            unexpectedException();
1035 >            List<Future<String>> futures = e.invokeAll(l);
1036 >            assertEquals(2, futures.size());
1037 >            for (Future<String> future : futures)
1038 >                assertSame(TEST_STRING, future.get());
1039          } finally {
1040              joinPool(e);
1041          }
# Line 847 | Line 1044 | public class ScheduledExecutorTest exten
1044      /**
1045       * timed invokeAny(null) throws NPE
1046       */
1047 <    public void testTimedInvokeAny1() {
1047 >    public void testTimedInvokeAny1() throws Exception {
1048          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1049          try {
1050 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1050 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1051 >            shouldThrow();
1052          } catch (NullPointerException success) {
855        } catch(Exception ex) {
856            unexpectedException();
1053          } finally {
1054              joinPool(e);
1055          }
# Line 862 | Line 1058 | public class ScheduledExecutorTest exten
1058      /**
1059       * timed invokeAny(,,null) throws NPE
1060       */
1061 <    public void testTimedInvokeAnyNullTimeUnit() {
1061 >    public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1062          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1063 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1064 +        l.add(new StringTask());
1065          try {
868            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
869            l.add(new StringTask());
1066              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1067 +            shouldThrow();
1068          } catch (NullPointerException success) {
872        } catch(Exception ex) {
873            unexpectedException();
1069          } finally {
1070              joinPool(e);
1071          }
# Line 879 | Line 1074 | public class ScheduledExecutorTest exten
1074      /**
1075       * timed invokeAny(empty collection) throws IAE
1076       */
1077 <    public void testTimedInvokeAny2() {
1077 >    public void testTimedInvokeAny2() throws Exception {
1078          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1079          try {
1080 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1080 >            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1081 >            shouldThrow();
1082          } catch (IllegalArgumentException success) {
887        } catch(Exception ex) {
888            unexpectedException();
1083          } finally {
1084              joinPool(e);
1085          }
# Line 894 | Line 1088 | public class ScheduledExecutorTest exten
1088      /**
1089       * timed invokeAny(c) throws NPE if c has null elements
1090       */
1091 <    public void testTimedInvokeAny3() {
1091 >    public void testTimedInvokeAny3() throws Exception {
1092 >        CountDownLatch latch = new CountDownLatch(1);
1093          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1094 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1095 +        l.add(latchAwaitingStringTask(latch));
1096 +        l.add(null);
1097          try {
1098 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1099 <            l.add(new StringTask());
902 <            l.add(null);
903 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1098 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1099 >            shouldThrow();
1100          } catch (NullPointerException success) {
905        } catch(Exception ex) {
906            ex.printStackTrace();
907            unexpectedException();
1101          } finally {
1102 +            latch.countDown();
1103              joinPool(e);
1104          }
1105      }
# Line 913 | Line 1107 | public class ScheduledExecutorTest exten
1107      /**
1108       * timed invokeAny(c) throws ExecutionException if no task completes
1109       */
1110 <    public void testTimedInvokeAny4() {
1110 >    public void testTimedInvokeAny4() throws Exception {
1111          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1112 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1113 +        l.add(new NPETask());
1114          try {
1115 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1116 <            l.add(new NPETask());
1117 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1118 <        } catch(ExecutionException success) {
923 <        } catch(Exception ex) {
924 <            unexpectedException();
1115 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1116 >            shouldThrow();
1117 >        } catch (ExecutionException success) {
1118 >            assertTrue(success.getCause() instanceof NullPointerException);
1119          } finally {
1120              joinPool(e);
1121          }
# Line 930 | Line 1124 | public class ScheduledExecutorTest exten
1124      /**
1125       * timed invokeAny(c) returns result of some task
1126       */
1127 <    public void testTimedInvokeAny5() {
1127 >    public void testTimedInvokeAny5() throws Exception {
1128          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1129          try {
1130 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1130 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1131              l.add(new StringTask());
1132              l.add(new StringTask());
1133 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1133 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1134              assertSame(TEST_STRING, result);
941        } catch (ExecutionException success) {
942        } catch(Exception ex) {
943            unexpectedException();
1135          } finally {
1136              joinPool(e);
1137          }
# Line 949 | Line 1140 | public class ScheduledExecutorTest exten
1140      /**
1141       * timed invokeAll(null) throws NPE
1142       */
1143 <    public void testTimedInvokeAll1() {
1143 >    public void testTimedInvokeAll1() throws Exception {
1144          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1145          try {
1146 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1146 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1147 >            shouldThrow();
1148          } catch (NullPointerException success) {
957        } catch(Exception ex) {
958            unexpectedException();
1149          } finally {
1150              joinPool(e);
1151          }
# Line 964 | Line 1154 | public class ScheduledExecutorTest exten
1154      /**
1155       * timed invokeAll(,,null) throws NPE
1156       */
1157 <    public void testTimedInvokeAllNullTimeUnit() {
1157 >    public void testTimedInvokeAllNullTimeUnit() throws Exception {
1158          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1159 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1160 +        l.add(new StringTask());
1161          try {
970            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
971            l.add(new StringTask());
1162              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1163 +            shouldThrow();
1164          } catch (NullPointerException success) {
974        } catch(Exception ex) {
975            unexpectedException();
1165          } finally {
1166              joinPool(e);
1167          }
# Line 981 | Line 1170 | public class ScheduledExecutorTest exten
1170      /**
1171       * timed invokeAll(empty collection) returns empty collection
1172       */
1173 <    public void testTimedInvokeAll2() {
1173 >    public void testTimedInvokeAll2() throws Exception {
1174          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1175          try {
1176 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1176 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1177              assertTrue(r.isEmpty());
989        } catch(Exception ex) {
990            unexpectedException();
1178          } finally {
1179              joinPool(e);
1180          }
# Line 996 | Line 1183 | public class ScheduledExecutorTest exten
1183      /**
1184       * timed invokeAll(c) throws NPE if c has null elements
1185       */
1186 <    public void testTimedInvokeAll3() {
1186 >    public void testTimedInvokeAll3() throws Exception {
1187          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1188 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1189 +        l.add(new StringTask());
1190 +        l.add(null);
1191          try {
1192 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1193 <            l.add(new StringTask());
1004 <            l.add(null);
1005 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1192 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1193 >            shouldThrow();
1194          } catch (NullPointerException success) {
1007        } catch(Exception ex) {
1008            unexpectedException();
1195          } finally {
1196              joinPool(e);
1197          }
# Line 1014 | Line 1200 | public class ScheduledExecutorTest exten
1200      /**
1201       * get of element of invokeAll(c) throws exception on failed task
1202       */
1203 <    public void testTimedInvokeAll4() {
1203 >    public void testTimedInvokeAll4() throws Exception {
1204          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1205 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1206 +        l.add(new NPETask());
1207 +        List<Future<String>> futures =
1208 +            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1209 +        assertEquals(1, futures.size());
1210          try {
1211 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1212 <            l.add(new NPETask());
1213 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1214 <            assertEquals(1, result.size());
1024 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1025 <                it.next().get();
1026 <        } catch(ExecutionException success) {
1027 <        } catch(Exception ex) {
1028 <            unexpectedException();
1211 >            futures.get(0).get();
1212 >            shouldThrow();
1213 >        } catch (ExecutionException success) {
1214 >            assertTrue(success.getCause() instanceof NullPointerException);
1215          } finally {
1216              joinPool(e);
1217          }
# Line 1034 | Line 1220 | public class ScheduledExecutorTest exten
1220      /**
1221       * timed invokeAll(c) returns results of all completed tasks
1222       */
1223 <    public void testTimedInvokeAll5() {
1223 >    public void testTimedInvokeAll5() throws Exception {
1224          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1225          try {
1226 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1226 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1227              l.add(new StringTask());
1228              l.add(new StringTask());
1229 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1230 <            assertEquals(2, result.size());
1231 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1232 <                assertSame(TEST_STRING, it.next().get());
1233 <        } catch (ExecutionException success) {
1048 <        } catch(Exception ex) {
1049 <            unexpectedException();
1229 >            List<Future<String>> futures =
1230 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1231 >            assertEquals(2, futures.size());
1232 >            for (Future<String> future : futures)
1233 >                assertSame(TEST_STRING, future.get());
1234          } finally {
1235              joinPool(e);
1236          }
# Line 1055 | Line 1239 | public class ScheduledExecutorTest exten
1239      /**
1240       * timed invokeAll(c) cancels tasks not completed by timeout
1241       */
1242 <    public void testTimedInvokeAll6() {
1242 >    public void testTimedInvokeAll6() throws Exception {
1243          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1244          try {
1245 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1246 <            l.add(new StringTask());
1247 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1248 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
1249 <            assertEquals(2, result.size());
1250 <            Iterator<Future<String>> it = result.iterator();
1251 <            Future<String> f1 = it.next();
1252 <            Future<String> f2 = it.next();
1253 <            assertTrue(f1.isDone());
1254 <            assertFalse(f1.isCancelled());
1255 <            assertTrue(f2.isDone());
1256 <            assertTrue(f2.isCancelled());
1257 <        } catch(Exception ex) {
1258 <            unexpectedException();
1245 >            for (long timeout = timeoutMillis();;) {
1246 >                List<Callable<String>> tasks = new ArrayList<>();
1247 >                tasks.add(new StringTask("0"));
1248 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1249 >                tasks.add(new StringTask("2"));
1250 >                long startTime = System.nanoTime();
1251 >                List<Future<String>> futures =
1252 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1253 >                assertEquals(tasks.size(), futures.size());
1254 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1255 >                for (Future future : futures)
1256 >                    assertTrue(future.isDone());
1257 >                assertTrue(futures.get(1).isCancelled());
1258 >                try {
1259 >                    assertEquals("0", futures.get(0).get());
1260 >                    assertEquals("2", futures.get(2).get());
1261 >                    break;
1262 >                } catch (CancellationException retryWithLongerTimeout) {
1263 >                    timeout *= 2;
1264 >                    if (timeout >= LONG_DELAY_MS / 2)
1265 >                        fail("expected exactly one task to be cancelled");
1266 >                }
1267 >            }
1268          } finally {
1269              joinPool(e);
1270          }
1271      }
1272  
1080
1273   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines