ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ScheduledExecutorSubclassTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ScheduledExecutorSubclassTest.java (file contents):
Revision 1.10 by jsr166, Tue Dec 1 09:48:12 2009 UTC vs.
Revision 1.37 by jsr166, Sun Sep 27 18:50:50 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   */
6  
7 import junit.framework.*;
8 import java.util.*;
9 import java.util.concurrent.*;
7   import static java.util.concurrent.TimeUnit.MILLISECONDS;
8 < import java.util.concurrent.atomic.*;
8 >
9 > import java.util.ArrayList;
10 > import java.util.List;
11 > import java.util.concurrent.BlockingQueue;
12 > import java.util.concurrent.Callable;
13 > import java.util.concurrent.CancellationException;
14 > import java.util.concurrent.CountDownLatch;
15 > import java.util.concurrent.Delayed;
16 > import java.util.concurrent.ExecutionException;
17 > import java.util.concurrent.Executors;
18 > import java.util.concurrent.ExecutorService;
19 > import java.util.concurrent.Future;
20 > import java.util.concurrent.RejectedExecutionException;
21 > import java.util.concurrent.RejectedExecutionHandler;
22 > import java.util.concurrent.RunnableScheduledFuture;
23 > import java.util.concurrent.ScheduledFuture;
24 > import java.util.concurrent.ScheduledThreadPoolExecutor;
25 > import java.util.concurrent.ThreadFactory;
26 > import java.util.concurrent.ThreadPoolExecutor;
27 > import java.util.concurrent.TimeoutException;
28 > import java.util.concurrent.TimeUnit;
29 > import java.util.concurrent.atomic.AtomicInteger;
30 >
31 > import junit.framework.Test;
32 > import junit.framework.TestSuite;
33  
34   public class ScheduledExecutorSubclassTest extends JSR166TestCase {
35      public static void main(String[] args) {
36 <        junit.textui.TestRunner.run (suite());
36 >        main(suite(), args);
37      }
38      public static Test suite() {
39          return new TestSuite(ScheduledExecutorSubclassTest.class);
# Line 36 | Line 57 | public class ScheduledExecutorSubclassTe
57          }
58          public boolean isCancelled() { return task.isCancelled(); }
59          public boolean isDone() { return task.isDone(); }
60 <        public V get() throws InterruptedException,  ExecutionException {
60 >        public V get() throws InterruptedException, ExecutionException {
61              V v = task.get();
62              assertTrue(ran);
63              return v;
64          }
65 <        public V get(long time, TimeUnit unit) throws InterruptedException,  ExecutionException, TimeoutException {
65 >        public V get(long time, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
66              V v = task.get(time, unit);
67              assertTrue(ran);
68              return v;
69          }
70      }
71  
51
72      public class CustomExecutor extends ScheduledThreadPoolExecutor {
73  
74          protected <V> RunnableScheduledFuture<V> decorateTask(Runnable r, RunnableScheduledFuture<V> task) {
# Line 58 | Line 78 | public class ScheduledExecutorSubclassTe
78          protected <V> RunnableScheduledFuture<V> decorateTask(Callable<V> c, RunnableScheduledFuture<V> task) {
79              return new CustomTask<V>(task);
80          }
81 <        CustomExecutor(int corePoolSize) { super(corePoolSize);}
81 >        CustomExecutor(int corePoolSize) { super(corePoolSize); }
82          CustomExecutor(int corePoolSize, RejectedExecutionHandler handler) {
83              super(corePoolSize, handler);
84          }
# Line 73 | Line 93 | public class ScheduledExecutorSubclassTe
93  
94      }
95  
76
96      /**
97       * execute successfully executes a runnable
98       */
99      public void testExecute() throws InterruptedException {
100 <        TrackedShortRunnable runnable =new TrackedShortRunnable();
101 <        CustomExecutor p1 = new CustomExecutor(1);
102 <        p1.execute(runnable);
103 <        assertFalse(runnable.done);
104 <        Thread.sleep(SHORT_DELAY_MS);
105 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
106 <        Thread.sleep(MEDIUM_DELAY_MS);
107 <        assertTrue(runnable.done);
108 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
109 <        joinPool(p1);
100 >        CustomExecutor p = new CustomExecutor(1);
101 >        final CountDownLatch done = new CountDownLatch(1);
102 >        final Runnable task = new CheckedRunnable() {
103 >            public void realRun() {
104 >                done.countDown();
105 >            }};
106 >        try {
107 >            p.execute(task);
108 >            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
109 >        } finally {
110 >            joinPool(p);
111 >        }
112      }
113  
93
114      /**
115       * delayed schedule of callable successfully executes after delay
116       */
117      public void testSchedule1() throws Exception {
118 <        TrackedCallable callable = new TrackedCallable();
119 <        CustomExecutor p1 = new CustomExecutor(1);
120 <        Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
121 <        assertFalse(callable.done);
122 <        Thread.sleep(MEDIUM_DELAY_MS);
123 <        assertTrue(callable.done);
124 <        assertEquals(Boolean.TRUE, f.get());
125 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
126 <        joinPool(p1);
118 >        CustomExecutor p = new CustomExecutor(1);
119 >        final long startTime = System.nanoTime();
120 >        final CountDownLatch done = new CountDownLatch(1);
121 >        try {
122 >            Callable task = new CheckedCallable<Boolean>() {
123 >                public Boolean realCall() {
124 >                    done.countDown();
125 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
126 >                    return Boolean.TRUE;
127 >                }};
128 >            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
129 >            assertSame(Boolean.TRUE, f.get());
130 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
131 >            assertTrue(done.await(0L, MILLISECONDS));
132 >        } finally {
133 >            joinPool(p);
134 >        }
135      }
136  
137      /**
138 <     *  delayed schedule of runnable successfully executes after delay
139 <     */
140 <    public void testSchedule3() throws InterruptedException {
141 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
142 <        CustomExecutor p1 = new CustomExecutor(1);
143 <        p1.schedule(runnable, SMALL_DELAY_MS, MILLISECONDS);
144 <        Thread.sleep(SHORT_DELAY_MS);
145 <        assertFalse(runnable.done);
146 <        Thread.sleep(MEDIUM_DELAY_MS);
147 <        assertTrue(runnable.done);
148 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
149 <        joinPool(p1);
138 >     * delayed schedule of runnable successfully executes after delay
139 >     */
140 >    public void testSchedule3() throws Exception {
141 >        CustomExecutor p = new CustomExecutor(1);
142 >        final long startTime = System.nanoTime();
143 >        final CountDownLatch done = new CountDownLatch(1);
144 >        try {
145 >            Runnable task = new CheckedRunnable() {
146 >                public void realRun() {
147 >                    done.countDown();
148 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
149 >                }};
150 >            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
151 >            await(done);
152 >            assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
153 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
154 >        } finally {
155 >            joinPool(p);
156 >        }
157      }
158  
159      /**
160       * scheduleAtFixedRate executes runnable after given initial delay
161       */
162      public void testSchedule4() throws InterruptedException {
163 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
164 <        CustomExecutor p1 = new CustomExecutor(1);
165 <        ScheduledFuture h = p1.scheduleAtFixedRate(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, MILLISECONDS);
166 <        assertFalse(runnable.done);
167 <        Thread.sleep(MEDIUM_DELAY_MS);
168 <        assertTrue(runnable.done);
169 <        h.cancel(true);
170 <        joinPool(p1);
171 <    }
172 <
173 <    static class RunnableCounter implements Runnable {
174 <        AtomicInteger count = new AtomicInteger(0);
175 <        public void run() { count.getAndIncrement(); }
163 >        CustomExecutor p = new CustomExecutor(1);
164 >        final long startTime = System.nanoTime();
165 >        final CountDownLatch done = new CountDownLatch(1);
166 >        try {
167 >            Runnable task = new CheckedRunnable() {
168 >                public void realRun() {
169 >                    done.countDown();
170 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
171 >                }};
172 >            ScheduledFuture f =
173 >                p.scheduleAtFixedRate(task, timeoutMillis(),
174 >                                      LONG_DELAY_MS, MILLISECONDS);
175 >            await(done);
176 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
177 >            f.cancel(true);
178 >        } finally {
179 >            joinPool(p);
180 >        }
181      }
182  
183      /**
184       * scheduleWithFixedDelay executes runnable after given initial delay
185       */
186      public void testSchedule5() throws InterruptedException {
187 <        TrackedShortRunnable runnable = new TrackedShortRunnable();
188 <        CustomExecutor p1 = new CustomExecutor(1);
189 <        ScheduledFuture h = p1.scheduleWithFixedDelay(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, MILLISECONDS);
190 <        assertFalse(runnable.done);
191 <        Thread.sleep(MEDIUM_DELAY_MS);
192 <        assertTrue(runnable.done);
193 <        h.cancel(true);
194 <        joinPool(p1);
187 >        CustomExecutor p = new CustomExecutor(1);
188 >        final long startTime = System.nanoTime();
189 >        final CountDownLatch done = new CountDownLatch(1);
190 >        try {
191 >            Runnable task = new CheckedRunnable() {
192 >                public void realRun() {
193 >                    done.countDown();
194 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
195 >                }};
196 >            ScheduledFuture f =
197 >                p.scheduleWithFixedDelay(task, timeoutMillis(),
198 >                                         LONG_DELAY_MS, MILLISECONDS);
199 >            await(done);
200 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
201 >            f.cancel(true);
202 >        } finally {
203 >            joinPool(p);
204 >        }
205 >    }
206 >
207 >    static class RunnableCounter implements Runnable {
208 >        AtomicInteger count = new AtomicInteger(0);
209 >        public void run() { count.getAndIncrement(); }
210      }
211  
212      /**
213       * scheduleAtFixedRate executes series of tasks at given rate
214       */
215      public void testFixedRateSequence() throws InterruptedException {
216 <        CustomExecutor p1 = new CustomExecutor(1);
217 <        RunnableCounter counter = new RunnableCounter();
218 <        ScheduledFuture h =
219 <            p1.scheduleAtFixedRate(counter, 0, 1, MILLISECONDS);
220 <        Thread.sleep(SMALL_DELAY_MS);
221 <        h.cancel(true);
222 <        int c = counter.count.get();
223 <        // By time scaling conventions, we must have at least
224 <        // an execution per SHORT delay, but no more than one SHORT more
225 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
226 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
227 <        joinPool(p1);
216 >        CustomExecutor p = new CustomExecutor(1);
217 >        try {
218 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
219 >                long startTime = System.nanoTime();
220 >                int cycles = 10;
221 >                final CountDownLatch done = new CountDownLatch(cycles);
222 >                Runnable task = new CheckedRunnable() {
223 >                    public void realRun() { done.countDown(); }};
224 >                ScheduledFuture h =
225 >                    p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
226 >                done.await();
227 >                h.cancel(true);
228 >                double normalizedTime =
229 >                    (double) millisElapsedSince(startTime) / delay;
230 >                if (normalizedTime >= cycles - 1 &&
231 >                    normalizedTime <= cycles)
232 >                    return;
233 >            }
234 >            throw new AssertionError("unexpected execution rate");
235 >        } finally {
236 >            joinPool(p);
237 >        }
238      }
239  
240      /**
241       * scheduleWithFixedDelay executes series of tasks with given period
242       */
243      public void testFixedDelaySequence() throws InterruptedException {
244 <        CustomExecutor p1 = new CustomExecutor(1);
245 <        RunnableCounter counter = new RunnableCounter();
246 <        ScheduledFuture h =
247 <            p1.scheduleWithFixedDelay(counter, 0, 1, MILLISECONDS);
248 <        Thread.sleep(SMALL_DELAY_MS);
249 <        h.cancel(true);
250 <        int c = counter.count.get();
251 <        assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
252 <        assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
253 <        joinPool(p1);
244 >        CustomExecutor p = new CustomExecutor(1);
245 >        try {
246 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
247 >                long startTime = System.nanoTime();
248 >                int cycles = 10;
249 >                final CountDownLatch done = new CountDownLatch(cycles);
250 >                Runnable task = new CheckedRunnable() {
251 >                    public void realRun() { done.countDown(); }};
252 >                ScheduledFuture h =
253 >                    p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
254 >                done.await();
255 >                h.cancel(true);
256 >                double normalizedTime =
257 >                    (double) millisElapsedSince(startTime) / delay;
258 >                if (normalizedTime >= cycles - 1 &&
259 >                    normalizedTime <= cycles)
260 >                    return;
261 >            }
262 >            throw new AssertionError("unexpected execution rate");
263 >        } finally {
264 >            joinPool(p);
265 >        }
266      }
267  
191
268      /**
269 <     *  execute (null) throws NPE
269 >     * execute(null) throws NPE
270       */
271      public void testExecuteNull() throws InterruptedException {
272          CustomExecutor se = new CustomExecutor(1);
# Line 202 | Line 278 | public class ScheduledExecutorSubclassTe
278      }
279  
280      /**
281 <     * schedule (null) throws NPE
281 >     * schedule(null) throws NPE
282       */
283      public void testScheduleNull() throws InterruptedException {
284          CustomExecutor se = new CustomExecutor(1);
# Line 250 | Line 326 | public class ScheduledExecutorSubclassTe
326      /**
327       * schedule callable throws RejectedExecutionException if shutdown
328       */
329 <     public void testSchedule3_RejectedExecutionException() {
330 <         CustomExecutor se = new CustomExecutor(1);
331 <         try {
332 <             se.shutdown();
333 <             se.schedule(new NoOpCallable(),
334 <                         MEDIUM_DELAY_MS, MILLISECONDS);
335 <             shouldThrow();
336 <         } catch (RejectedExecutionException success) {
337 <         } catch (SecurityException ok) {
338 <         }
339 <         joinPool(se);
329 >    public void testSchedule3_RejectedExecutionException() {
330 >        CustomExecutor se = new CustomExecutor(1);
331 >        try {
332 >            se.shutdown();
333 >            se.schedule(new NoOpCallable(),
334 >                        MEDIUM_DELAY_MS, MILLISECONDS);
335 >            shouldThrow();
336 >        } catch (RejectedExecutionException success) {
337 >        } catch (SecurityException ok) {
338 >        }
339 >        joinPool(se);
340      }
341  
342      /**
343 <     *  scheduleAtFixedRate throws RejectedExecutionException if shutdown
343 >     * scheduleAtFixedRate throws RejectedExecutionException if shutdown
344       */
345      public void testScheduleAtFixedRate1_RejectedExecutionException() {
346          CustomExecutor se = new CustomExecutor(1);
# Line 296 | Line 372 | public class ScheduledExecutorSubclassTe
372      }
373  
374      /**
375 <     *  getActiveCount increases but doesn't overestimate, when a
376 <     *  thread becomes active
375 >     * getActiveCount increases but doesn't overestimate, when a
376 >     * thread becomes active
377       */
378      public void testGetActiveCount() throws InterruptedException {
379 <        CustomExecutor p2 = new CustomExecutor(2);
380 <        assertEquals(0, p2.getActiveCount());
381 <        p2.execute(new SmallRunnable());
382 <        Thread.sleep(SHORT_DELAY_MS);
383 <        assertEquals(1, p2.getActiveCount());
384 <        joinPool(p2);
379 >        final ThreadPoolExecutor p = new CustomExecutor(2);
380 >        final CountDownLatch threadStarted = new CountDownLatch(1);
381 >        final CountDownLatch done = new CountDownLatch(1);
382 >        try {
383 >            assertEquals(0, p.getActiveCount());
384 >            p.execute(new CheckedRunnable() {
385 >                public void realRun() throws InterruptedException {
386 >                    threadStarted.countDown();
387 >                    assertEquals(1, p.getActiveCount());
388 >                    done.await();
389 >                }});
390 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
391 >            assertEquals(1, p.getActiveCount());
392 >        } finally {
393 >            done.countDown();
394 >            joinPool(p);
395 >        }
396      }
397  
398      /**
399 <     *    getCompletedTaskCount increases, but doesn't overestimate,
400 <     *   when tasks complete
399 >     * getCompletedTaskCount increases, but doesn't overestimate,
400 >     * when tasks complete
401       */
402      public void testGetCompletedTaskCount() throws InterruptedException {
403 <        CustomExecutor p2 = new CustomExecutor(2);
404 <        assertEquals(0, p2.getCompletedTaskCount());
405 <        p2.execute(new SmallRunnable());
406 <        Thread.sleep(MEDIUM_DELAY_MS);
407 <        assertEquals(1, p2.getCompletedTaskCount());
408 <        joinPool(p2);
403 >        final ThreadPoolExecutor p = new CustomExecutor(2);
404 >        final CountDownLatch threadStarted = new CountDownLatch(1);
405 >        final CountDownLatch threadProceed = new CountDownLatch(1);
406 >        final CountDownLatch threadDone = new CountDownLatch(1);
407 >        try {
408 >            assertEquals(0, p.getCompletedTaskCount());
409 >            p.execute(new CheckedRunnable() {
410 >                public void realRun() throws InterruptedException {
411 >                    threadStarted.countDown();
412 >                    assertEquals(0, p.getCompletedTaskCount());
413 >                    threadProceed.await();
414 >                    threadDone.countDown();
415 >                }});
416 >            await(threadStarted);
417 >            assertEquals(0, p.getCompletedTaskCount());
418 >            threadProceed.countDown();
419 >            threadDone.await();
420 >            long startTime = System.nanoTime();
421 >            while (p.getCompletedTaskCount() != 1) {
422 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
423 >                    fail("timed out");
424 >                Thread.yield();
425 >            }
426 >        } finally {
427 >            joinPool(p);
428 >        }
429      }
430  
431      /**
432 <     *  getCorePoolSize returns size given in constructor if not otherwise set
432 >     * getCorePoolSize returns size given in constructor if not otherwise set
433       */
434      public void testGetCorePoolSize() {
435 <        CustomExecutor p1 = new CustomExecutor(1);
436 <        assertEquals(1, p1.getCorePoolSize());
437 <        joinPool(p1);
435 >        CustomExecutor p = new CustomExecutor(1);
436 >        assertEquals(1, p.getCorePoolSize());
437 >        joinPool(p);
438      }
439  
440      /**
441 <     *    getLargestPoolSize increases, but doesn't overestimate, when
442 <     *   multiple threads active
441 >     * getLargestPoolSize increases, but doesn't overestimate, when
442 >     * multiple threads active
443       */
444      public void testGetLargestPoolSize() throws InterruptedException {
445 <        CustomExecutor p2 = new CustomExecutor(2);
446 <        assertEquals(0, p2.getLargestPoolSize());
447 <        p2.execute(new SmallRunnable());
448 <        p2.execute(new SmallRunnable());
449 <        Thread.sleep(SHORT_DELAY_MS);
450 <        assertEquals(2, p2.getLargestPoolSize());
451 <        joinPool(p2);
445 >        final int THREADS = 3;
446 >        final ThreadPoolExecutor p = new CustomExecutor(THREADS);
447 >        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
448 >        final CountDownLatch done = new CountDownLatch(1);
449 >        try {
450 >            assertEquals(0, p.getLargestPoolSize());
451 >            for (int i = 0; i < THREADS; i++)
452 >                p.execute(new CheckedRunnable() {
453 >                    public void realRun() throws InterruptedException {
454 >                        threadsStarted.countDown();
455 >                        done.await();
456 >                        assertEquals(THREADS, p.getLargestPoolSize());
457 >                    }});
458 >            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
459 >            assertEquals(THREADS, p.getLargestPoolSize());
460 >        } finally {
461 >            done.countDown();
462 >            joinPool(p);
463 >            assertEquals(THREADS, p.getLargestPoolSize());
464 >        }
465      }
466  
467      /**
468 <     *   getPoolSize increases, but doesn't overestimate, when threads
469 <     *   become active
468 >     * getPoolSize increases, but doesn't overestimate, when threads
469 >     * become active
470       */
471 <    public void testGetPoolSize() {
472 <        CustomExecutor p1 = new CustomExecutor(1);
473 <        assertEquals(0, p1.getPoolSize());
474 <        p1.execute(new SmallRunnable());
475 <        assertEquals(1, p1.getPoolSize());
476 <        joinPool(p1);
471 >    public void testGetPoolSize() throws InterruptedException {
472 >        final ThreadPoolExecutor p = new CustomExecutor(1);
473 >        final CountDownLatch threadStarted = new CountDownLatch(1);
474 >        final CountDownLatch done = new CountDownLatch(1);
475 >        try {
476 >            assertEquals(0, p.getPoolSize());
477 >            p.execute(new CheckedRunnable() {
478 >                public void realRun() throws InterruptedException {
479 >                    threadStarted.countDown();
480 >                    assertEquals(1, p.getPoolSize());
481 >                    done.await();
482 >                }});
483 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
484 >            assertEquals(1, p.getPoolSize());
485 >        } finally {
486 >            done.countDown();
487 >            joinPool(p);
488 >        }
489      }
490  
491      /**
492 <     *    getTaskCount increases, but doesn't overestimate, when tasks
493 <     *    submitted
492 >     * getTaskCount increases, but doesn't overestimate, when tasks
493 >     * submitted
494       */
495      public void testGetTaskCount() throws InterruptedException {
496 <        CustomExecutor p1 = new CustomExecutor(1);
497 <        assertEquals(0, p1.getTaskCount());
498 <        for (int i = 0; i < 5; i++)
499 <            p1.execute(new SmallRunnable());
500 <        Thread.sleep(SHORT_DELAY_MS);
501 <        assertEquals(5, p1.getTaskCount());
502 <        joinPool(p1);
496 >        final ThreadPoolExecutor p = new CustomExecutor(1);
497 >        final CountDownLatch threadStarted = new CountDownLatch(1);
498 >        final CountDownLatch done = new CountDownLatch(1);
499 >        final int TASKS = 5;
500 >        try {
501 >            assertEquals(0, p.getTaskCount());
502 >            for (int i = 0; i < TASKS; i++)
503 >                p.execute(new CheckedRunnable() {
504 >                    public void realRun() throws InterruptedException {
505 >                        threadStarted.countDown();
506 >                        done.await();
507 >                    }});
508 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
509 >            assertEquals(TASKS, p.getTaskCount());
510 >        } finally {
511 >            done.countDown();
512 >            joinPool(p);
513 >        }
514      }
515  
516      /**
# Line 406 | Line 549 | public class ScheduledExecutorSubclassTe
549      }
550  
551      /**
552 <     *   is isShutDown is false before shutdown, true after
552 >     * isShutdown is false before shutdown, true after
553       */
554      public void testIsShutdown() {
555 <        CustomExecutor p1 = new CustomExecutor(1);
555 >        CustomExecutor p = new CustomExecutor(1);
556          try {
557 <            assertFalse(p1.isShutdown());
557 >            assertFalse(p.isShutdown());
558          }
559          finally {
560 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
560 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
561          }
562 <        assertTrue(p1.isShutdown());
562 >        assertTrue(p.isShutdown());
563      }
564  
422
565      /**
566 <     *  isTerminated is false before termination, true after
566 >     * isTerminated is false before termination, true after
567       */
568      public void testIsTerminated() throws InterruptedException {
569 <        CustomExecutor p1 = new CustomExecutor(1);
569 >        final ThreadPoolExecutor p = new CustomExecutor(1);
570 >        final CountDownLatch threadStarted = new CountDownLatch(1);
571 >        final CountDownLatch done = new CountDownLatch(1);
572 >        assertFalse(p.isTerminated());
573          try {
574 <            p1.execute(new SmallRunnable());
574 >            p.execute(new CheckedRunnable() {
575 >                public void realRun() throws InterruptedException {
576 >                    assertFalse(p.isTerminated());
577 >                    threadStarted.countDown();
578 >                    done.await();
579 >                }});
580 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
581 >            assertFalse(p.isTerminating());
582 >            done.countDown();
583          } finally {
584 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
584 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
585          }
586 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
587 <        assertTrue(p1.isTerminated());
586 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
587 >        assertTrue(p.isTerminated());
588      }
589  
590      /**
591 <     *  isTerminating is not true when running or when terminated
591 >     * isTerminating is not true when running or when terminated
592       */
593      public void testIsTerminating() throws InterruptedException {
594 <        CustomExecutor p1 = new CustomExecutor(1);
595 <        assertFalse(p1.isTerminating());
596 <        try {
597 <            p1.execute(new SmallRunnable());
598 <            assertFalse(p1.isTerminating());
599 <        } finally {
600 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
601 <        }
602 <        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
603 <        assertTrue(p1.isTerminated());
604 <        assertFalse(p1.isTerminating());
594 >        final ThreadPoolExecutor p = new CustomExecutor(1);
595 >        final CountDownLatch threadStarted = new CountDownLatch(1);
596 >        final CountDownLatch done = new CountDownLatch(1);
597 >        try {
598 >            assertFalse(p.isTerminating());
599 >            p.execute(new CheckedRunnable() {
600 >                public void realRun() throws InterruptedException {
601 >                    assertFalse(p.isTerminating());
602 >                    threadStarted.countDown();
603 >                    done.await();
604 >                }});
605 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
606 >            assertFalse(p.isTerminating());
607 >            done.countDown();
608 >        } finally {
609 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
610 >        }
611 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
612 >        assertTrue(p.isTerminated());
613 >        assertFalse(p.isTerminating());
614      }
615  
616      /**
617       * getQueue returns the work queue, which contains queued tasks
618       */
619      public void testGetQueue() throws InterruptedException {
620 <        CustomExecutor p1 = new CustomExecutor(1);
621 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
622 <        for (int i = 0; i < 5; i++) {
623 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
624 <        }
625 <        try {
626 <            Thread.sleep(SHORT_DELAY_MS);
627 <            BlockingQueue<Runnable> q = p1.getQueue();
628 <            assertTrue(q.contains(tasks[4]));
620 >        ScheduledThreadPoolExecutor p = new CustomExecutor(1);
621 >        final CountDownLatch threadStarted = new CountDownLatch(1);
622 >        final CountDownLatch done = new CountDownLatch(1);
623 >        try {
624 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
625 >            for (int i = 0; i < tasks.length; i++) {
626 >                Runnable r = new CheckedRunnable() {
627 >                    public void realRun() throws InterruptedException {
628 >                        threadStarted.countDown();
629 >                        done.await();
630 >                    }};
631 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
632 >            }
633 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
634 >            BlockingQueue<Runnable> q = p.getQueue();
635 >            assertTrue(q.contains(tasks[tasks.length - 1]));
636              assertFalse(q.contains(tasks[0]));
637          } finally {
638 <            joinPool(p1);
638 >            done.countDown();
639 >            joinPool(p);
640          }
641      }
642  
# Line 474 | Line 644 | public class ScheduledExecutorSubclassTe
644       * remove(task) removes queued task, and fails to remove active task
645       */
646      public void testRemove() throws InterruptedException {
647 <        CustomExecutor p1 = new CustomExecutor(1);
647 >        final ScheduledThreadPoolExecutor p = new CustomExecutor(1);
648          ScheduledFuture[] tasks = new ScheduledFuture[5];
649 <        for (int i = 0; i < 5; i++) {
650 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, MILLISECONDS);
481 <        }
649 >        final CountDownLatch threadStarted = new CountDownLatch(1);
650 >        final CountDownLatch done = new CountDownLatch(1);
651          try {
652 <            Thread.sleep(SHORT_DELAY_MS);
653 <            BlockingQueue<Runnable> q = p1.getQueue();
654 <            assertFalse(p1.remove((Runnable)tasks[0]));
652 >            for (int i = 0; i < tasks.length; i++) {
653 >                Runnable r = new CheckedRunnable() {
654 >                    public void realRun() throws InterruptedException {
655 >                        threadStarted.countDown();
656 >                        done.await();
657 >                    }};
658 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
659 >            }
660 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
661 >            BlockingQueue<Runnable> q = p.getQueue();
662 >            assertFalse(p.remove((Runnable)tasks[0]));
663              assertTrue(q.contains((Runnable)tasks[4]));
664              assertTrue(q.contains((Runnable)tasks[3]));
665 <            assertTrue(p1.remove((Runnable)tasks[4]));
666 <            assertFalse(p1.remove((Runnable)tasks[4]));
665 >            assertTrue(p.remove((Runnable)tasks[4]));
666 >            assertFalse(p.remove((Runnable)tasks[4]));
667              assertFalse(q.contains((Runnable)tasks[4]));
668              assertTrue(q.contains((Runnable)tasks[3]));
669 <            assertTrue(p1.remove((Runnable)tasks[3]));
669 >            assertTrue(p.remove((Runnable)tasks[3]));
670              assertFalse(q.contains((Runnable)tasks[3]));
671          } finally {
672 <            joinPool(p1);
672 >            done.countDown();
673 >            joinPool(p);
674          }
675      }
676  
677      /**
678 <     *  purge removes cancelled tasks from the queue
678 >     * purge removes cancelled tasks from the queue
679       */
680      public void testPurge() throws InterruptedException {
681 <        CustomExecutor p1 = new CustomExecutor(1);
681 >        CustomExecutor p = new CustomExecutor(1);
682          ScheduledFuture[] tasks = new ScheduledFuture[5];
683 <        for (int i = 0; i < 5; i++) {
684 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
685 <        }
683 >        for (int i = 0; i < tasks.length; i++)
684 >            tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
685 >                                  LONG_DELAY_MS, MILLISECONDS);
686          try {
687 <            int max = 5;
687 >            int max = tasks.length;
688              if (tasks[4].cancel(true)) --max;
689              if (tasks[3].cancel(true)) --max;
690              // There must eventually be an interference-free point at
691              // which purge will not fail. (At worst, when queue is empty.)
692 <            int k;
693 <            for (k = 0; k < SMALL_DELAY_MS; ++k) {
694 <                p1.purge();
695 <                long count = p1.getTaskCount();
696 <                if (count >= 0 && count <= max)
697 <                    break;
698 <                Thread.sleep(1);
699 <            }
522 <            assertTrue(k < SMALL_DELAY_MS);
692 >            long startTime = System.nanoTime();
693 >            do {
694 >                p.purge();
695 >                long count = p.getTaskCount();
696 >                if (count == max)
697 >                    return;
698 >            } while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
699 >            fail("Purge failed to remove cancelled tasks");
700          } finally {
701 <            joinPool(p1);
701 >            for (ScheduledFuture task : tasks)
702 >                task.cancel(true);
703 >            joinPool(p);
704          }
705      }
706  
707      /**
708 <     *  shutDownNow returns a list containing tasks that were not run
708 >     * shutdownNow returns a list containing tasks that were not run,
709 >     * and those tasks are drained from the queue
710       */
711 <    public void testShutDownNow() {
712 <        CustomExecutor p1 = new CustomExecutor(1);
711 >    public void testShutdownNow() {
712 >        CustomExecutor p = new CustomExecutor(1);
713          for (int i = 0; i < 5; i++)
714 <            p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, MILLISECONDS);
715 <        List l;
714 >            p.schedule(new SmallPossiblyInterruptedRunnable(),
715 >                       LONG_DELAY_MS, MILLISECONDS);
716          try {
717 <            l = p1.shutdownNow();
717 >            List<Runnable> l = p.shutdownNow();
718 >            assertTrue(p.isShutdown());
719 >            assertTrue(p.getQueue().isEmpty());
720 >            assertEquals(5, l.size());
721          } catch (SecurityException ok) {
722 <            return;
722 >            // Allowed in case test doesn't have privs
723 >        } finally {
724 >            joinPool(p);
725          }
541        assertTrue(p1.isShutdown());
542        assertTrue(l.size() > 0 && l.size() <= 5);
543        joinPool(p1);
726      }
727  
728      /**
729       * In default setting, shutdown cancels periodic but not delayed
730       * tasks at shutdown
731       */
732 <    public void testShutDown1() throws InterruptedException {
733 <        CustomExecutor p1 = new CustomExecutor(1);
734 <        assertTrue(p1.getExecuteExistingDelayedTasksAfterShutdownPolicy());
735 <        assertFalse(p1.getContinueExistingPeriodicTasksAfterShutdownPolicy());
732 >    public void testShutdown1() throws InterruptedException {
733 >        CustomExecutor p = new CustomExecutor(1);
734 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
735 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
736  
737          ScheduledFuture[] tasks = new ScheduledFuture[5];
738 <        for (int i = 0; i < 5; i++)
739 <            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
740 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
741 <        BlockingQueue q = p1.getQueue();
742 <        for (Iterator it = q.iterator(); it.hasNext();) {
743 <            ScheduledFuture t = (ScheduledFuture)it.next();
744 <            assertFalse(t.isCancelled());
745 <        }
746 <        assertTrue(p1.isShutdown());
747 <        Thread.sleep(SMALL_DELAY_MS);
748 <        for (int i = 0; i < 5; ++i) {
749 <            assertTrue(tasks[i].isDone());
750 <            assertFalse(tasks[i].isCancelled());
738 >        for (int i = 0; i < tasks.length; i++)
739 >            tasks[i] = p.schedule(new NoOpRunnable(),
740 >                                  SHORT_DELAY_MS, MILLISECONDS);
741 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
742 >        BlockingQueue<Runnable> q = p.getQueue();
743 >        for (ScheduledFuture task : tasks) {
744 >            assertFalse(task.isDone());
745 >            assertFalse(task.isCancelled());
746 >            assertTrue(q.contains(task));
747 >        }
748 >        assertTrue(p.isShutdown());
749 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
750 >        assertTrue(p.isTerminated());
751 >        for (ScheduledFuture task : tasks) {
752 >            assertTrue(task.isDone());
753 >            assertFalse(task.isCancelled());
754          }
755      }
756  
572
757      /**
758       * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
759       * delayed tasks are cancelled at shutdown
760       */
761 <    public void testShutDown2() throws InterruptedException {
762 <        CustomExecutor p1 = new CustomExecutor(1);
763 <        p1.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
761 >    public void testShutdown2() throws InterruptedException {
762 >        CustomExecutor p = new CustomExecutor(1);
763 >        p.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
764 >        assertFalse(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
765 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
766          ScheduledFuture[] tasks = new ScheduledFuture[5];
767 <        for (int i = 0; i < 5; i++)
768 <            tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, MILLISECONDS);
769 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
770 <        assertTrue(p1.isShutdown());
771 <        BlockingQueue q = p1.getQueue();
767 >        for (int i = 0; i < tasks.length; i++)
768 >            tasks[i] = p.schedule(new NoOpRunnable(),
769 >                                  SHORT_DELAY_MS, MILLISECONDS);
770 >        BlockingQueue q = p.getQueue();
771 >        assertEquals(tasks.length, q.size());
772 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
773 >        assertTrue(p.isShutdown());
774          assertTrue(q.isEmpty());
775 <        Thread.sleep(SMALL_DELAY_MS);
776 <        assertTrue(p1.isTerminated());
775 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
776 >        assertTrue(p.isTerminated());
777 >        for (ScheduledFuture task : tasks) {
778 >            assertTrue(task.isDone());
779 >            assertTrue(task.isCancelled());
780 >        }
781      }
782  
591
783      /**
784       * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
785 <     * periodic tasks are not cancelled at shutdown
785 >     * periodic tasks are cancelled at shutdown
786       */
787 <    public void testShutDown3() throws InterruptedException {
788 <        CustomExecutor p1 = new CustomExecutor(1);
789 <        p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
787 >    public void testShutdown3() throws InterruptedException {
788 >        CustomExecutor p = new CustomExecutor(1);
789 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
790 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
791 >        p.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
792 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
793 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
794 >        long initialDelay = LONG_DELAY_MS;
795          ScheduledFuture task =
796 <            p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, MILLISECONDS);
797 <        try { p1.shutdown(); } catch (SecurityException ok) { return; }
798 <        assertTrue(p1.isShutdown());
799 <        BlockingQueue q = p1.getQueue();
800 <        assertTrue(q.isEmpty());
801 <        Thread.sleep(SHORT_DELAY_MS);
802 <        assertTrue(p1.isTerminated());
796 >            p.scheduleAtFixedRate(new NoOpRunnable(), initialDelay,
797 >                                  5, MILLISECONDS);
798 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
799 >        assertTrue(p.isShutdown());
800 >        assertTrue(p.getQueue().isEmpty());
801 >        assertTrue(task.isDone());
802 >        assertTrue(task.isCancelled());
803 >        joinPool(p);
804      }
805  
806      /**
807       * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
808 <     * periodic tasks are cancelled at shutdown
808 >     * periodic tasks are not cancelled at shutdown
809       */
810 <    public void testShutDown4() throws InterruptedException {
811 <        CustomExecutor p1 = new CustomExecutor(1);
810 >    public void testShutdown4() throws InterruptedException {
811 >        CustomExecutor p = new CustomExecutor(1);
812 >        final CountDownLatch counter = new CountDownLatch(2);
813          try {
814 <            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
814 >            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
815 >            assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
816 >            assertTrue(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
817 >            final Runnable r = new CheckedRunnable() {
818 >                public void realRun() {
819 >                    counter.countDown();
820 >                }};
821              ScheduledFuture task =
822 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 1, 1, MILLISECONDS);
822 >                p.scheduleAtFixedRate(r, 1, 1, MILLISECONDS);
823 >            assertFalse(task.isDone());
824              assertFalse(task.isCancelled());
825 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
825 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
826              assertFalse(task.isCancelled());
827 <            assertFalse(p1.isTerminated());
828 <            assertTrue(p1.isShutdown());
829 <            Thread.sleep(SHORT_DELAY_MS);
827 >            assertFalse(p.isTerminated());
828 >            assertTrue(p.isShutdown());
829 >            assertTrue(counter.await(SMALL_DELAY_MS, MILLISECONDS));
830              assertFalse(task.isCancelled());
831 <            assertTrue(task.cancel(true));
831 >            assertTrue(task.cancel(false));
832              assertTrue(task.isDone());
833 <            Thread.sleep(SHORT_DELAY_MS);
834 <            assertTrue(p1.isTerminated());
833 >            assertTrue(task.isCancelled());
834 >            assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
835 >            assertTrue(p.isTerminated());
836          }
837          finally {
838 <            joinPool(p1);
838 >            joinPool(p);
839          }
840      }
841  
# Line 707 | Line 913 | public class ScheduledExecutorSubclassTe
913       * invokeAny(c) throws NPE if c has null elements
914       */
915      public void testInvokeAny3() throws Exception {
916 <        final CountDownLatch latch = new CountDownLatch(1);
916 >        CountDownLatch latch = new CountDownLatch(1);
917          ExecutorService e = new CustomExecutor(2);
918 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
919 +        l.add(latchAwaitingStringTask(latch));
920 +        l.add(null);
921          try {
713            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
714            l.add(new Callable<String>() {
715                      public String call() {
716                          try {
717                              latch.await();
718                          } catch (InterruptedException quittingTime) {}
719                          return TEST_STRING;
720                      }});
721            l.add(null);
922              e.invokeAny(l);
923              shouldThrow();
924          } catch (NullPointerException success) {
# Line 733 | Line 933 | public class ScheduledExecutorSubclassTe
933       */
934      public void testInvokeAny4() throws Exception {
935          ExecutorService e = new CustomExecutor(2);
936 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
937 +        l.add(new NPETask());
938          try {
737            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
738            l.add(new NPETask());
939              e.invokeAny(l);
940              shouldThrow();
941          } catch (ExecutionException success) {
# Line 751 | Line 951 | public class ScheduledExecutorSubclassTe
951      public void testInvokeAny5() throws Exception {
952          ExecutorService e = new CustomExecutor(2);
953          try {
954 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
954 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
955              l.add(new StringTask());
956              l.add(new StringTask());
957              String result = e.invokeAny(l);
# Line 793 | Line 993 | public class ScheduledExecutorSubclassTe
993       */
994      public void testInvokeAll3() throws Exception {
995          ExecutorService e = new CustomExecutor(2);
996 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
997 +        l.add(new StringTask());
998 +        l.add(null);
999          try {
797            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
798            l.add(new StringTask());
799            l.add(null);
1000              e.invokeAll(l);
1001              shouldThrow();
1002          } catch (NullPointerException success) {
# Line 810 | Line 1010 | public class ScheduledExecutorSubclassTe
1010       */
1011      public void testInvokeAll4() throws Exception {
1012          ExecutorService e = new CustomExecutor(2);
1013 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1014 +        l.add(new NPETask());
1015 +        List<Future<String>> futures = e.invokeAll(l);
1016 +        assertEquals(1, futures.size());
1017          try {
1018 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
815 <            l.add(new NPETask());
816 <            List<Future<String>> result = e.invokeAll(l);
817 <            assertEquals(1, result.size());
818 <            for (Future<String> future : result)
819 <                future.get();
1018 >            futures.get(0).get();
1019              shouldThrow();
1020          } catch (ExecutionException success) {
1021              assertTrue(success.getCause() instanceof NullPointerException);
# Line 831 | Line 1030 | public class ScheduledExecutorSubclassTe
1030      public void testInvokeAll5() throws Exception {
1031          ExecutorService e = new CustomExecutor(2);
1032          try {
1033 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1033 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1034              l.add(new StringTask());
1035              l.add(new StringTask());
1036 <            List<Future<String>> result = e.invokeAll(l);
1037 <            assertEquals(2, result.size());
1038 <            for (Future<String> future : result)
1036 >            List<Future<String>> futures = e.invokeAll(l);
1037 >            assertEquals(2, futures.size());
1038 >            for (Future<String> future : futures)
1039                  assertSame(TEST_STRING, future.get());
1040          } finally {
1041              joinPool(e);
# Line 862 | Line 1061 | public class ScheduledExecutorSubclassTe
1061       */
1062      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1063          ExecutorService e = new CustomExecutor(2);
1064 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1065 +        l.add(new StringTask());
1066          try {
866            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
867            l.add(new StringTask());
1067              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1068              shouldThrow();
1069          } catch (NullPointerException success) {
# Line 891 | Line 1090 | public class ScheduledExecutorSubclassTe
1090       * timed invokeAny(c) throws NPE if c has null elements
1091       */
1092      public void testTimedInvokeAny3() throws Exception {
1093 <        final CountDownLatch latch = new CountDownLatch(1);
1093 >        CountDownLatch latch = new CountDownLatch(1);
1094          ExecutorService e = new CustomExecutor(2);
1095 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1096 +        l.add(latchAwaitingStringTask(latch));
1097 +        l.add(null);
1098          try {
897            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
898            l.add(new Callable<String>() {
899                      public String call() {
900                          try {
901                              latch.await();
902                          } catch (InterruptedException quittingTime) {}
903                          return TEST_STRING;
904                      }});
905            l.add(null);
1099              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1100              shouldThrow();
1101          } catch (NullPointerException success) {
# Line 917 | Line 1110 | public class ScheduledExecutorSubclassTe
1110       */
1111      public void testTimedInvokeAny4() throws Exception {
1112          ExecutorService e = new CustomExecutor(2);
1113 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1114 +        l.add(new NPETask());
1115          try {
921            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
922            l.add(new NPETask());
1116              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1117              shouldThrow();
1118          } catch (ExecutionException success) {
# Line 935 | Line 1128 | public class ScheduledExecutorSubclassTe
1128      public void testTimedInvokeAny5() throws Exception {
1129          ExecutorService e = new CustomExecutor(2);
1130          try {
1131 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1131 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1132              l.add(new StringTask());
1133              l.add(new StringTask());
1134              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 964 | Line 1157 | public class ScheduledExecutorSubclassTe
1157       */
1158      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1159          ExecutorService e = new CustomExecutor(2);
1160 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1161 +        l.add(new StringTask());
1162          try {
968            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
969            l.add(new StringTask());
1163              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1164              shouldThrow();
1165          } catch (NullPointerException success) {
# Line 993 | Line 1186 | public class ScheduledExecutorSubclassTe
1186       */
1187      public void testTimedInvokeAll3() throws Exception {
1188          ExecutorService e = new CustomExecutor(2);
1189 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1190 +        l.add(new StringTask());
1191 +        l.add(null);
1192          try {
997            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
998            l.add(new StringTask());
999            l.add(null);
1193              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1194              shouldThrow();
1195          } catch (NullPointerException success) {
# Line 1010 | Line 1203 | public class ScheduledExecutorSubclassTe
1203       */
1204      public void testTimedInvokeAll4() throws Exception {
1205          ExecutorService e = new CustomExecutor(2);
1206 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1207 +        l.add(new NPETask());
1208 +        List<Future<String>> futures =
1209 +            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1210 +        assertEquals(1, futures.size());
1211          try {
1212 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1015 <            l.add(new NPETask());
1016 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1017 <            assertEquals(1, result.size());
1018 <            for (Future<String> future : result)
1019 <                future.get();
1212 >            futures.get(0).get();
1213              shouldThrow();
1214          } catch (ExecutionException success) {
1215              assertTrue(success.getCause() instanceof NullPointerException);
# Line 1031 | Line 1224 | public class ScheduledExecutorSubclassTe
1224      public void testTimedInvokeAll5() throws Exception {
1225          ExecutorService e = new CustomExecutor(2);
1226          try {
1227 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1227 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1228              l.add(new StringTask());
1229              l.add(new StringTask());
1230 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1231 <            assertEquals(2, result.size());
1232 <            for (Future<String> future : result)
1230 >            List<Future<String>> futures =
1231 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1232 >            assertEquals(2, futures.size());
1233 >            for (Future<String> future : futures)
1234                  assertSame(TEST_STRING, future.get());
1235          } finally {
1236              joinPool(e);
# Line 1049 | Line 1243 | public class ScheduledExecutorSubclassTe
1243      public void testTimedInvokeAll6() throws Exception {
1244          ExecutorService e = new CustomExecutor(2);
1245          try {
1246 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1247 <            l.add(new StringTask());
1248 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1249 <            l.add(new StringTask());
1250 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1251 <            assertEquals(3, result.size());
1252 <            Iterator<Future<String>> it = result.iterator();
1253 <            Future<String> f1 = it.next();
1254 <            Future<String> f2 = it.next();
1255 <            Future<String> f3 = it.next();
1256 <            assertTrue(f1.isDone());
1257 <            assertTrue(f2.isDone());
1258 <            assertTrue(f3.isDone());
1259 <            assertFalse(f1.isCancelled());
1260 <            assertTrue(f2.isCancelled());
1246 >            for (long timeout = timeoutMillis();;) {
1247 >                List<Callable<String>> tasks = new ArrayList<>();
1248 >                tasks.add(new StringTask("0"));
1249 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1250 >                tasks.add(new StringTask("2"));
1251 >                long startTime = System.nanoTime();
1252 >                List<Future<String>> futures =
1253 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1254 >                assertEquals(tasks.size(), futures.size());
1255 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1256 >                for (Future future : futures)
1257 >                    assertTrue(future.isDone());
1258 >                assertTrue(futures.get(1).isCancelled());
1259 >                try {
1260 >                    assertEquals("0", futures.get(0).get());
1261 >                    assertEquals("2", futures.get(2).get());
1262 >                    break;
1263 >                } catch (CancellationException retryWithLongerTimeout) {
1264 >                    timeout *= 2;
1265 >                    if (timeout >= LONG_DELAY_MS / 2)
1266 >                        fail("expected exactly one task to be cancelled");
1267 >                }
1268 >            }
1269          } finally {
1270              joinPool(e);
1271          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines