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.10 by dl, Mon Dec 22 00:48:56 2003 UTC vs.
Revision 1.53 by jsr166, Sun Sep 27 18:50:50 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines