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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines