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.26 by jsr166, Sat Nov 21 02:07:27 2009 UTC vs.
Revision 1.52 by jsr166, Mon Sep 14 03:27:11 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 >
11 > import java.util.ArrayList;
12 > import java.util.List;
13 > import java.util.concurrent.BlockingQueue;
14 > import java.util.concurrent.Callable;
15 > import java.util.concurrent.CancellationException;
16 > import java.util.concurrent.CountDownLatch;
17 > import java.util.concurrent.ExecutionException;
18 > import java.util.concurrent.Executors;
19 > import java.util.concurrent.ExecutorService;
20 > import java.util.concurrent.Future;
21 > import java.util.concurrent.RejectedExecutionException;
22 > import java.util.concurrent.ScheduledFuture;
23 > import java.util.concurrent.ScheduledThreadPoolExecutor;
24 > import java.util.concurrent.ThreadFactory;
25 > import java.util.concurrent.ThreadPoolExecutor;
26 > import java.util.concurrent.atomic.AtomicInteger;
27 >
28 > import junit.framework.Test;
29 > import junit.framework.TestSuite;
30  
31   public class ScheduledExecutorTest extends JSR166TestCase {
32      public static void main(String[] args) {
33 <        junit.textui.TestRunner.run (suite());
33 >        main(suite(), args);
34      }
35      public static Test suite() {
36          return new TestSuite(ScheduledExecutorTest.class);
37      }
38  
23
39      /**
40       * execute successfully executes a runnable
41       */
42      public void testExecute() throws InterruptedException {
43 <        TrackedShortRunnable runnable =new TrackedShortRunnable();
44 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
45 <        p1.execute(runnable);
46 <        assertFalse(runnable.done);
47 <        Thread.sleep(SHORT_DELAY_MS);
48 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
49 <        Thread.sleep(MEDIUM_DELAY_MS);
50 <        assertTrue(runnable.done);
51 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
52 <        joinPool(p1);
43 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
44 >        final CountDownLatch done = new CountDownLatch(1);
45 >        final Runnable task = new CheckedRunnable() {
46 >            public void realRun() {
47 >                done.countDown();
48 >            }};
49 >        try {
50 >            p.execute(task);
51 >            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
52 >        } finally {
53 >            joinPool(p);
54 >        }
55      }
56  
40
57      /**
58       * delayed schedule of callable successfully executes after delay
59       */
60      public void testSchedule1() throws Exception {
61 <        TrackedCallable callable = new TrackedCallable();
62 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
63 <        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
64 <        assertFalse(callable.done);
65 <        Thread.sleep(MEDIUM_DELAY_MS);
66 <        assertTrue(callable.done);
67 <        assertEquals(Boolean.TRUE, f.get());
68 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
69 <        joinPool(p1);
61 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
62 >        final long startTime = System.nanoTime();
63 >        final CountDownLatch done = new CountDownLatch(1);
64 >        try {
65 >            Callable task = new CheckedCallable<Boolean>() {
66 >                public Boolean realCall() {
67 >                    done.countDown();
68 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
69 >                    return Boolean.TRUE;
70 >                }};
71 >            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
72 >            assertSame(Boolean.TRUE, f.get());
73 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
74 >            assertTrue(done.await(0L, MILLISECONDS));
75 >        } finally {
76 >            joinPool(p);
77 >        }
78      }
79  
80      /**
81 <     *  delayed schedule of runnable successfully executes after delay
82 <     */
83 <    public void testSchedule3() throws InterruptedException {
84 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
85 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
86 <        p1.schedule(runnable, SMALL_DELAY_MS, MILLISECONDS);
87 <        Thread.sleep(SHORT_DELAY_MS);
88 <        assertFalse(runnable.done);
89 <        Thread.sleep(MEDIUM_DELAY_MS);
90 <        assertTrue(runnable.done);
91 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
92 <        joinPool(p1);
81 >     * delayed schedule of runnable successfully executes after delay
82 >     */
83 >    public void testSchedule3() throws Exception {
84 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
85 >        final long startTime = System.nanoTime();
86 >        final CountDownLatch done = new CountDownLatch(1);
87 >        try {
88 >            Runnable task = new CheckedRunnable() {
89 >                public void realRun() {
90 >                    done.countDown();
91 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
92 >                }};
93 >            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
94 >            await(done);
95 >            assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
96 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
97 >        } finally {
98 >            joinPool(p);
99 >        }
100      }
101  
102      /**
103       * scheduleAtFixedRate executes runnable after given initial delay
104       */
105 <    public void testSchedule4() throws InterruptedException {
106 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
107 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
108 <        ScheduledFuture h = p1.scheduleAtFixedRate(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, MILLISECONDS);
109 <        assertFalse(runnable.done);
110 <        Thread.sleep(MEDIUM_DELAY_MS);
111 <        assertTrue(runnable.done);
112 <        h.cancel(true);
113 <        joinPool(p1);
114 <    }
115 <
116 <    static class RunnableCounter implements Runnable {
117 <        AtomicInteger count = new AtomicInteger(0);
118 <        public void run() { count.getAndIncrement(); }
105 >    public void testSchedule4() throws Exception {
106 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
107 >        final long startTime = System.nanoTime();
108 >        final CountDownLatch done = new CountDownLatch(1);
109 >        try {
110 >            Runnable task = new CheckedRunnable() {
111 >                public void realRun() {
112 >                    done.countDown();
113 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
114 >                }};
115 >            ScheduledFuture f =
116 >                p.scheduleAtFixedRate(task, timeoutMillis(),
117 >                                      LONG_DELAY_MS, MILLISECONDS);
118 >            await(done);
119 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
120 >            f.cancel(true);
121 >        } finally {
122 >            joinPool(p);
123 >        }
124      }
125  
126      /**
127       * scheduleWithFixedDelay executes runnable after given initial delay
128       */
129 <    public void testSchedule5() throws InterruptedException {
130 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
131 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
132 <        ScheduledFuture h = p1.scheduleWithFixedDelay(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, MILLISECONDS);
133 <        assertFalse(runnable.done);
134 <        Thread.sleep(MEDIUM_DELAY_MS);
135 <        assertTrue(runnable.done);
136 <        h.cancel(true);
137 <        joinPool(p1);
129 >    public void testSchedule5() throws Exception {
130 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
131 >        final long startTime = System.nanoTime();
132 >        final CountDownLatch done = new CountDownLatch(1);
133 >        try {
134 >            Runnable task = new CheckedRunnable() {
135 >                public void realRun() {
136 >                    done.countDown();
137 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
138 >                }};
139 >            ScheduledFuture f =
140 >                p.scheduleWithFixedDelay(task, timeoutMillis(),
141 >                                         LONG_DELAY_MS, MILLISECONDS);
142 >            await(done);
143 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
144 >            f.cancel(true);
145 >        } finally {
146 >            joinPool(p);
147 >        }
148 >    }
149 >
150 >    static class RunnableCounter implements Runnable {
151 >        AtomicInteger count = new AtomicInteger(0);
152 >        public void run() { count.getAndIncrement(); }
153      }
154  
155      /**
156       * scheduleAtFixedRate executes series of tasks at given rate
157       */
158      public void testFixedRateSequence() throws InterruptedException {
159 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
160 <        RunnableCounter counter = new RunnableCounter();
161 <        ScheduledFuture h =
162 <            p1.scheduleAtFixedRate(counter, 0, 1, MILLISECONDS);
163 <        Thread.sleep(SMALL_DELAY_MS);
164 <        h.cancel(true);
165 <        int c = counter.count.get();
166 <        // By time scaling conventions, we must have at least
167 <        // an execution per SHORT delay, but no more than one SHORT more
168 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
169 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
170 <        joinPool(p1);
159 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
160 >        try {
161 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
162 >                long startTime = System.nanoTime();
163 >                int cycles = 10;
164 >                final CountDownLatch done = new CountDownLatch(cycles);
165 >                Runnable task = new CheckedRunnable() {
166 >                    public void realRun() { done.countDown(); }};
167 >                ScheduledFuture h =
168 >                    p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
169 >                done.await();
170 >                h.cancel(true);
171 >                double normalizedTime =
172 >                    (double) millisElapsedSince(startTime) / delay;
173 >                if (normalizedTime >= cycles - 1 &&
174 >                    normalizedTime <= cycles)
175 >                    return;
176 >            }
177 >            throw new AssertionError("unexpected execution rate");
178 >        } finally {
179 >            joinPool(p);
180 >        }
181      }
182  
183      /**
184       * scheduleWithFixedDelay executes series of tasks with given period
185       */
186      public void testFixedDelaySequence() throws InterruptedException {
187 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
188 <        RunnableCounter counter = new RunnableCounter();
189 <        ScheduledFuture h =
190 <            p1.scheduleWithFixedDelay(counter, 0, 1, MILLISECONDS);
191 <        Thread.sleep(SMALL_DELAY_MS);
192 <        h.cancel(true);
193 <        int c = counter.count.get();
194 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
195 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
196 <        joinPool(p1);
187 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
188 >        try {
189 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
190 >                long startTime = System.nanoTime();
191 >                int cycles = 10;
192 >                final CountDownLatch done = new CountDownLatch(cycles);
193 >                Runnable task = new CheckedRunnable() {
194 >                    public void realRun() { done.countDown(); }};
195 >                ScheduledFuture h =
196 >                    p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
197 >                done.await();
198 >                h.cancel(true);
199 >                double normalizedTime =
200 >                    (double) millisElapsedSince(startTime) / delay;
201 >                if (normalizedTime >= cycles - 1 &&
202 >                    normalizedTime <= cycles)
203 >                    return;
204 >            }
205 >            throw new AssertionError("unexpected execution rate");
206 >        } finally {
207 >            joinPool(p);
208 >        }
209      }
210  
138
211      /**
212 <     *  execute (null) throws NPE
212 >     * execute(null) throws NPE
213       */
214      public void testExecuteNull() throws InterruptedException {
215          ScheduledThreadPoolExecutor se = null;
# Line 151 | Line 223 | public class ScheduledExecutorTest exten
223      }
224  
225      /**
226 <     * schedule (null) throws NPE
226 >     * schedule(null) throws NPE
227       */
228      public void testScheduleNull() throws InterruptedException {
229          ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
# Line 178 | Line 250 | public class ScheduledExecutorTest exten
250          }
251  
252          joinPool(se);
181
253      }
254  
255      /**
# Line 200 | Line 271 | public class ScheduledExecutorTest exten
271      /**
272       * schedule callable throws RejectedExecutionException if shutdown
273       */
274 <     public void testSchedule3_RejectedExecutionException() throws InterruptedException {
275 <         ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
276 <         try {
274 >    public void testSchedule3_RejectedExecutionException() throws InterruptedException {
275 >        ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
276 >        try {
277              se.shutdown();
278              se.schedule(new NoOpCallable(),
279                          MEDIUM_DELAY_MS, MILLISECONDS);
# Line 210 | Line 281 | public class ScheduledExecutorTest exten
281          } catch (RejectedExecutionException success) {
282          } catch (SecurityException ok) {
283          }
284 <         joinPool(se);
284 >        joinPool(se);
285      }
286  
287      /**
288 <     *  scheduleAtFixedRate throws RejectedExecutionException if shutdown
288 >     * scheduleAtFixedRate throws RejectedExecutionException if shutdown
289       */
290      public void testScheduleAtFixedRate1_RejectedExecutionException() throws InterruptedException {
291          ScheduledThreadPoolExecutor se = new ScheduledThreadPoolExecutor(1);
# Line 246 | Line 317 | public class ScheduledExecutorTest exten
317      }
318  
319      /**
320 <     *  getActiveCount increases but doesn't overestimate, when a
321 <     *  thread becomes active
320 >     * getActiveCount increases but doesn't overestimate, when a
321 >     * thread becomes active
322       */
323      public void testGetActiveCount() throws InterruptedException {
324 <        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
325 <        assertEquals(0, p2.getActiveCount());
326 <        p2.execute(new SmallRunnable());
327 <        Thread.sleep(SHORT_DELAY_MS);
328 <        assertEquals(1, p2.getActiveCount());
329 <        joinPool(p2);
324 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
325 >        final CountDownLatch threadStarted = new CountDownLatch(1);
326 >        final CountDownLatch done = new CountDownLatch(1);
327 >        try {
328 >            assertEquals(0, p.getActiveCount());
329 >            p.execute(new CheckedRunnable() {
330 >                public void realRun() throws InterruptedException {
331 >                    threadStarted.countDown();
332 >                    assertEquals(1, p.getActiveCount());
333 >                    done.await();
334 >                }});
335 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
336 >            assertEquals(1, p.getActiveCount());
337 >        } finally {
338 >            done.countDown();
339 >            joinPool(p);
340 >        }
341      }
342  
343      /**
344 <     *    getCompletedTaskCount increases, but doesn't overestimate,
345 <     *   when tasks complete
344 >     * getCompletedTaskCount increases, but doesn't overestimate,
345 >     * when tasks complete
346       */
347      public void testGetCompletedTaskCount() throws InterruptedException {
348 <        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
349 <        assertEquals(0, p2.getCompletedTaskCount());
350 <        p2.execute(new SmallRunnable());
351 <        Thread.sleep(MEDIUM_DELAY_MS);
352 <        assertEquals(1, p2.getCompletedTaskCount());
353 <        joinPool(p2);
348 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
349 >        final CountDownLatch threadStarted = new CountDownLatch(1);
350 >        final CountDownLatch threadProceed = new CountDownLatch(1);
351 >        final CountDownLatch threadDone = new CountDownLatch(1);
352 >        try {
353 >            assertEquals(0, p.getCompletedTaskCount());
354 >            p.execute(new CheckedRunnable() {
355 >                public void realRun() throws InterruptedException {
356 >                    threadStarted.countDown();
357 >                    assertEquals(0, p.getCompletedTaskCount());
358 >                    threadProceed.await();
359 >                    threadDone.countDown();
360 >                }});
361 >            await(threadStarted);
362 >            assertEquals(0, p.getCompletedTaskCount());
363 >            threadProceed.countDown();
364 >            threadDone.await();
365 >            long startTime = System.nanoTime();
366 >            while (p.getCompletedTaskCount() != 1) {
367 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
368 >                    fail("timed out");
369 >                Thread.yield();
370 >            }
371 >        } finally {
372 >            joinPool(p);
373 >        }
374      }
375  
376      /**
377 <     *  getCorePoolSize returns size given in constructor if not otherwise set
377 >     * getCorePoolSize returns size given in constructor if not otherwise set
378       */
379      public void testGetCorePoolSize() throws InterruptedException {
380 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
381 <        assertEquals(1, p1.getCorePoolSize());
382 <        joinPool(p1);
380 >        ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
381 >        assertEquals(1, p.getCorePoolSize());
382 >        joinPool(p);
383      }
384  
385      /**
386 <     *    getLargestPoolSize increases, but doesn't overestimate, when
387 <     *   multiple threads active
386 >     * getLargestPoolSize increases, but doesn't overestimate, when
387 >     * multiple threads active
388       */
389      public void testGetLargestPoolSize() throws InterruptedException {
390 <        ScheduledThreadPoolExecutor p2 = new ScheduledThreadPoolExecutor(2);
391 <        assertEquals(0, p2.getLargestPoolSize());
392 <        p2.execute(new SmallRunnable());
393 <        p2.execute(new SmallRunnable());
394 <        Thread.sleep(SHORT_DELAY_MS);
395 <        assertEquals(2, p2.getLargestPoolSize());
396 <        joinPool(p2);
390 >        final int THREADS = 3;
391 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(THREADS);
392 >        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
393 >        final CountDownLatch done = new CountDownLatch(1);
394 >        try {
395 >            assertEquals(0, p.getLargestPoolSize());
396 >            for (int i = 0; i < THREADS; i++)
397 >                p.execute(new CheckedRunnable() {
398 >                    public void realRun() throws InterruptedException {
399 >                        threadsStarted.countDown();
400 >                        done.await();
401 >                        assertEquals(THREADS, p.getLargestPoolSize());
402 >                    }});
403 >            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
404 >            assertEquals(THREADS, p.getLargestPoolSize());
405 >        } finally {
406 >            done.countDown();
407 >            joinPool(p);
408 >            assertEquals(THREADS, p.getLargestPoolSize());
409 >        }
410      }
411  
412      /**
413 <     *   getPoolSize increases, but doesn't overestimate, when threads
414 <     *   become active
413 >     * getPoolSize increases, but doesn't overestimate, when threads
414 >     * become active
415       */
416      public void testGetPoolSize() throws InterruptedException {
417 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
418 <        assertEquals(0, p1.getPoolSize());
419 <        p1.execute(new SmallRunnable());
420 <        assertEquals(1, p1.getPoolSize());
421 <        joinPool(p1);
417 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
418 >        final CountDownLatch threadStarted = new CountDownLatch(1);
419 >        final CountDownLatch done = new CountDownLatch(1);
420 >        try {
421 >            assertEquals(0, p.getPoolSize());
422 >            p.execute(new CheckedRunnable() {
423 >                public void realRun() throws InterruptedException {
424 >                    threadStarted.countDown();
425 >                    assertEquals(1, p.getPoolSize());
426 >                    done.await();
427 >                }});
428 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
429 >            assertEquals(1, p.getPoolSize());
430 >        } finally {
431 >            done.countDown();
432 >            joinPool(p);
433 >        }
434      }
435  
436      /**
437 <     *    getTaskCount increases, but doesn't overestimate, when tasks
438 <     *    submitted
437 >     * getTaskCount increases, but doesn't overestimate, when tasks
438 >     * submitted
439       */
440      public void testGetTaskCount() throws InterruptedException {
441 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
442 <        assertEquals(0, p1.getTaskCount());
443 <        for (int i = 0; i < 5; i++)
444 <            p1.execute(new SmallRunnable());
445 <        Thread.sleep(SHORT_DELAY_MS);
446 <        assertEquals(5, p1.getTaskCount());
447 <        joinPool(p1);
441 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
442 >        final CountDownLatch threadStarted = new CountDownLatch(1);
443 >        final CountDownLatch done = new CountDownLatch(1);
444 >        final int TASKS = 5;
445 >        try {
446 >            assertEquals(0, p.getTaskCount());
447 >            for (int i = 0; i < TASKS; i++)
448 >                p.execute(new CheckedRunnable() {
449 >                    public void realRun() throws InterruptedException {
450 >                        threadStarted.countDown();
451 >                        done.await();
452 >                    }});
453 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
454 >            assertEquals(TASKS, p.getTaskCount());
455 >        } finally {
456 >            done.countDown();
457 >            joinPool(p);
458 >        }
459      }
460  
461      /**
# Line 356 | Line 494 | public class ScheduledExecutorTest exten
494      }
495  
496      /**
497 <     *   is isShutDown is false before shutdown, true after
497 >     * isShutdown is false before shutdown, true after
498       */
499      public void testIsShutdown() {
500  
501 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
501 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
502          try {
503 <            assertFalse(p1.isShutdown());
503 >            assertFalse(p.isShutdown());
504          }
505          finally {
506 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
506 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
507          }
508 <        assertTrue(p1.isShutdown());
508 >        assertTrue(p.isShutdown());
509      }
510  
373
511      /**
512 <     *   isTerminated is false before termination, true after
512 >     * isTerminated is false before termination, true after
513       */
514      public void testIsTerminated() throws InterruptedException {
515 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
515 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
516 >        final CountDownLatch threadStarted = new CountDownLatch(1);
517 >        final CountDownLatch done = new CountDownLatch(1);
518 >        assertFalse(p.isTerminated());
519          try {
520 <            p1.execute(new SmallRunnable());
520 >            p.execute(new CheckedRunnable() {
521 >                public void realRun() throws InterruptedException {
522 >                    assertFalse(p.isTerminated());
523 >                    threadStarted.countDown();
524 >                    done.await();
525 >                }});
526 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
527 >            assertFalse(p.isTerminating());
528 >            done.countDown();
529          } finally {
530 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
530 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
531          }
532 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
533 <        assertTrue(p1.isTerminated());
532 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
533 >        assertTrue(p.isTerminated());
534      }
535  
536      /**
537 <     *  isTerminating is not true when running or when terminated
537 >     * isTerminating is not true when running or when terminated
538       */
539      public void testIsTerminating() throws InterruptedException {
540 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
541 <        assertFalse(p1.isTerminating());
542 <        try {
543 <            p1.execute(new SmallRunnable());
544 <            assertFalse(p1.isTerminating());
545 <        } finally {
546 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
547 <        }
548 <
549 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
550 <        assertTrue(p1.isTerminated());
551 <        assertFalse(p1.isTerminating());
540 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
541 >        final CountDownLatch threadStarted = new CountDownLatch(1);
542 >        final CountDownLatch done = new CountDownLatch(1);
543 >        try {
544 >            assertFalse(p.isTerminating());
545 >            p.execute(new CheckedRunnable() {
546 >                public void realRun() throws InterruptedException {
547 >                    assertFalse(p.isTerminating());
548 >                    threadStarted.countDown();
549 >                    done.await();
550 >                }});
551 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
552 >            assertFalse(p.isTerminating());
553 >            done.countDown();
554 >        } finally {
555 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
556 >        }
557 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
558 >        assertTrue(p.isTerminated());
559 >        assertFalse(p.isTerminating());
560      }
561  
562      /**
563       * getQueue returns the work queue, which contains queued tasks
564       */
565      public void testGetQueue() throws InterruptedException {
566 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
567 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
568 <        for (int i = 0; i < 5; i++) {
413 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
414 <        }
566 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
567 >        final CountDownLatch threadStarted = new CountDownLatch(1);
568 >        final CountDownLatch done = new CountDownLatch(1);
569          try {
570 <            Thread.sleep(SHORT_DELAY_MS);
571 <            BlockingQueue<Runnable> q = p1.getQueue();
572 <            assertTrue(q.contains(tasks[4]));
570 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
571 >            for (int i = 0; i < tasks.length; i++) {
572 >                Runnable r = new CheckedRunnable() {
573 >                    public void realRun() throws InterruptedException {
574 >                        threadStarted.countDown();
575 >                        done.await();
576 >                    }};
577 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
578 >            }
579 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
580 >            BlockingQueue<Runnable> q = p.getQueue();
581 >            assertTrue(q.contains(tasks[tasks.length - 1]));
582              assertFalse(q.contains(tasks[0]));
583          } finally {
584 <            joinPool(p1);
584 >            done.countDown();
585 >            joinPool(p);
586          }
587      }
588  
# Line 426 | Line 590 | public class ScheduledExecutorTest exten
590       * remove(task) removes queued task, and fails to remove active task
591       */
592      public void testRemove() throws InterruptedException {
593 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
593 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
594          ScheduledFuture[] tasks = new ScheduledFuture[5];
595 <        for (int i = 0; i < 5; i++) {
596 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
433 <        }
595 >        final CountDownLatch threadStarted = new CountDownLatch(1);
596 >        final CountDownLatch done = new CountDownLatch(1);
597          try {
598 <            Thread.sleep(SHORT_DELAY_MS);
599 <            BlockingQueue<Runnable> q = p1.getQueue();
600 <            assertFalse(p1.remove((Runnable)tasks[0]));
598 >            for (int i = 0; i < tasks.length; i++) {
599 >                Runnable r = new CheckedRunnable() {
600 >                    public void realRun() throws InterruptedException {
601 >                        threadStarted.countDown();
602 >                        done.await();
603 >                    }};
604 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
605 >            }
606 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
607 >            BlockingQueue<Runnable> q = p.getQueue();
608 >            assertFalse(p.remove((Runnable)tasks[0]));
609              assertTrue(q.contains((Runnable)tasks[4]));
610              assertTrue(q.contains((Runnable)tasks[3]));
611 <            assertTrue(p1.remove((Runnable)tasks[4]));
612 <            assertFalse(p1.remove((Runnable)tasks[4]));
611 >            assertTrue(p.remove((Runnable)tasks[4]));
612 >            assertFalse(p.remove((Runnable)tasks[4]));
613              assertFalse(q.contains((Runnable)tasks[4]));
614              assertTrue(q.contains((Runnable)tasks[3]));
615 <            assertTrue(p1.remove((Runnable)tasks[3]));
615 >            assertTrue(p.remove((Runnable)tasks[3]));
616              assertFalse(q.contains((Runnable)tasks[3]));
617          } finally {
618 <            joinPool(p1);
618 >            done.countDown();
619 >            joinPool(p);
620          }
621      }
622  
623      /**
624 <     *  purge removes cancelled tasks from the queue
624 >     * purge eventually removes cancelled tasks from the queue
625       */
626      public void testPurge() throws InterruptedException {
627 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
627 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
628          ScheduledFuture[] tasks = new ScheduledFuture[5];
629 <        for (int i = 0; i < 5; i++) {
630 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
631 <        }
629 >        for (int i = 0; i < tasks.length; i++)
630 >            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
631 >                                  LONG_DELAY_MS, MILLISECONDS);
632          try {
633 <            int max = 5;
633 >            int max = tasks.length;
634              if (tasks[4].cancel(true)) --max;
635              if (tasks[3].cancel(true)) --max;
636              // There must eventually be an interference-free point at
637              // which purge will not fail. (At worst, when queue is empty.)
638 <            int k;
639 <            for (k = 0; k < SMALL_DELAY_MS; ++k) {
640 <                p1.purge();
641 <                long count = p1.getTaskCount();
642 <                if (count >= 0 && count <= max)
643 <                    break;
644 <                Thread.sleep(1);
645 <            }
474 <            assertTrue(k < SMALL_DELAY_MS);
638 >            long startTime = System.nanoTime();
639 >            do {
640 >                p.purge();
641 >                long count = p.getTaskCount();
642 >                if (count == max)
643 >                    return;
644 >            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
645 >            fail("Purge failed to remove cancelled tasks");
646          } finally {
647 <            joinPool(p1);
647 >            for (ScheduledFuture task : tasks)
648 >                task.cancel(true);
649 >            joinPool(p);
650          }
651      }
652  
653      /**
654 <     *  shutDownNow returns a list containing tasks that were not run
654 >     * shutdownNow returns a list containing tasks that were not run
655       */
656 <    public void testShutDownNow() throws InterruptedException {
657 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
656 >    public void testShutdownNow() {
657 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
658          for (int i = 0; i < 5; i++)
659 <            p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
660 <        List l;
659 >            p.schedule(new SmallPossiblyInterruptedRunnable(),
660 >                       LONG_DELAY_MS, MILLISECONDS);
661          try {
662 <            l = p1.shutdownNow();
662 >            List<Runnable> l = p.shutdownNow();
663 >            assertTrue(p.isShutdown());
664 >            assertEquals(5, l.size());
665          } catch (SecurityException ok) {
666 <            return;
666 >            // Allowed in case test doesn't have privs
667 >        } finally {
668 >            joinPool(p);
669          }
493        assertTrue(p1.isShutdown());
494        assertTrue(l.size() > 0 && l.size() <= 5);
495        joinPool(p1);
670      }
671  
672      /**
673       * In default setting, shutdown cancels periodic but not delayed
674       * tasks at shutdown
675       */
676 <    public void testShutDown1() throws InterruptedException {
677 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
678 <        assertTrue(p1.getExecuteExistingDelayedTasksAfterShutdownPolicy());
679 <        assertFalse(p1.getContinueExistingPeriodicTasksAfterShutdownPolicy());
676 >    public void testShutdown1() throws InterruptedException {
677 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
678 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
679 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
680  
681          ScheduledFuture[] tasks = new ScheduledFuture[5];
682 <        for (int i = 0; i < 5; i++)
683 <            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
684 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
685 <        BlockingQueue q = p1.getQueue();
686 <        for (Iterator it = q.iterator(); it.hasNext();) {
687 <            ScheduledFuture t = (ScheduledFuture)it.next();
688 <            assertFalse(t.isCancelled());
689 <        }
690 <        assertTrue(p1.isShutdown());
691 <        Thread.sleep(SMALL_DELAY_MS);
692 <        for (int i = 0; i < 5; ++i) {
693 <            assertTrue(tasks[i].isDone());
694 <            assertFalse(tasks[i].isCancelled());
682 >        for (int i = 0; i < tasks.length; i++)
683 >            tasks[i] = p.schedule(new NoOpRunnable(),
684 >                                  SHORT_DELAY_MS, MILLISECONDS);
685 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
686 >        BlockingQueue<Runnable> q = p.getQueue();
687 >        for (ScheduledFuture task : tasks) {
688 >            assertFalse(task.isDone());
689 >            assertFalse(task.isCancelled());
690 >            assertTrue(q.contains(task));
691 >        }
692 >        assertTrue(p.isShutdown());
693 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
694 >        assertTrue(p.isTerminated());
695 >        for (ScheduledFuture task : tasks) {
696 >            assertTrue(task.isDone());
697 >            assertFalse(task.isCancelled());
698          }
699      }
700  
524
701      /**
702       * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
703       * delayed tasks are cancelled at shutdown
704       */
705 <    public void testShutDown2() throws InterruptedException {
706 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
707 <        p1.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
705 >    public void testShutdown2() throws InterruptedException {
706 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
707 >        p.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
708 >        assertFalse(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
709 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
710          ScheduledFuture[] tasks = new ScheduledFuture[5];
711 <        for (int i = 0; i < 5; i++)
712 <            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
713 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
714 <        assertTrue(p1.isShutdown());
715 <        BlockingQueue q = p1.getQueue();
711 >        for (int i = 0; i < tasks.length; i++)
712 >            tasks[i] = p.schedule(new NoOpRunnable(),
713 >                                  SHORT_DELAY_MS, MILLISECONDS);
714 >        BlockingQueue q = p.getQueue();
715 >        assertEquals(tasks.length, q.size());
716 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
717 >        assertTrue(p.isShutdown());
718          assertTrue(q.isEmpty());
719 <        Thread.sleep(SMALL_DELAY_MS);
720 <        assertTrue(p1.isTerminated());
719 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
720 >        assertTrue(p.isTerminated());
721 >        for (ScheduledFuture task : tasks) {
722 >            assertTrue(task.isDone());
723 >            assertTrue(task.isCancelled());
724 >        }
725      }
726  
543
727      /**
728       * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
729 <     * periodic tasks are not cancelled at shutdown
729 >     * periodic tasks are cancelled at shutdown
730       */
731 <    public void testShutDown3() throws InterruptedException {
732 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
733 <        p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
731 >    public void testShutdown3() throws InterruptedException {
732 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
733 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
734 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
735 >        p.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
736 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
737 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
738 >        long initialDelay = LONG_DELAY_MS;
739          ScheduledFuture task =
740 <            p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, MILLISECONDS);
741 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
742 <        assertTrue(p1.isShutdown());
743 <        BlockingQueue q = p1.getQueue();
744 <        assertTrue(q.isEmpty());
745 <        Thread.sleep(SHORT_DELAY_MS);
746 <        assertTrue(p1.isTerminated());
740 >            p.scheduleAtFixedRate(new NoOpRunnable(), initialDelay,
741 >                                  5, MILLISECONDS);
742 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
743 >        assertTrue(p.isShutdown());
744 >        assertTrue(p.getQueue().isEmpty());
745 >        assertTrue(task.isDone());
746 >        assertTrue(task.isCancelled());
747 >        joinPool(p);
748      }
749  
750      /**
751       * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
752 <     * periodic tasks are cancelled at shutdown
752 >     * periodic tasks are not cancelled at shutdown
753       */
754 <    public void testShutDown4() throws InterruptedException {
755 <        ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
754 >    public void testShutdown4() throws InterruptedException {
755 >        ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
756 >        final CountDownLatch counter = new CountDownLatch(2);
757          try {
758 <            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
758 >            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
759 >            assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
760 >            assertTrue(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
761 >            final Runnable r = new CheckedRunnable() {
762 >                public void realRun() {
763 >                    counter.countDown();
764 >                }};
765              ScheduledFuture task =
766 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 1, 1, MILLISECONDS);
766 >                p.scheduleAtFixedRate(r, 1, 1, MILLISECONDS);
767 >            assertFalse(task.isDone());
768              assertFalse(task.isCancelled());
769 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
769 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
770              assertFalse(task.isCancelled());
771 <            assertFalse(p1.isTerminated());
772 <            assertTrue(p1.isShutdown());
773 <            Thread.sleep(SHORT_DELAY_MS);
771 >            assertFalse(p.isTerminated());
772 >            assertTrue(p.isShutdown());
773 >            assertTrue(counter.await(SMALL_DELAY_MS, MILLISECONDS));
774              assertFalse(task.isCancelled());
775 <            assertTrue(task.cancel(true));
775 >            assertTrue(task.cancel(false));
776              assertTrue(task.isDone());
777 <            Thread.sleep(SHORT_DELAY_MS);
778 <            assertTrue(p1.isTerminated());
777 >            assertTrue(task.isCancelled());
778 >            assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
779 >            assertTrue(p.isTerminated());
780          }
781          finally {
782 <            joinPool(p1);
782 >            joinPool(p);
783          }
784      }
785  
# Line 659 | Line 857 | public class ScheduledExecutorTest exten
857       * invokeAny(c) throws NPE if c has null elements
858       */
859      public void testInvokeAny3() throws Exception {
860 <        final CountDownLatch latch = new CountDownLatch(1);
860 >        CountDownLatch latch = new CountDownLatch(1);
861          ExecutorService e = new ScheduledThreadPoolExecutor(2);
862 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
863 +        l.add(latchAwaitingStringTask(latch));
864 +        l.add(null);
865          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 ok) {}
671                          return TEST_STRING;
672                      }});
673            l.add(null);
866              e.invokeAny(l);
867              shouldThrow();
868          } catch (NullPointerException success) {
# Line 685 | Line 877 | public class ScheduledExecutorTest exten
877       */
878      public void testInvokeAny4() throws Exception {
879          ExecutorService e = new ScheduledThreadPoolExecutor(2);
880 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
881 +        l.add(new NPETask());
882          try {
689            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
690            l.add(new NPETask());
883              e.invokeAny(l);
884              shouldThrow();
885          } catch (ExecutionException success) {
# Line 703 | Line 895 | public class ScheduledExecutorTest exten
895      public void testInvokeAny5() throws Exception {
896          ExecutorService e = new ScheduledThreadPoolExecutor(2);
897          try {
898 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
898 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
899              l.add(new StringTask());
900              l.add(new StringTask());
901              String result = e.invokeAny(l);
# Line 745 | Line 937 | public class ScheduledExecutorTest exten
937       */
938      public void testInvokeAll3() throws Exception {
939          ExecutorService e = new ScheduledThreadPoolExecutor(2);
940 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
941 +        l.add(new StringTask());
942 +        l.add(null);
943          try {
749            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
750            l.add(new StringTask());
751            l.add(null);
944              e.invokeAll(l);
945              shouldThrow();
946          } catch (NullPointerException success) {
# Line 762 | Line 954 | public class ScheduledExecutorTest exten
954       */
955      public void testInvokeAll4() throws Exception {
956          ExecutorService e = new ScheduledThreadPoolExecutor(2);
957 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
958 +        l.add(new NPETask());
959 +        List<Future<String>> futures = e.invokeAll(l);
960 +        assertEquals(1, futures.size());
961          try {
962 <            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();
962 >            futures.get(0).get();
963              shouldThrow();
964          } catch (ExecutionException success) {
965              assertTrue(success.getCause() instanceof NullPointerException);
# Line 783 | Line 974 | public class ScheduledExecutorTest exten
974      public void testInvokeAll5() throws Exception {
975          ExecutorService e = new ScheduledThreadPoolExecutor(2);
976          try {
977 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
977 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
978              l.add(new StringTask());
979              l.add(new StringTask());
980 <            List<Future<String>> result = e.invokeAll(l);
981 <            assertEquals(2, result.size());
982 <            for (Future<String> future : result)
980 >            List<Future<String>> futures = e.invokeAll(l);
981 >            assertEquals(2, futures.size());
982 >            for (Future<String> future : futures)
983                  assertSame(TEST_STRING, future.get());
984          } finally {
985              joinPool(e);
# Line 814 | Line 1005 | public class ScheduledExecutorTest exten
1005       */
1006      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1007          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1008 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1009 +        l.add(new StringTask());
1010          try {
818            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
819            l.add(new StringTask());
1011              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1012              shouldThrow();
1013          } catch (NullPointerException success) {
# Line 843 | Line 1034 | public class ScheduledExecutorTest exten
1034       * timed invokeAny(c) throws NPE if c has null elements
1035       */
1036      public void testTimedInvokeAny3() throws Exception {
1037 <        final CountDownLatch latch = new CountDownLatch(1);
1037 >        CountDownLatch latch = new CountDownLatch(1);
1038          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1039 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1040 +        l.add(latchAwaitingStringTask(latch));
1041 +        l.add(null);
1042          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 ok) {}
855                          return TEST_STRING;
856                      }});
857            l.add(null);
1043              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1044              shouldThrow();
1045          } catch (NullPointerException success) {
# Line 869 | Line 1054 | public class ScheduledExecutorTest exten
1054       */
1055      public void testTimedInvokeAny4() throws Exception {
1056          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1057 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1058 +        l.add(new NPETask());
1059          try {
873            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
874            l.add(new NPETask());
1060              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1061              shouldThrow();
1062          } catch (ExecutionException success) {
# Line 887 | Line 1072 | public class ScheduledExecutorTest exten
1072      public void testTimedInvokeAny5() throws Exception {
1073          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1074          try {
1075 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1075 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1076              l.add(new StringTask());
1077              l.add(new StringTask());
1078              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 916 | Line 1101 | public class ScheduledExecutorTest exten
1101       */
1102      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1103          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1104 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1105 +        l.add(new StringTask());
1106          try {
920            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
921            l.add(new StringTask());
1107              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1108              shouldThrow();
1109          } catch (NullPointerException success) {
# Line 945 | Line 1130 | public class ScheduledExecutorTest exten
1130       */
1131      public void testTimedInvokeAll3() throws Exception {
1132          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1133 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1134 +        l.add(new StringTask());
1135 +        l.add(null);
1136          try {
949            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
950            l.add(new StringTask());
951            l.add(null);
1137              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1138              shouldThrow();
1139          } catch (NullPointerException success) {
# Line 962 | Line 1147 | public class ScheduledExecutorTest exten
1147       */
1148      public void testTimedInvokeAll4() throws Exception {
1149          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1150 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1151 +        l.add(new NPETask());
1152 +        List<Future<String>> futures =
1153 +            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1154 +        assertEquals(1, futures.size());
1155          try {
1156 <            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();
1156 >            futures.get(0).get();
1157              shouldThrow();
1158          } catch (ExecutionException success) {
1159              assertTrue(success.getCause() instanceof NullPointerException);
# Line 983 | Line 1168 | public class ScheduledExecutorTest exten
1168      public void testTimedInvokeAll5() throws Exception {
1169          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1170          try {
1171 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1171 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1172              l.add(new StringTask());
1173              l.add(new StringTask());
1174 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1175 <            assertEquals(2, result.size());
1176 <            for (Future<String> future : result)
1174 >            List<Future<String>> futures =
1175 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1176 >            assertEquals(2, futures.size());
1177 >            for (Future<String> future : futures)
1178                  assertSame(TEST_STRING, future.get());
1179          } finally {
1180              joinPool(e);
# Line 1001 | Line 1187 | public class ScheduledExecutorTest exten
1187      public void testTimedInvokeAll6() throws Exception {
1188          ExecutorService e = new ScheduledThreadPoolExecutor(2);
1189          try {
1190 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1191 <            l.add(new StringTask());
1192 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1193 <            l.add(new StringTask());
1194 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1195 <            assertEquals(3, result.size());
1196 <            Iterator<Future<String>> it = result.iterator();
1197 <            Future<String> f1 = it.next();
1198 <            Future<String> f2 = it.next();
1199 <            Future<String> f3 = it.next();
1200 <            assertTrue(f1.isDone());
1201 <            assertTrue(f2.isDone());
1202 <            assertTrue(f3.isDone());
1203 <            assertFalse(f1.isCancelled());
1204 <            assertTrue(f2.isCancelled());
1190 >            for (long timeout = timeoutMillis();;) {
1191 >                List<Callable<String>> tasks = new ArrayList<>();
1192 >                tasks.add(new StringTask("0"));
1193 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1194 >                tasks.add(new StringTask("2"));
1195 >                long startTime = System.nanoTime();
1196 >                List<Future<String>> futures =
1197 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1198 >                assertEquals(tasks.size(), futures.size());
1199 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1200 >                for (Future future : futures)
1201 >                    assertTrue(future.isDone());
1202 >                assertTrue(futures.get(1).isCancelled());
1203 >                try {
1204 >                    assertEquals("0", futures.get(0).get());
1205 >                    assertEquals("2", futures.get(2).get());
1206 >                    break;
1207 >                } catch (CancellationException retryWithLongerTimeout) {
1208 >                    timeout *= 2;
1209 >                    if (timeout >= LONG_DELAY_MS / 2)
1210 >                        fail("expected exactly one task to be cancelled");
1211 >                }
1212 >            }
1213          } finally {
1214              joinPool(e);
1215          }
1216      }
1217  
1024
1218   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines