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.27 by jsr166, Sat Nov 21 17:38:05 2009 UTC vs.
Revision 1.56 by jsr166, Mon Sep 28 02:41:29 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import junit.framework.*;
10 import java.util.*;
11 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.util.concurrent.atomic.*;
10 > import static java.util.concurrent.TimeUnit.SECONDS;
11 >
12 > import java.util.ArrayList;
13 > import java.util.HashSet;
14 > import java.util.List;
15 > import java.util.concurrent.BlockingQueue;
16 > import java.util.concurrent.Callable;
17 > import java.util.concurrent.CancellationException;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.ExecutionException;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.Future;
23 > import java.util.concurrent.RejectedExecutionException;
24 > import java.util.concurrent.ScheduledFuture;
25 > import java.util.concurrent.ScheduledThreadPoolExecutor;
26 > import java.util.concurrent.ThreadFactory;
27 > import java.util.concurrent.ThreadPoolExecutor;
28 > import java.util.concurrent.atomic.AtomicInteger;
29 >
30 > import junit.framework.Test;
31 > import junit.framework.TestSuite;
32  
33   public class ScheduledExecutorTest extends JSR166TestCase {
34      public static void main(String[] args) {
35 <        junit.textui.TestRunner.run (suite());
35 >        main(suite(), args);
36      }
37      public static Test suite() {
38          return new TestSuite(ScheduledExecutorTest.class);
39      }
40  
23
41      /**
42       * execute successfully executes a runnable
43       */
44      public void testExecute() throws InterruptedException {
45 <        TrackedShortRunnable runnable =new TrackedShortRunnable();
46 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
47 <        p1.execute(runnable);
48 <        assertFalse(runnable.done);
49 <        Thread.sleep(SHORT_DELAY_MS);
50 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
51 <        Thread.sleep(MEDIUM_DELAY_MS);
52 <        assertTrue(runnable.done);
53 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
54 <        joinPool(p1);
45 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
46 >        final CountDownLatch done = new CountDownLatch(1);
47 >        final Runnable task = new CheckedRunnable() {
48 >            public void realRun() {
49 >                done.countDown();
50 >            }};
51 >        try {
52 >            p.execute(task);
53 >            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
54 >        } finally {
55 >            joinPool(p);
56 >        }
57      }
58  
40
59      /**
60       * delayed schedule of callable successfully executes after delay
61       */
62      public void testSchedule1() throws Exception {
63 <        TrackedCallable callable = new TrackedCallable();
64 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
65 <        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
66 <        assertFalse(callable.done);
67 <        Thread.sleep(MEDIUM_DELAY_MS);
68 <        assertTrue(callable.done);
69 <        assertEquals(Boolean.TRUE, f.get());
70 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
71 <        joinPool(p1);
63 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
64 >        final long startTime = System.nanoTime();
65 >        final CountDownLatch done = new CountDownLatch(1);
66 >        try {
67 >            Callable task = new CheckedCallable<Boolean>() {
68 >                public Boolean realCall() {
69 >                    done.countDown();
70 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
71 >                    return Boolean.TRUE;
72 >                }};
73 >            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
74 >            assertSame(Boolean.TRUE, f.get());
75 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
76 >            assertTrue(done.await(0L, MILLISECONDS));
77 >        } finally {
78 >            joinPool(p);
79 >        }
80      }
81  
82      /**
83 <     *  delayed schedule of runnable successfully executes after delay
84 <     */
85 <    public void testSchedule3() throws InterruptedException {
86 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
87 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
88 <        p1.schedule(runnable, SMALL_DELAY_MS, MILLISECONDS);
89 <        Thread.sleep(SHORT_DELAY_MS);
90 <        assertFalse(runnable.done);
91 <        Thread.sleep(MEDIUM_DELAY_MS);
92 <        assertTrue(runnable.done);
93 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
94 <        joinPool(p1);
83 >     * delayed schedule of runnable successfully executes after delay
84 >     */
85 >    public void testSchedule3() throws Exception {
86 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
87 >        final long startTime = System.nanoTime();
88 >        final CountDownLatch done = new CountDownLatch(1);
89 >        try {
90 >            Runnable task = new CheckedRunnable() {
91 >                public void realRun() {
92 >                    done.countDown();
93 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
94 >                }};
95 >            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
96 >            await(done);
97 >            assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
98 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
99 >        } finally {
100 >            joinPool(p);
101 >        }
102      }
103  
104      /**
105       * scheduleAtFixedRate executes runnable after given initial delay
106       */
107 <    public void testSchedule4() throws InterruptedException {
108 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
109 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
110 <        ScheduledFuture h = p1.scheduleAtFixedRate(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, MILLISECONDS);
111 <        assertFalse(runnable.done);
112 <        Thread.sleep(MEDIUM_DELAY_MS);
113 <        assertTrue(runnable.done);
114 <        h.cancel(true);
115 <        joinPool(p1);
116 <    }
117 <
118 <    static class RunnableCounter implements Runnable {
119 <        AtomicInteger count = new AtomicInteger(0);
120 <        public void run() { count.getAndIncrement(); }
107 >    public void testSchedule4() throws Exception {
108 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
109 >        final long startTime = System.nanoTime();
110 >        final CountDownLatch done = new CountDownLatch(1);
111 >        try {
112 >            Runnable task = new CheckedRunnable() {
113 >                public void realRun() {
114 >                    done.countDown();
115 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
116 >                }};
117 >            ScheduledFuture f =
118 >                p.scheduleAtFixedRate(task, timeoutMillis(),
119 >                                      LONG_DELAY_MS, MILLISECONDS);
120 >            await(done);
121 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
122 >            f.cancel(true);
123 >        } finally {
124 >            joinPool(p);
125 >        }
126      }
127  
128      /**
129       * scheduleWithFixedDelay executes runnable after given initial delay
130       */
131 <    public void testSchedule5() throws InterruptedException {
132 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
133 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
134 <        ScheduledFuture h = p1.scheduleWithFixedDelay(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, MILLISECONDS);
135 <        assertFalse(runnable.done);
136 <        Thread.sleep(MEDIUM_DELAY_MS);
137 <        assertTrue(runnable.done);
138 <        h.cancel(true);
139 <        joinPool(p1);
131 >    public void testSchedule5() throws Exception {
132 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
133 >        final long startTime = System.nanoTime();
134 >        final CountDownLatch done = new CountDownLatch(1);
135 >        try {
136 >            Runnable task = new CheckedRunnable() {
137 >                public void realRun() {
138 >                    done.countDown();
139 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
140 >                }};
141 >            ScheduledFuture f =
142 >                p.scheduleWithFixedDelay(task, timeoutMillis(),
143 >                                         LONG_DELAY_MS, MILLISECONDS);
144 >            await(done);
145 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
146 >            f.cancel(true);
147 >        } finally {
148 >            joinPool(p);
149 >        }
150 >    }
151 >
152 >    static class RunnableCounter implements Runnable {
153 >        AtomicInteger count = new AtomicInteger(0);
154 >        public void run() { count.getAndIncrement(); }
155      }
156  
157      /**
158       * scheduleAtFixedRate executes series of tasks at given rate
159       */
160      public void testFixedRateSequence() throws InterruptedException {
161 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
162 <        RunnableCounter counter = new RunnableCounter();
163 <        ScheduledFuture h =
164 <            p1.scheduleAtFixedRate(counter, 0, 1, MILLISECONDS);
165 <        Thread.sleep(SMALL_DELAY_MS);
166 <        h.cancel(true);
167 <        int c = counter.count.get();
168 <        // By time scaling conventions, we must have at least
169 <        // an execution per SHORT delay, but no more than one SHORT more
170 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
171 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
172 <        joinPool(p1);
161 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
162 >        try {
163 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
164 >                long startTime = System.nanoTime();
165 >                int cycles = 10;
166 >                final CountDownLatch done = new CountDownLatch(cycles);
167 >                Runnable task = new CheckedRunnable() {
168 >                    public void realRun() { done.countDown(); }};
169 >                ScheduledFuture h =
170 >                    p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
171 >                done.await();
172 >                h.cancel(true);
173 >                double normalizedTime =
174 >                    (double) millisElapsedSince(startTime) / delay;
175 >                if (normalizedTime >= cycles - 1 &&
176 >                    normalizedTime <= cycles)
177 >                    return;
178 >            }
179 >            throw new AssertionError("unexpected execution rate");
180 >        } finally {
181 >            joinPool(p);
182 >        }
183      }
184  
185      /**
186       * scheduleWithFixedDelay executes series of tasks with given period
187       */
188      public void testFixedDelaySequence() throws InterruptedException {
189 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
190 <        RunnableCounter counter = new RunnableCounter();
191 <        ScheduledFuture h =
192 <            p1.scheduleWithFixedDelay(counter, 0, 1, MILLISECONDS);
193 <        Thread.sleep(SMALL_DELAY_MS);
194 <        h.cancel(true);
195 <        int c = counter.count.get();
196 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
197 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
198 <        joinPool(p1);
189 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
190 >        try {
191 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
192 >                long startTime = System.nanoTime();
193 >                int cycles = 10;
194 >                final CountDownLatch done = new CountDownLatch(cycles);
195 >                Runnable task = new CheckedRunnable() {
196 >                    public void realRun() { done.countDown(); }};
197 >                ScheduledFuture h =
198 >                    p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
199 >                done.await();
200 >                h.cancel(true);
201 >                double normalizedTime =
202 >                    (double) millisElapsedSince(startTime) / delay;
203 >                if (normalizedTime >= cycles - 1 &&
204 >                    normalizedTime <= cycles)
205 >                    return;
206 >            }
207 >            throw new AssertionError("unexpected execution rate");
208 >        } finally {
209 >            joinPool(p);
210 >        }
211      }
212  
138
213      /**
214 <     *  execute (null) throws NPE
214 >     * execute(null) throws NPE
215       */
216      public void testExecuteNull() throws InterruptedException {
217          ScheduledThreadPoolExecutor se = null;
# Line 151 | Line 225 | public class ScheduledExecutorTest exten
225      }
226  
227      /**
228 <     * schedule (null) throws NPE
228 >     * schedule(null) throws NPE
229       */
230      public void testScheduleNull() throws InterruptedException {
231          ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
# Line 178 | Line 252 | public class ScheduledExecutorTest exten
252          }
253  
254          joinPool(se);
181
255      }
256  
257      /**
# Line 200 | Line 273 | public class ScheduledExecutorTest exten
273      /**
274       * schedule callable throws RejectedExecutionException if shutdown
275       */
276 <     public void testSchedule3_RejectedExecutionException() throws InterruptedException {
277 <         ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
278 <         try {
276 >    public void testSchedule3_RejectedExecutionException() throws InterruptedException {
277 >        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
278 >        try {
279              se.shutdown();
280              se.schedule(new NoOpCallable(),
281                          MEDIUM_DELAY_MS, MILLISECONDS);
# Line 210 | Line 283 | public class ScheduledExecutorTest exten
283          } catch (RejectedExecutionException success) {
284          } catch (SecurityException ok) {
285          }
286 <         joinPool(se);
286 >        joinPool(se);
287      }
288  
289      /**
290 <     *  scheduleAtFixedRate throws RejectedExecutionException if shutdown
290 >     * scheduleAtFixedRate throws RejectedExecutionException if shutdown
291       */
292      public void testScheduleAtFixedRate1_RejectedExecutionException() throws InterruptedException {
293          ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
# Line 246 | Line 319 | public class ScheduledExecutorTest exten
319      }
320  
321      /**
322 <     *  getActiveCount increases but doesn't overestimate, when a
323 <     *  thread becomes active
322 >     * getActiveCount increases but doesn't overestimate, when a
323 >     * thread becomes active
324       */
325      public void testGetActiveCount() throws InterruptedException {
326 <        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
327 <        assertEquals(0, p2.getActiveCount());
328 <        p2.execute(new SmallRunnable());
329 <        Thread.sleep(SHORT_DELAY_MS);
330 <        assertEquals(1, p2.getActiveCount());
331 <        joinPool(p2);
326 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
327 >        final CountDownLatch threadStarted = new CountDownLatch(1);
328 >        final CountDownLatch done = new CountDownLatch(1);
329 >        try {
330 >            assertEquals(0, p.getActiveCount());
331 >            p.execute(new CheckedRunnable() {
332 >                public void realRun() throws InterruptedException {
333 >                    threadStarted.countDown();
334 >                    assertEquals(1, p.getActiveCount());
335 >                    done.await();
336 >                }});
337 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
338 >            assertEquals(1, p.getActiveCount());
339 >        } finally {
340 >            done.countDown();
341 >            joinPool(p);
342 >        }
343      }
344  
345      /**
346 <     *    getCompletedTaskCount increases, but doesn't overestimate,
347 <     *   when tasks complete
346 >     * getCompletedTaskCount increases, but doesn't overestimate,
347 >     * when tasks complete
348       */
349      public void testGetCompletedTaskCount() throws InterruptedException {
350 <        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
351 <        assertEquals(0, p2.getCompletedTaskCount());
352 <        p2.execute(new SmallRunnable());
353 <        Thread.sleep(MEDIUM_DELAY_MS);
354 <        assertEquals(1, p2.getCompletedTaskCount());
355 <        joinPool(p2);
350 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
351 >        final CountDownLatch threadStarted = new CountDownLatch(1);
352 >        final CountDownLatch threadProceed = new CountDownLatch(1);
353 >        final CountDownLatch threadDone = new CountDownLatch(1);
354 >        try {
355 >            assertEquals(0, p.getCompletedTaskCount());
356 >            p.execute(new CheckedRunnable() {
357 >                public void realRun() throws InterruptedException {
358 >                    threadStarted.countDown();
359 >                    assertEquals(0, p.getCompletedTaskCount());
360 >                    threadProceed.await();
361 >                    threadDone.countDown();
362 >                }});
363 >            await(threadStarted);
364 >            assertEquals(0, p.getCompletedTaskCount());
365 >            threadProceed.countDown();
366 >            threadDone.await();
367 >            long startTime = System.nanoTime();
368 >            while (p.getCompletedTaskCount() != 1) {
369 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
370 >                    fail("timed out");
371 >                Thread.yield();
372 >            }
373 >        } finally {
374 >            joinPool(p);
375 >        }
376      }
377  
378      /**
379 <     *  getCorePoolSize returns size given in constructor if not otherwise set
379 >     * getCorePoolSize returns size given in constructor if not otherwise set
380       */
381      public void testGetCorePoolSize() throws InterruptedException {
382 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
383 <        assertEquals(1, p1.getCorePoolSize());
384 <        joinPool(p1);
382 >        ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
383 >        assertEquals(1, p.getCorePoolSize());
384 >        joinPool(p);
385      }
386  
387      /**
388 <     *    getLargestPoolSize increases, but doesn't overestimate, when
389 <     *   multiple threads active
388 >     * getLargestPoolSize increases, but doesn't overestimate, when
389 >     * multiple threads active
390       */
391      public void testGetLargestPoolSize() throws InterruptedException {
392 <        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
393 <        assertEquals(0, p2.getLargestPoolSize());
394 <        p2.execute(new SmallRunnable());
395 <        p2.execute(new SmallRunnable());
396 <        Thread.sleep(SHORT_DELAY_MS);
397 <        assertEquals(2, p2.getLargestPoolSize());
398 <        joinPool(p2);
392 >        final int THREADS = 3;
393 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(THREADS);
394 >        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
395 >        final CountDownLatch done = new CountDownLatch(1);
396 >        try {
397 >            assertEquals(0, p.getLargestPoolSize());
398 >            for (int i = 0; i < THREADS; i++)
399 >                p.execute(new CheckedRunnable() {
400 >                    public void realRun() throws InterruptedException {
401 >                        threadsStarted.countDown();
402 >                        done.await();
403 >                        assertEquals(THREADS, p.getLargestPoolSize());
404 >                    }});
405 >            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
406 >            assertEquals(THREADS, p.getLargestPoolSize());
407 >        } finally {
408 >            done.countDown();
409 >            joinPool(p);
410 >            assertEquals(THREADS, p.getLargestPoolSize());
411 >        }
412      }
413  
414      /**
415 <     *   getPoolSize increases, but doesn't overestimate, when threads
416 <     *   become active
415 >     * getPoolSize increases, but doesn't overestimate, when threads
416 >     * become active
417       */
418      public void testGetPoolSize() throws InterruptedException {
419 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
420 <        assertEquals(0, p1.getPoolSize());
421 <        p1.execute(new SmallRunnable());
422 <        assertEquals(1, p1.getPoolSize());
423 <        joinPool(p1);
419 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
420 >        final CountDownLatch threadStarted = new CountDownLatch(1);
421 >        final CountDownLatch done = new CountDownLatch(1);
422 >        try {
423 >            assertEquals(0, p.getPoolSize());
424 >            p.execute(new CheckedRunnable() {
425 >                public void realRun() throws InterruptedException {
426 >                    threadStarted.countDown();
427 >                    assertEquals(1, p.getPoolSize());
428 >                    done.await();
429 >                }});
430 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
431 >            assertEquals(1, p.getPoolSize());
432 >        } finally {
433 >            done.countDown();
434 >            joinPool(p);
435 >        }
436      }
437  
438      /**
439 <     *    getTaskCount increases, but doesn't overestimate, when tasks
440 <     *    submitted
439 >     * getTaskCount increases, but doesn't overestimate, when tasks
440 >     * submitted
441       */
442      public void testGetTaskCount() throws InterruptedException {
443 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
444 <        assertEquals(0, p1.getTaskCount());
445 <        for (int i = 0; i < 5; i++)
446 <            p1.execute(new SmallRunnable());
447 <        Thread.sleep(SHORT_DELAY_MS);
448 <        assertEquals(5, p1.getTaskCount());
449 <        joinPool(p1);
443 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
444 >        final CountDownLatch threadStarted = new CountDownLatch(1);
445 >        final CountDownLatch done = new CountDownLatch(1);
446 >        final int TASKS = 5;
447 >        try {
448 >            assertEquals(0, p.getTaskCount());
449 >            for (int i = 0; i < TASKS; i++)
450 >                p.execute(new CheckedRunnable() {
451 >                    public void realRun() throws InterruptedException {
452 >                        threadStarted.countDown();
453 >                        done.await();
454 >                    }});
455 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
456 >            assertEquals(TASKS, p.getTaskCount());
457 >        } finally {
458 >            done.countDown();
459 >            joinPool(p);
460 >        }
461      }
462  
463      /**
# Line 356 | Line 496 | public class ScheduledExecutorTest exten
496      }
497  
498      /**
499 <     *   is isShutDown is false before shutdown, true after
499 >     * isShutdown is false before shutdown, true after
500       */
501      public void testIsShutdown() {
502  
503 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
503 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
504          try {
505 <            assertFalse(p1.isShutdown());
505 >            assertFalse(p.isShutdown());
506          }
507          finally {
508 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
508 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
509          }
510 <        assertTrue(p1.isShutdown());
510 >        assertTrue(p.isShutdown());
511      }
512  
373
513      /**
514 <     *   isTerminated is false before termination, true after
514 >     * isTerminated is false before termination, true after
515       */
516      public void testIsTerminated() throws InterruptedException {
517 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
517 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
518 >        final CountDownLatch threadStarted = new CountDownLatch(1);
519 >        final CountDownLatch done = new CountDownLatch(1);
520 >        assertFalse(p.isTerminated());
521          try {
522 <            p1.execute(new SmallRunnable());
522 >            p.execute(new CheckedRunnable() {
523 >                public void realRun() throws InterruptedException {
524 >                    assertFalse(p.isTerminated());
525 >                    threadStarted.countDown();
526 >                    done.await();
527 >                }});
528 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
529 >            assertFalse(p.isTerminating());
530 >            done.countDown();
531          } finally {
532 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
532 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
533          }
534 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
535 <        assertTrue(p1.isTerminated());
534 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
535 >        assertTrue(p.isTerminated());
536      }
537  
538      /**
539 <     *  isTerminating is not true when running or when terminated
539 >     * isTerminating is not true when running or when terminated
540       */
541      public void testIsTerminating() throws InterruptedException {
542 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
543 <        assertFalse(p1.isTerminating());
544 <        try {
545 <            p1.execute(new SmallRunnable());
546 <            assertFalse(p1.isTerminating());
547 <        } finally {
548 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
549 <        }
550 <
551 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
552 <        assertTrue(p1.isTerminated());
553 <        assertFalse(p1.isTerminating());
542 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
543 >        final CountDownLatch threadStarted = new CountDownLatch(1);
544 >        final CountDownLatch done = new CountDownLatch(1);
545 >        try {
546 >            assertFalse(p.isTerminating());
547 >            p.execute(new CheckedRunnable() {
548 >                public void realRun() throws InterruptedException {
549 >                    assertFalse(p.isTerminating());
550 >                    threadStarted.countDown();
551 >                    done.await();
552 >                }});
553 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
554 >            assertFalse(p.isTerminating());
555 >            done.countDown();
556 >        } finally {
557 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
558 >        }
559 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
560 >        assertTrue(p.isTerminated());
561 >        assertFalse(p.isTerminating());
562      }
563  
564      /**
565       * getQueue returns the work queue, which contains queued tasks
566       */
567      public void testGetQueue() throws InterruptedException {
568 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
569 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
570 <        for (int i = 0; i < 5; i++) {
413 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
414 <        }
568 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
569 >        final CountDownLatch threadStarted = new CountDownLatch(1);
570 >        final CountDownLatch done = new CountDownLatch(1);
571          try {
572 <            Thread.sleep(SHORT_DELAY_MS);
573 <            BlockingQueue<Runnable> q = p1.getQueue();
574 <            assertTrue(q.contains(tasks[4]));
572 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
573 >            for (int i = 0; i < tasks.length; i++) {
574 >                Runnable r = new CheckedRunnable() {
575 >                    public void realRun() throws InterruptedException {
576 >                        threadStarted.countDown();
577 >                        done.await();
578 >                    }};
579 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
580 >            }
581 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
582 >            BlockingQueue<Runnable> q = p.getQueue();
583 >            assertTrue(q.contains(tasks[tasks.length - 1]));
584              assertFalse(q.contains(tasks[0]));
585          } finally {
586 <            joinPool(p1);
586 >            done.countDown();
587 >            joinPool(p);
588          }
589      }
590  
# Line 426 | Line 592 | public class ScheduledExecutorTest exten
592       * remove(task) removes queued task, and fails to remove active task
593       */
594      public void testRemove() throws InterruptedException {
595 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
595 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
596          ScheduledFuture[] tasks = new ScheduledFuture[5];
597 <        for (int i = 0; i < 5; i++) {
598 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
433 <        }
597 >        final CountDownLatch threadStarted = new CountDownLatch(1);
598 >        final CountDownLatch done = new CountDownLatch(1);
599          try {
600 <            Thread.sleep(SHORT_DELAY_MS);
601 <            BlockingQueue<Runnable> q = p1.getQueue();
602 <            assertFalse(p1.remove((Runnable)tasks[0]));
600 >            for (int i = 0; i < tasks.length; i++) {
601 >                Runnable r = new CheckedRunnable() {
602 >                    public void realRun() throws InterruptedException {
603 >                        threadStarted.countDown();
604 >                        done.await();
605 >                    }};
606 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
607 >            }
608 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
609 >            BlockingQueue<Runnable> q = p.getQueue();
610 >            assertFalse(p.remove((Runnable)tasks[0]));
611              assertTrue(q.contains((Runnable)tasks[4]));
612              assertTrue(q.contains((Runnable)tasks[3]));
613 <            assertTrue(p1.remove((Runnable)tasks[4]));
614 <            assertFalse(p1.remove((Runnable)tasks[4]));
613 >            assertTrue(p.remove((Runnable)tasks[4]));
614 >            assertFalse(p.remove((Runnable)tasks[4]));
615              assertFalse(q.contains((Runnable)tasks[4]));
616              assertTrue(q.contains((Runnable)tasks[3]));
617 <            assertTrue(p1.remove((Runnable)tasks[3]));
617 >            assertTrue(p.remove((Runnable)tasks[3]));
618              assertFalse(q.contains((Runnable)tasks[3]));
619          } finally {
620 <            joinPool(p1);
620 >            done.countDown();
621 >            joinPool(p);
622          }
623      }
624  
625      /**
626 <     *  purge removes cancelled tasks from the queue
626 >     * purge eventually removes cancelled tasks from the queue
627       */
628      public void testPurge() throws InterruptedException {
629 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
629 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
630          ScheduledFuture[] tasks = new ScheduledFuture[5];
631 <        for (int i = 0; i < 5; i++) {
632 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
633 <        }
631 >        for (int i = 0; i < tasks.length; i++)
632 >            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
633 >                                  LONG_DELAY_MS, MILLISECONDS);
634          try {
635 <            int max = 5;
635 >            int max = tasks.length;
636              if (tasks[4].cancel(true)) --max;
637              if (tasks[3].cancel(true)) --max;
638              // There must eventually be an interference-free point at
639              // which purge will not fail. (At worst, when queue is empty.)
640 <            int k;
641 <            for (k = 0; k < SMALL_DELAY_MS; ++k) {
642 <                p1.purge();
643 <                long count = p1.getTaskCount();
644 <                if (count >= 0 && count <= max)
645 <                    break;
646 <                Thread.sleep(1);
647 <            }
474 <            assertTrue(k < SMALL_DELAY_MS);
640 >            long startTime = System.nanoTime();
641 >            do {
642 >                p.purge();
643 >                long count = p.getTaskCount();
644 >                if (count == max)
645 >                    return;
646 >            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
647 >            fail("Purge failed to remove cancelled tasks");
648          } finally {
649 <            joinPool(p1);
649 >            for (ScheduledFuture task : tasks)
650 >                task.cancel(true);
651 >            joinPool(p);
652 >        }
653 >    }
654 >
655 >    /**
656 >     * shutdownNow returns a list containing tasks that were not run,
657 >     * and those tasks are drained from the queue
658 >     */
659 >    public void testShutdownNow() throws InterruptedException {
660 >        final int poolSize = 2;
661 >        final int count = 5;
662 >        final AtomicInteger ran = new AtomicInteger(0);
663 >        final ScheduledThreadPoolExecutor p =
664 >            new ScheduledThreadPoolExecutor(poolSize);
665 >        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
666 >        CheckedRunnable waiter = new CheckedRunnable() { public void realRun() {
667 >            threadsStarted.countDown();
668 >            try {
669 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
670 >            } catch (InterruptedException success) {}
671 >            ran.getAndIncrement();
672 >        }};
673 >        for (int i = 0; i < count; i++)
674 >            p.execute(waiter);
675 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
676 >        final List<Runnable> queuedTasks;
677 >        try {
678 >            queuedTasks = p.shutdownNow();
679 >        } catch (SecurityException ok) {
680 >            return; // Allowed in case test doesn't have privs
681          }
682 +        assertTrue(p.isShutdown());
683 +        assertTrue(p.getQueue().isEmpty());
684 +        assertEquals(count - poolSize, queuedTasks.size());
685 +        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
686 +        assertTrue(p.isTerminated());
687 +        assertEquals(poolSize, ran.get());
688      }
689  
690      /**
691 <     *  shutDownNow returns a list containing tasks that were not run
691 >     * shutdownNow returns a list containing tasks that were not run,
692 >     * and those tasks are drained from the queue
693       */
694 <    public void testShutDownNow() throws InterruptedException {
695 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
696 <        for (int i = 0; i < 5; i++)
697 <            p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
698 <        List l;
694 >    public void testShutdownNow_delayedTasks() throws InterruptedException {
695 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
696 >        List<ScheduledFuture> tasks = new ArrayList<>();
697 >        for (int i = 0; i < 3; i++) {
698 >            Runnable r = new NoOpRunnable();
699 >            tasks.add(p.schedule(r, 9, SECONDS));
700 >            tasks.add(p.scheduleAtFixedRate(r, 9, 9, SECONDS));
701 >            tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
702 >        }
703 >        if (testImplementationDetails)
704 >            assertEquals(new HashSet(tasks), new HashSet(p.getQueue()));
705 >        final List<Runnable> queuedTasks;
706          try {
707 <            l = p1.shutdownNow();
707 >            queuedTasks = p.shutdownNow();
708          } catch (SecurityException ok) {
709 <            return;
709 >            return; // Allowed in case test doesn't have privs
710          }
711 <        assertTrue(p1.isShutdown());
712 <        assertTrue(l.size() > 0 && l.size() <= 5);
713 <        joinPool(p1);
711 >        assertTrue(p.isShutdown());
712 >        assertTrue(p.getQueue().isEmpty());
713 >        if (testImplementationDetails)
714 >            assertEquals(new HashSet(tasks), new HashSet(queuedTasks));
715 >        assertEquals(tasks.size(), queuedTasks.size());
716 >        for (ScheduledFuture task : tasks) {
717 >            assertFalse(task.isDone());
718 >            assertFalse(task.isCancelled());
719 >        }
720 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
721 >        assertTrue(p.isTerminated());
722      }
723  
724      /**
725       * In default setting, shutdown cancels periodic but not delayed
726       * tasks at shutdown
727       */
728 <    public void testShutDown1() throws InterruptedException {
729 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
730 <        assertTrue(p1.getExecuteExistingDelayedTasksAfterShutdownPolicy());
731 <        assertFalse(p1.getContinueExistingPeriodicTasksAfterShutdownPolicy());
728 >    public void testShutdown1() throws InterruptedException {
729 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
730 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
731 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
732  
733          ScheduledFuture[] tasks = new ScheduledFuture[5];
734 <        for (int i = 0; i < 5; i++)
735 <            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
736 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
737 <        BlockingQueue q = p1.getQueue();
738 <        for (Iterator it = q.iterator(); it.hasNext();) {
739 <            ScheduledFuture t = (ScheduledFuture)it.next();
740 <            assertFalse(t.isCancelled());
741 <        }
742 <        assertTrue(p1.isShutdown());
743 <        Thread.sleep(SMALL_DELAY_MS);
744 <        for (int i = 0; i < 5; ++i) {
745 <            assertTrue(tasks[i].isDone());
746 <            assertFalse(tasks[i].isCancelled());
734 >        for (int i = 0; i < tasks.length; i++)
735 >            tasks[i] = p.schedule(new NoOpRunnable(),
736 >                                  SHORT_DELAY_MS, MILLISECONDS);
737 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
738 >        BlockingQueue<Runnable> q = p.getQueue();
739 >        for (ScheduledFuture task : tasks) {
740 >            assertFalse(task.isDone());
741 >            assertFalse(task.isCancelled());
742 >            assertTrue(q.contains(task));
743 >        }
744 >        assertTrue(p.isShutdown());
745 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
746 >        assertTrue(p.isTerminated());
747 >        for (ScheduledFuture task : tasks) {
748 >            assertTrue(task.isDone());
749 >            assertFalse(task.isCancelled());
750          }
751      }
752  
524
753      /**
754       * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
755       * delayed tasks are cancelled at shutdown
756       */
757 <    public void testShutDown2() throws InterruptedException {
758 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
759 <        p1.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
757 >    public void testShutdown2() throws InterruptedException {
758 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
759 >        p.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
760 >        assertFalse(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
761 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
762          ScheduledFuture[] tasks = new ScheduledFuture[5];
763 <        for (int i = 0; i < 5; i++)
764 <            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
765 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
766 <        assertTrue(p1.isShutdown());
767 <        BlockingQueue q = p1.getQueue();
763 >        for (int i = 0; i < tasks.length; i++)
764 >            tasks[i] = p.schedule(new NoOpRunnable(),
765 >                                  SHORT_DELAY_MS, MILLISECONDS);
766 >        BlockingQueue q = p.getQueue();
767 >        assertEquals(tasks.length, q.size());
768 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
769 >        assertTrue(p.isShutdown());
770          assertTrue(q.isEmpty());
771 <        Thread.sleep(SMALL_DELAY_MS);
772 <        assertTrue(p1.isTerminated());
771 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
772 >        assertTrue(p.isTerminated());
773 >        for (ScheduledFuture task : tasks) {
774 >            assertTrue(task.isDone());
775 >            assertTrue(task.isCancelled());
776 >        }
777      }
778  
543
779      /**
780       * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
781 <     * periodic tasks are not cancelled at shutdown
781 >     * periodic tasks are cancelled at shutdown
782       */
783 <    public void testShutDown3() throws InterruptedException {
784 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
785 <        p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
783 >    public void testShutdown3() throws InterruptedException {
784 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
785 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
786 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
787 >        p.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
788 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
789 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
790 >        long initialDelay = LONG_DELAY_MS;
791          ScheduledFuture task =
792 <            p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, MILLISECONDS);
793 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
794 <        assertTrue(p1.isShutdown());
795 <        BlockingQueue q = p1.getQueue();
796 <        assertTrue(q.isEmpty());
797 <        Thread.sleep(SHORT_DELAY_MS);
798 <        assertTrue(p1.isTerminated());
792 >            p.scheduleAtFixedRate(new NoOpRunnable(), initialDelay,
793 >                                  5, MILLISECONDS);
794 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
795 >        assertTrue(p.isShutdown());
796 >        assertTrue(p.getQueue().isEmpty());
797 >        assertTrue(task.isDone());
798 >        assertTrue(task.isCancelled());
799 >        joinPool(p);
800      }
801  
802      /**
803       * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
804 <     * periodic tasks are cancelled at shutdown
804 >     * periodic tasks are not cancelled at shutdown
805       */
806 <    public void testShutDown4() throws InterruptedException {
807 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
806 >    public void testShutdown4() throws InterruptedException {
807 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
808 >        final CountDownLatch counter = new CountDownLatch(2);
809          try {
810 <            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
810 >            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
811 >            assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
812 >            assertTrue(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
813 >            final Runnable r = new CheckedRunnable() {
814 >                public void realRun() {
815 >                    counter.countDown();
816 >                }};
817              ScheduledFuture task =
818 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 1, 1, MILLISECONDS);
818 >                p.scheduleAtFixedRate(r, 1, 1, MILLISECONDS);
819 >            assertFalse(task.isDone());
820              assertFalse(task.isCancelled());
821 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
821 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
822              assertFalse(task.isCancelled());
823 <            assertFalse(p1.isTerminated());
824 <            assertTrue(p1.isShutdown());
825 <            Thread.sleep(SHORT_DELAY_MS);
823 >            assertFalse(p.isTerminated());
824 >            assertTrue(p.isShutdown());
825 >            assertTrue(counter.await(SMALL_DELAY_MS, MILLISECONDS));
826              assertFalse(task.isCancelled());
827 <            assertTrue(task.cancel(true));
827 >            assertTrue(task.cancel(false));
828              assertTrue(task.isDone());
829 <            Thread.sleep(SHORT_DELAY_MS);
830 <            assertTrue(p1.isTerminated());
829 >            assertTrue(task.isCancelled());
830 >            assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
831 >            assertTrue(p.isTerminated());
832          }
833          finally {
834 <            joinPool(p1);
834 >            joinPool(p);
835          }
836      }
837  
# Line 659 | Line 909 | public class ScheduledExecutorTest exten
909       * invokeAny(c) throws NPE if c has null elements
910       */
911      public void testInvokeAny3() throws Exception {
912 <        final CountDownLatch latch = new CountDownLatch(1);
912 >        CountDownLatch latch = new CountDownLatch(1);
913          ExecutorService e = new ScheduledThreadPoolExecutor(2);
914 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
915 +        l.add(latchAwaitingStringTask(latch));
916 +        l.add(null);
917          try {
665            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
666            l.add(new Callable<String>() {
667                      public String call() {
668                          try {
669                              latch.await();
670                          } catch (InterruptedException quittingTime) {}
671                          return TEST_STRING;
672                      }});
673            l.add(null);
918              e.invokeAny(l);
919              shouldThrow();
920          } catch (NullPointerException success) {
# Line 685 | Line 929 | public class ScheduledExecutorTest exten
929       */
930      public void testInvokeAny4() throws Exception {
931          ExecutorService e = new ScheduledThreadPoolExecutor(2);
932 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
933 +        l.add(new NPETask());
934          try {
689            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
690            l.add(new NPETask());
935              e.invokeAny(l);
936              shouldThrow();
937          } catch (ExecutionException success) {
# Line 703 | Line 947 | public class ScheduledExecutorTest exten
947      public void testInvokeAny5() throws Exception {
948          ExecutorService e = new ScheduledThreadPoolExecutor(2);
949          try {
950 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
950 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
951              l.add(new StringTask());
952              l.add(new StringTask());
953              String result = e.invokeAny(l);
# Line 745 | Line 989 | public class ScheduledExecutorTest exten
989       */
990      public void testInvokeAll3() throws Exception {
991          ExecutorService e = new ScheduledThreadPoolExecutor(2);
992 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
993 +        l.add(new StringTask());
994 +        l.add(null);
995          try {
749            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
750            l.add(new StringTask());
751            l.add(null);
996              e.invokeAll(l);
997              shouldThrow();
998          } catch (NullPointerException success) {
# Line 762 | Line 1006 | public class ScheduledExecutorTest exten
1006       */
1007      public void testInvokeAll4() throws Exception {
1008          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1009 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1010 +        l.add(new NPETask());
1011 +        List<Future<String>> futures = e.invokeAll(l);
1012 +        assertEquals(1, futures.size());
1013          try {
1014 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
767 <            l.add(new NPETask());
768 <            List<Future<String>> result = e.invokeAll(l);
769 <            assertEquals(1, result.size());
770 <            for (Future<String> future : result)
771 <                future.get();
1014 >            futures.get(0).get();
1015              shouldThrow();
1016          } catch (ExecutionException success) {
1017              assertTrue(success.getCause() instanceof NullPointerException);
# Line 783 | Line 1026 | public class ScheduledExecutorTest exten
1026      public void testInvokeAll5() throws Exception {
1027          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1028          try {
1029 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1029 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1030              l.add(new StringTask());
1031              l.add(new StringTask());
1032 <            List<Future<String>> result = e.invokeAll(l);
1033 <            assertEquals(2, result.size());
1034 <            for (Future<String> future : result)
1032 >            List<Future<String>> futures = e.invokeAll(l);
1033 >            assertEquals(2, futures.size());
1034 >            for (Future<String> future : futures)
1035                  assertSame(TEST_STRING, future.get());
1036          } finally {
1037              joinPool(e);
# Line 814 | Line 1057 | public class ScheduledExecutorTest exten
1057       */
1058      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1059          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1060 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1061 +        l.add(new StringTask());
1062          try {
818            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
819            l.add(new StringTask());
1063              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1064              shouldThrow();
1065          } catch (NullPointerException success) {
# Line 843 | Line 1086 | public class ScheduledExecutorTest exten
1086       * timed invokeAny(c) throws NPE if c has null elements
1087       */
1088      public void testTimedInvokeAny3() throws Exception {
1089 <        final CountDownLatch latch = new CountDownLatch(1);
1089 >        CountDownLatch latch = new CountDownLatch(1);
1090          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1091 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1092 +        l.add(latchAwaitingStringTask(latch));
1093 +        l.add(null);
1094          try {
849            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
850            l.add(new Callable<String>() {
851                      public String call() {
852                          try {
853                              latch.await();
854                          } catch (InterruptedException quittingTime) {}
855                          return TEST_STRING;
856                      }});
857            l.add(null);
1095              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1096              shouldThrow();
1097          } catch (NullPointerException success) {
# Line 869 | Line 1106 | public class ScheduledExecutorTest exten
1106       */
1107      public void testTimedInvokeAny4() throws Exception {
1108          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1109 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1110 +        l.add(new NPETask());
1111          try {
873            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
874            l.add(new NPETask());
1112              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1113              shouldThrow();
1114          } catch (ExecutionException success) {
# Line 887 | Line 1124 | public class ScheduledExecutorTest exten
1124      public void testTimedInvokeAny5() throws Exception {
1125          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1126          try {
1127 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1127 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1128              l.add(new StringTask());
1129              l.add(new StringTask());
1130              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 916 | Line 1153 | public class ScheduledExecutorTest exten
1153       */
1154      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1155          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1156 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1157 +        l.add(new StringTask());
1158          try {
920            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
921            l.add(new StringTask());
1159              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1160              shouldThrow();
1161          } catch (NullPointerException success) {
# Line 945 | Line 1182 | public class ScheduledExecutorTest exten
1182       */
1183      public void testTimedInvokeAll3() throws Exception {
1184          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1185 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1186 +        l.add(new StringTask());
1187 +        l.add(null);
1188          try {
949            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
950            l.add(new StringTask());
951            l.add(null);
1189              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1190              shouldThrow();
1191          } catch (NullPointerException success) {
# Line 962 | Line 1199 | public class ScheduledExecutorTest exten
1199       */
1200      public void testTimedInvokeAll4() throws Exception {
1201          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1202 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1203 +        l.add(new NPETask());
1204 +        List<Future<String>> futures =
1205 +            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1206 +        assertEquals(1, futures.size());
1207          try {
1208 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
967 <            l.add(new NPETask());
968 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
969 <            assertEquals(1, result.size());
970 <            for (Future<String> future : result)
971 <                future.get();
1208 >            futures.get(0).get();
1209              shouldThrow();
1210          } catch (ExecutionException success) {
1211              assertTrue(success.getCause() instanceof NullPointerException);
# Line 983 | Line 1220 | public class ScheduledExecutorTest exten
1220      public void testTimedInvokeAll5() throws Exception {
1221          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1222          try {
1223 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1223 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1224              l.add(new StringTask());
1225              l.add(new StringTask());
1226 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1227 <            assertEquals(2, result.size());
1228 <            for (Future<String> future : result)
1226 >            List<Future<String>> futures =
1227 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1228 >            assertEquals(2, futures.size());
1229 >            for (Future<String> future : futures)
1230                  assertSame(TEST_STRING, future.get());
1231          } finally {
1232              joinPool(e);
# Line 1001 | Line 1239 | public class ScheduledExecutorTest exten
1239      public void testTimedInvokeAll6() throws Exception {
1240          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1241          try {
1242 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1243 <            l.add(new StringTask());
1244 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1245 <            l.add(new StringTask());
1246 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1247 <            assertEquals(3, result.size());
1248 <            Iterator<Future<String>> it = result.iterator();
1249 <            Future<String> f1 = it.next();
1250 <            Future<String> f2 = it.next();
1251 <            Future<String> f3 = it.next();
1252 <            assertTrue(f1.isDone());
1253 <            assertTrue(f2.isDone());
1254 <            assertTrue(f3.isDone());
1255 <            assertFalse(f1.isCancelled());
1256 <            assertTrue(f2.isCancelled());
1242 >            for (long timeout = timeoutMillis();;) {
1243 >                List<Callable<String>> tasks = new ArrayList<>();
1244 >                tasks.add(new StringTask("0"));
1245 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1246 >                tasks.add(new StringTask("2"));
1247 >                long startTime = System.nanoTime();
1248 >                List<Future<String>> futures =
1249 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1250 >                assertEquals(tasks.size(), futures.size());
1251 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1252 >                for (Future future : futures)
1253 >                    assertTrue(future.isDone());
1254 >                assertTrue(futures.get(1).isCancelled());
1255 >                try {
1256 >                    assertEquals("0", futures.get(0).get());
1257 >                    assertEquals("2", futures.get(2).get());
1258 >                    break;
1259 >                } catch (CancellationException retryWithLongerTimeout) {
1260 >                    timeout *= 2;
1261 >                    if (timeout >= LONG_DELAY_MS / 2)
1262 >                        fail("expected exactly one task to be cancelled");
1263 >                }
1264 >            }
1265          } finally {
1266              joinPool(e);
1267          }
1268      }
1269  
1024
1270   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines