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.1 by dl, Fri May 20 16:30:17 2005 UTC vs.
Revision 1.36 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   */
6  
7 < import junit.framework.*;
8 < import java.util.*;
9 < import java.util.concurrent.*;
10 < import java.util.concurrent.atomic.*;
7 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
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(ScheduledExecutorTest.class);
39 >        return new TestSuite(ScheduledExecutorSubclassTest.class);
40      }
41  
42 <    static class CustomTask<V> implements RunnableScheduledFuture<V> {
42 >    static class CustomTask<V> implements RunnableScheduledFuture<V> {
43          RunnableScheduledFuture<V> task;
44          volatile boolean ran;
45          CustomTask(RunnableScheduledFuture<V> t) { task = t; }
46          public boolean isPeriodic() { return task.isPeriodic(); }
47 <        public void run() {
47 >        public void run() {
48              ran = true;
49 <            task.run();
49 >            task.run();
50          }
51          public long getDelay(TimeUnit unit) { return task.getDelay(unit); }
52          public int compareTo(Delayed t) {
53 <            return task.compareTo(((CustomTask)t).task);
53 >            return task.compareTo(((CustomTask)t).task);
54          }
55          public boolean cancel(boolean mayInterruptIfRunning) {
56              return task.cancel(mayInterruptIfRunning);
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      }
49    
71  
72      public class CustomExecutor extends ScheduledThreadPoolExecutor {
73  
# Line 57 | 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 65 | Line 86 | public class ScheduledExecutorSubclassTe
86          CustomExecutor(int corePoolSize, ThreadFactory threadFactory) {
87              super(corePoolSize, threadFactory);
88          }
89 <        CustomExecutor(int corePoolSize, ThreadFactory threadFactory,
89 >        CustomExecutor(int corePoolSize, ThreadFactory threadFactory,
90                         RejectedExecutionHandler handler) {
91              super(corePoolSize, threadFactory, handler);
92          }
72        
73    }
74
93  
94 +    }
95  
96      /**
97       * execute successfully executes a runnable
98       */
99 <    public void testExecute() {
100 <        try {
101 <            TrackedShortRunnable runnable =new TrackedShortRunnable();
102 <            CustomExecutor p1 = new CustomExecutor(1);
103 <            p1.execute(runnable);
104 <            assertFalse(runnable.done);
105 <            Thread.sleep(SHORT_DELAY_MS);
106 <            try { p1.shutdown(); } catch(SecurityException ok) { return; }
107 <            try {
108 <                Thread.sleep(MEDIUM_DELAY_MS);
109 <            } catch(InterruptedException e){
110 <                unexpectedException();
92 <            }
93 <            assertTrue(runnable.done);
94 <            try { p1.shutdown(); } catch(SecurityException ok) { return; }
95 <            joinPool(p1);
96 <        }
97 <        catch(Exception e){
98 <            unexpectedException();
99 >    public void testExecute() throws InterruptedException {
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          }
100        
112      }
113  
103
114      /**
115       * delayed schedule of callable successfully executes after delay
116       */
117 <    public void testSchedule1() {
118 <        try {
119 <            TrackedCallable callable = new TrackedCallable();
120 <            CustomExecutor p1 = new CustomExecutor(1);
121 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
122 <            assertFalse(callable.done);
123 <            Thread.sleep(MEDIUM_DELAY_MS);
124 <            assertTrue(callable.done);
125 <            assertEquals(Boolean.TRUE, f.get());
126 <            try { p1.shutdown(); } catch(SecurityException ok) { return; }
127 <            joinPool(p1);
128 <        } catch(RejectedExecutionException e){}
129 <        catch(Exception e){
130 <            e.printStackTrace();
131 <            unexpectedException();
117 >    public void testSchedule1() throws Exception {
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() {
141 <        try {
142 <            TrackedShortRunnable runnable = new TrackedShortRunnable();
143 <            CustomExecutor p1 = new CustomExecutor(1);
144 <            p1.schedule(runnable, SMALL_DELAY_MS, TimeUnit.MILLISECONDS);
145 <            Thread.sleep(SHORT_DELAY_MS);
146 <            assertFalse(runnable.done);
147 <            Thread.sleep(MEDIUM_DELAY_MS);
148 <            assertTrue(runnable.done);
149 <            try { p1.shutdown(); } catch(SecurityException ok) { return; }
150 <            joinPool(p1);
151 <        } catch(Exception e){
152 <            unexpectedException();
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 <    
158 >
159      /**
160       * scheduleAtFixedRate executes runnable after given initial delay
161       */
162 <    public void testSchedule4() {
163 <        try {
164 <            TrackedShortRunnable runnable = new TrackedShortRunnable();
165 <            CustomExecutor p1 = new CustomExecutor(1);
166 <            ScheduledFuture h = p1.scheduleAtFixedRate(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
167 <            assertFalse(runnable.done);
168 <            Thread.sleep(MEDIUM_DELAY_MS);
169 <            assertTrue(runnable.done);
170 <            h.cancel(true);
171 <            joinPool(p1);
172 <        } catch(Exception e){
173 <            unexpectedException();
162 >    public void testSchedule4() throws InterruptedException {
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  
162    static class RunnableCounter implements Runnable {
163        AtomicInteger count = new AtomicInteger(0);
164        public void run() { count.getAndIncrement(); }
165    }
166
183      /**
184       * scheduleWithFixedDelay executes runnable after given initial delay
185       */
186 <    public void testSchedule5() {
187 <        try {
188 <            TrackedShortRunnable runnable = new TrackedShortRunnable();
189 <            CustomExecutor p1 = new CustomExecutor(1);
190 <            ScheduledFuture h = p1.scheduleWithFixedDelay(runnable, SHORT_DELAY_MS, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
191 <            assertFalse(runnable.done);
192 <            Thread.sleep(MEDIUM_DELAY_MS);
193 <            assertTrue(runnable.done);
194 <            h.cancel(true);
195 <            joinPool(p1);
196 <        } catch(Exception e){
197 <            unexpectedException();
186 >    public void testSchedule5() throws InterruptedException {
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 <    
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() {
216 <        try {
217 <            CustomExecutor p1 = new CustomExecutor(1);
218 <            RunnableCounter counter = new RunnableCounter();
219 <            ScheduledFuture h =
220 <                p1.scheduleAtFixedRate(counter, 0, 1, TimeUnit.MILLISECONDS);
221 <            Thread.sleep(SMALL_DELAY_MS);
222 <            h.cancel(true);
223 <            int c = counter.count.get();
224 <            // By time scaling conventions, we must have at least
225 <            // an execution per SHORT delay, but no more than one SHORT more
226 <            assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
227 <            assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
228 <            joinPool(p1);
229 <        } catch(Exception e){
230 <            unexpectedException();
215 >    public void testFixedRateSequence() throws InterruptedException {
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() {
244 <        try {
245 <            CustomExecutor p1 = new CustomExecutor(1);
246 <            RunnableCounter counter = new RunnableCounter();
247 <            ScheduledFuture h =
248 <                p1.scheduleWithFixedDelay(counter, 0, 1, TimeUnit.MILLISECONDS);
249 <            Thread.sleep(SMALL_DELAY_MS);
250 <            h.cancel(true);
251 <            int c = counter.count.get();
252 <            assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
253 <            assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
254 <            joinPool(p1);
255 <        } catch(Exception e){
256 <            unexpectedException();
243 >    public void testFixedDelaySequence() throws InterruptedException {
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  
227
268      /**
269 <     *  execute (null) throws NPE
269 >     * execute(null) throws NPE
270       */
271 <    public void testExecuteNull() {
272 <        CustomExecutor se = null;
271 >    public void testExecuteNull() throws InterruptedException {
272 >        CustomExecutor se = new CustomExecutor(1);
273          try {
274 <            se = new CustomExecutor(1);
235 <            se.execute(null);
274 >            se.execute(null);
275              shouldThrow();
276 <        } catch(NullPointerException success){}
277 <        catch(Exception e){
239 <            unexpectedException();
240 <        }
241 <        
242 <        joinPool(se);
276 >        } catch (NullPointerException success) {}
277 >        joinPool(se);
278      }
279  
280      /**
281 <     * schedule (null) throws NPE
281 >     * schedule(null) throws NPE
282       */
283 <    public void testScheduleNull() {
283 >    public void testScheduleNull() throws InterruptedException {
284          CustomExecutor se = new CustomExecutor(1);
285 <        try {
285 >        try {
286              TrackedCallable callable = null;
287 <            Future f = se.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
287 >            Future f = se.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
288              shouldThrow();
289 <        } catch(NullPointerException success){}
290 <        catch(Exception e){
256 <            unexpectedException();
257 <        }
258 <        joinPool(se);
289 >        } catch (NullPointerException success) {}
290 >        joinPool(se);
291      }
292 <  
292 >
293      /**
294       * execute throws RejectedExecutionException if shutdown
295       */
# Line 266 | Line 298 | public class ScheduledExecutorSubclassTe
298          try {
299              se.shutdown();
300              se.schedule(new NoOpRunnable(),
301 <                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
301 >                        MEDIUM_DELAY_MS, MILLISECONDS);
302              shouldThrow();
303 <        } catch(RejectedExecutionException success){
303 >        } catch (RejectedExecutionException success) {
304          } catch (SecurityException ok) {
305          }
274        
275        joinPool(se);
306  
307 +        joinPool(se);
308      }
309  
310      /**
# Line 284 | Line 315 | public class ScheduledExecutorSubclassTe
315          try {
316              se.shutdown();
317              se.schedule(new NoOpCallable(),
318 <                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
318 >                        MEDIUM_DELAY_MS, MILLISECONDS);
319              shouldThrow();
320 <        } catch(RejectedExecutionException success){
320 >        } catch (RejectedExecutionException success) {
321          } catch (SecurityException ok) {
322          }
323          joinPool(se);
# Line 295 | 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 {
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, TimeUnit.MILLISECONDS);
334 >                        MEDIUM_DELAY_MS, MILLISECONDS);
335              shouldThrow();
336 <        } catch(RejectedExecutionException success){
336 >        } catch (RejectedExecutionException success) {
337          } catch (SecurityException ok) {
338          }
339 <         joinPool(se);
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);
347          try {
348              se.shutdown();
349              se.scheduleAtFixedRate(new NoOpRunnable(),
350 <                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
350 >                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
351              shouldThrow();
352 <        } catch(RejectedExecutionException success){
352 >        } catch (RejectedExecutionException success) {
353          } catch (SecurityException ok) {
354 <        }
354 >        }
355          joinPool(se);
356      }
357 <    
357 >
358      /**
359       * scheduleWithFixedDelay throws RejectedExecutionException if shutdown
360       */
# Line 332 | Line 363 | public class ScheduledExecutorSubclassTe
363          try {
364              se.shutdown();
365              se.scheduleWithFixedDelay(new NoOpRunnable(),
366 <                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
366 >                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
367              shouldThrow();
368 <        } catch(RejectedExecutionException success){
368 >        } catch (RejectedExecutionException success) {
369          } catch (SecurityException ok) {
370 <        }
370 >        }
371          joinPool(se);
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() {
379 <        CustomExecutor p2 = new CustomExecutor(2);
380 <        assertEquals(0, p2.getActiveCount());
381 <        p2.execute(new SmallRunnable());
382 <        try {
383 <            Thread.sleep(SHORT_DELAY_MS);
384 <        } catch(Exception e){
385 <            unexpectedException();
378 >    public void testGetActiveCount() throws InterruptedException {
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          }
356        assertEquals(1, p2.getActiveCount());
357        joinPool(p2);
396      }
397 <    
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() {
403 <        CustomExecutor p2 = new CustomExecutor(2);
404 <        assertEquals(0, p2.getCompletedTaskCount());
405 <        p2.execute(new SmallRunnable());
406 <        try {
407 <            Thread.sleep(MEDIUM_DELAY_MS);
408 <        } catch(Exception e){
409 <            unexpectedException();
402 >    public void testGetCompletedTaskCount() throws InterruptedException {
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          }
373        assertEquals(1, p2.getCompletedTaskCount());
374        joinPool(p2);
429      }
430 <    
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 <    
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() {
445 <        CustomExecutor p2 = new CustomExecutor(2);
446 <        assertEquals(0, p2.getLargestPoolSize());
447 <        p2.execute(new SmallRunnable());
448 <        p2.execute(new SmallRunnable());
449 <        try {
450 <            Thread.sleep(SHORT_DELAY_MS);
451 <        } catch(Exception e){
452 <            unexpectedException();
444 >    public void testGetLargestPoolSize() throws InterruptedException {
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          }
400        assertEquals(2, p2.getLargestPoolSize());
401        joinPool(p2);
465      }
466 <    
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 <    
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() {
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 <        try {
501 <            Thread.sleep(SHORT_DELAY_MS);
502 <        } catch(Exception e){
503 <            unexpectedException();
495 >    public void testGetTaskCount() throws InterruptedException {
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          }
430        assertEquals(5, p1.getTaskCount());
431        joinPool(p1);
514      }
515  
516 <    /**
516 >    /**
517       * getThreadFactory returns factory in constructor if not set
518       */
519      public void testGetThreadFactory() {
520          ThreadFactory tf = new SimpleThreadFactory();
521 <        CustomExecutor p = new CustomExecutor(1, tf);
521 >        CustomExecutor p = new CustomExecutor(1, tf);
522          assertSame(tf, p.getThreadFactory());
523          joinPool(p);
524      }
525  
526 <    /**
526 >    /**
527       * setThreadFactory sets the thread factory returned by getThreadFactory
528       */
529      public void testSetThreadFactory() {
530          ThreadFactory tf = new SimpleThreadFactory();
531 <        CustomExecutor p = new CustomExecutor(1);
531 >        CustomExecutor p = new CustomExecutor(1);
532          p.setThreadFactory(tf);
533          assertSame(tf, p.getThreadFactory());
534          joinPool(p);
535      }
536  
537 <    /**
537 >    /**
538       * setThreadFactory(null) throws NPE
539       */
540      public void testSetThreadFactoryNull() {
541 <        CustomExecutor p = new CustomExecutor(1);
541 >        CustomExecutor p = new CustomExecutor(1);
542          try {
543              p.setThreadFactory(null);
544              shouldThrow();
# Line 465 | Line 547 | public class ScheduledExecutorSubclassTe
547              joinPool(p);
548          }
549      }
550 <    
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 <        
474 <        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  
484        
565      /**
566 <     *   isTerminated is false before termination, true after
566 >     * isTerminated is false before termination, true after
567       */
568 <    public void testIsTerminated() {
569 <        CustomExecutor p1 = new CustomExecutor(1);
568 >    public void testIsTerminated() throws InterruptedException {
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 <        try {
587 <            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
497 <            assertTrue(p1.isTerminated());
498 <        } catch(Exception e){
499 <            unexpectedException();
500 <        }      
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() {
594 <        CustomExecutor p1 = new CustomExecutor(1);
595 <        assertFalse(p1.isTerminating());
593 >    public void testIsTerminating() throws InterruptedException {
594 >        final ThreadPoolExecutor p = new CustomExecutor(1);
595 >        final CountDownLatch threadStarted = new CountDownLatch(1);
596 >        final CountDownLatch done = new CountDownLatch(1);
597          try {
598 <            p1.execute(new SmallRunnable());
599 <            assertFalse(p1.isTerminating());
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 { p1.shutdown(); } catch(SecurityException ok) { return; }
609 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
610          }
611 <        try {
612 <            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
613 <            assertTrue(p1.isTerminated());
518 <            assertFalse(p1.isTerminating());
519 <        } catch(Exception e){
520 <            unexpectedException();
521 <        }      
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() {
620 <        CustomExecutor p1 = new CustomExecutor(1);
621 <        ScheduledFuture[] tasks = new ScheduledFuture[5];
622 <        for(int i = 0; i < 5; i++){
531 <            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, TimeUnit.MILLISECONDS);
532 <        }
619 >    public void testGetQueue() throws InterruptedException {
620 >        ScheduledThreadPoolExecutor p = new CustomExecutor(1);
621 >        final CountDownLatch threadStarted = new CountDownLatch(1);
622 >        final CountDownLatch done = new CountDownLatch(1);
623          try {
624 <            Thread.sleep(SHORT_DELAY_MS);
625 <            BlockingQueue<Runnable> q = p1.getQueue();
626 <            assertTrue(q.contains(tasks[4]));
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]));
538        } catch(Exception e) {
539            unexpectedException();
637          } finally {
638 <            joinPool(p1);
638 >            done.countDown();
639 >            joinPool(p);
640          }
641      }
642  
643      /**
644       * remove(task) removes queued task, and fails to remove active task
645       */
646 <    public void testRemove() {
647 <        CustomExecutor p1 = new CustomExecutor(1);
646 >    public void testRemove() throws InterruptedException {
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, TimeUnit.MILLISECONDS);
553 <        }
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]));
566        } catch(Exception e) {
567            unexpectedException();
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() {
681 <        CustomExecutor p1 = new CustomExecutor(1);
680 >    public void testPurge() throws InterruptedException {
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, TimeUnit.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 <            }
596 <            assertTrue(k < SMALL_DELAY_MS);
597 <        } catch(Exception e) {
598 <            unexpectedException();
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       */
710 <    public void testShutDownNow() {
711 <        CustomExecutor p1 = new CustomExecutor(1);
712 <        for(int i = 0; i < 5; i++)
713 <            p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
714 <        List l;
715 <        try {
716 <            l = p1.shutdownNow();
717 <        } catch (SecurityException ok) {
718 <            return;
710 >    public void testShutdownNow() {
711 >        CustomExecutor p = new CustomExecutor(1);
712 >        for (int i = 0; i < 5; i++)
713 >            p.schedule(new SmallPossiblyInterruptedRunnable(),
714 >                       LONG_DELAY_MS, MILLISECONDS);
715 >        try {
716 >            List<Runnable> l = p.shutdownNow();
717 >            assertTrue(p.isShutdown());
718 >            assertEquals(5, l.size());
719 >        } catch (SecurityException ok) {
720 >            // Allowed in case test doesn't have privs
721 >        } finally {
722 >            joinPool(p);
723          }
617        assertTrue(p1.isShutdown());
618        assertTrue(l.size() > 0 && l.size() <= 5);
619        joinPool(p1);
724      }
725  
726      /**
727       * In default setting, shutdown cancels periodic but not delayed
728       * tasks at shutdown
729       */
730 <    public void testShutDown1() {
731 <        try {
732 <            CustomExecutor p1 = new CustomExecutor(1);
733 <            assertTrue(p1.getExecuteExistingDelayedTasksAfterShutdownPolicy());
630 <            assertFalse(p1.getContinueExistingPeriodicTasksAfterShutdownPolicy());
730 >    public void testShutdown1() throws InterruptedException {
731 >        CustomExecutor p = new CustomExecutor(1);
732 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
733 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
734  
735 <            ScheduledFuture[] tasks = new ScheduledFuture[5];
736 <            for(int i = 0; i < 5; i++)
737 <                tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
738 <            try { p1.shutdown(); } catch(SecurityException ok) { return; }
739 <            BlockingQueue q = p1.getQueue();
740 <            for (Iterator it = q.iterator(); it.hasNext();) {
741 <                ScheduledFuture t = (ScheduledFuture)it.next();
742 <                assertFalse(t.isCancelled());
743 <            }
744 <            assertTrue(p1.isShutdown());
642 <            Thread.sleep(SMALL_DELAY_MS);
643 <            for (int i = 0; i < 5; ++i) {
644 <                assertTrue(tasks[i].isDone());
645 <                assertFalse(tasks[i].isCancelled());
646 <            }
647 <            
735 >        ScheduledFuture[] tasks = new ScheduledFuture[5];
736 >        for (int i = 0; i < tasks.length; i++)
737 >            tasks[i] = p.schedule(new NoOpRunnable(),
738 >                                  SHORT_DELAY_MS, MILLISECONDS);
739 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
740 >        BlockingQueue<Runnable> q = p.getQueue();
741 >        for (ScheduledFuture task : tasks) {
742 >            assertFalse(task.isDone());
743 >            assertFalse(task.isCancelled());
744 >            assertTrue(q.contains(task));
745          }
746 <        catch(Exception ex) {
747 <            unexpectedException();
746 >        assertTrue(p.isShutdown());
747 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
748 >        assertTrue(p.isTerminated());
749 >        for (ScheduledFuture task : tasks) {
750 >            assertTrue(task.isDone());
751 >            assertFalse(task.isCancelled());
752          }
753      }
754  
654
755      /**
756       * If setExecuteExistingDelayedTasksAfterShutdownPolicy is false,
757       * delayed tasks are cancelled at shutdown
758       */
759 <    public void testShutDown2() {
760 <        try {
761 <            CustomExecutor p1 = new CustomExecutor(1);
762 <            p1.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
763 <            ScheduledFuture[] tasks = new ScheduledFuture[5];
764 <            for(int i = 0; i < 5; i++)
765 <                tasks[i] = p1.schedule(new NoOpRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
766 <            try { p1.shutdown(); } catch(SecurityException ok) { return; }
767 <            assertTrue(p1.isShutdown());
768 <            BlockingQueue q = p1.getQueue();
769 <            assertTrue(q.isEmpty());
770 <            Thread.sleep(SMALL_DELAY_MS);
771 <            assertTrue(p1.isTerminated());
772 <        }
773 <        catch(Exception ex) {
774 <            unexpectedException();
759 >    public void testShutdown2() throws InterruptedException {
760 >        CustomExecutor p = new CustomExecutor(1);
761 >        p.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
762 >        assertFalse(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
763 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
764 >        ScheduledFuture[] tasks = new ScheduledFuture[5];
765 >        for (int i = 0; i < tasks.length; i++)
766 >            tasks[i] = p.schedule(new NoOpRunnable(),
767 >                                  SHORT_DELAY_MS, MILLISECONDS);
768 >        BlockingQueue q = p.getQueue();
769 >        assertEquals(tasks.length, q.size());
770 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
771 >        assertTrue(p.isShutdown());
772 >        assertTrue(q.isEmpty());
773 >        assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
774 >        assertTrue(p.isTerminated());
775 >        for (ScheduledFuture task : tasks) {
776 >            assertTrue(task.isDone());
777 >            assertTrue(task.isCancelled());
778          }
779      }
780  
678
781      /**
782       * If setContinueExistingPeriodicTasksAfterShutdownPolicy is set false,
783 <     * periodic tasks are not cancelled at shutdown
783 >     * periodic tasks are cancelled at shutdown
784       */
785 <    public void testShutDown3() {
786 <        try {
787 <            CustomExecutor p1 = new CustomExecutor(1);
788 <            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
789 <            ScheduledFuture task =
790 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, TimeUnit.MILLISECONDS);
791 <            try { p1.shutdown(); } catch(SecurityException ok) { return; }
792 <            assertTrue(p1.isShutdown());
793 <            BlockingQueue q = p1.getQueue();
794 <            assertTrue(q.isEmpty());
795 <            Thread.sleep(SHORT_DELAY_MS);
796 <            assertTrue(p1.isTerminated());
797 <        }
798 <        catch(Exception ex) {
799 <            unexpectedException();
800 <        }
785 >    public void testShutdown3() throws InterruptedException {
786 >        CustomExecutor p = new CustomExecutor(1);
787 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
788 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
789 >        p.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
790 >        assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
791 >        assertFalse(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
792 >        long initialDelay = LONG_DELAY_MS;
793 >        ScheduledFuture task =
794 >            p.scheduleAtFixedRate(new NoOpRunnable(), initialDelay,
795 >                                  5, MILLISECONDS);
796 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
797 >        assertTrue(p.isShutdown());
798 >        assertTrue(p.getQueue().isEmpty());
799 >        assertTrue(task.isDone());
800 >        assertTrue(task.isCancelled());
801 >        joinPool(p);
802      }
803  
804      /**
805       * if setContinueExistingPeriodicTasksAfterShutdownPolicy is true,
806 <     * periodic tasks are cancelled at shutdown
806 >     * periodic tasks are not cancelled at shutdown
807       */
808 <    public void testShutDown4() {
809 <        CustomExecutor p1 = new CustomExecutor(1);
810 <        try {
811 <            p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
808 >    public void testShutdown4() throws InterruptedException {
809 >        CustomExecutor p = new CustomExecutor(1);
810 >        final CountDownLatch counter = new CountDownLatch(2);
811 >        try {
812 >            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
813 >            assertTrue(p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
814 >            assertTrue(p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
815 >            final Runnable r = new CheckedRunnable() {
816 >                public void realRun() {
817 >                    counter.countDown();
818 >                }};
819              ScheduledFuture task =
820 <                p1.scheduleAtFixedRate(new NoOpRunnable(), 1, 1, TimeUnit.MILLISECONDS);
820 >                p.scheduleAtFixedRate(r, 1, 1, MILLISECONDS);
821 >            assertFalse(task.isDone());
822              assertFalse(task.isCancelled());
823 <            try { p1.shutdown(); } catch(SecurityException ok) { return; }
823 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
824              assertFalse(task.isCancelled());
825 <            assertFalse(p1.isTerminated());
826 <            assertTrue(p1.isShutdown());
827 <            Thread.sleep(SHORT_DELAY_MS);
825 >            assertFalse(p.isTerminated());
826 >            assertTrue(p.isShutdown());
827 >            assertTrue(counter.await(SMALL_DELAY_MS, MILLISECONDS));
828              assertFalse(task.isCancelled());
829 <            assertTrue(task.cancel(true));
829 >            assertTrue(task.cancel(false));
830              assertTrue(task.isDone());
831 <            Thread.sleep(SHORT_DELAY_MS);
832 <            assertTrue(p1.isTerminated());
833 <        }
723 <        catch(Exception ex) {
724 <            unexpectedException();
831 >            assertTrue(task.isCancelled());
832 >            assertTrue(p.awaitTermination(SMALL_DELAY_MS, MILLISECONDS));
833 >            assertTrue(p.isTerminated());
834          }
835 <        finally {
836 <            joinPool(p1);
835 >        finally {
836 >            joinPool(p);
837          }
838      }
839  
840      /**
841       * completed submit of callable returns result
842       */
843 <    public void testSubmitCallable() {
843 >    public void testSubmitCallable() throws Exception {
844          ExecutorService e = new CustomExecutor(2);
845          try {
846              Future<String> future = e.submit(new StringTask());
847              String result = future.get();
848              assertSame(TEST_STRING, result);
740        }
741        catch (ExecutionException ex) {
742            unexpectedException();
743        }
744        catch (InterruptedException ex) {
745            unexpectedException();
849          } finally {
850              joinPool(e);
851          }
# Line 751 | Line 854 | public class ScheduledExecutorSubclassTe
854      /**
855       * completed submit of runnable returns successfully
856       */
857 <    public void testSubmitRunnable() {
857 >    public void testSubmitRunnable() throws Exception {
858          ExecutorService e = new CustomExecutor(2);
859          try {
860              Future<?> future = e.submit(new NoOpRunnable());
861              future.get();
862              assertTrue(future.isDone());
760        }
761        catch (ExecutionException ex) {
762            unexpectedException();
763        }
764        catch (InterruptedException ex) {
765            unexpectedException();
863          } finally {
864              joinPool(e);
865          }
# Line 771 | Line 868 | public class ScheduledExecutorSubclassTe
868      /**
869       * completed submit of (runnable, result) returns result
870       */
871 <    public void testSubmitRunnable2() {
871 >    public void testSubmitRunnable2() throws Exception {
872          ExecutorService e = new CustomExecutor(2);
873          try {
874              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
875              String result = future.get();
876              assertSame(TEST_STRING, result);
780        }
781        catch (ExecutionException ex) {
782            unexpectedException();
783        }
784        catch (InterruptedException ex) {
785            unexpectedException();
877          } finally {
878              joinPool(e);
879          }
# Line 791 | Line 882 | public class ScheduledExecutorSubclassTe
882      /**
883       * invokeAny(null) throws NPE
884       */
885 <    public void testInvokeAny1() {
885 >    public void testInvokeAny1() throws Exception {
886          ExecutorService e = new CustomExecutor(2);
887          try {
888              e.invokeAny(null);
889 +            shouldThrow();
890          } catch (NullPointerException success) {
799        } catch(Exception ex) {
800            unexpectedException();
891          } finally {
892              joinPool(e);
893          }
# Line 806 | Line 896 | public class ScheduledExecutorSubclassTe
896      /**
897       * invokeAny(empty collection) throws IAE
898       */
899 <    public void testInvokeAny2() {
899 >    public void testInvokeAny2() throws Exception {
900          ExecutorService e = new CustomExecutor(2);
901          try {
902              e.invokeAny(new ArrayList<Callable<String>>());
903 +            shouldThrow();
904          } catch (IllegalArgumentException success) {
814        } catch(Exception ex) {
815            unexpectedException();
905          } finally {
906              joinPool(e);
907          }
# Line 821 | Line 910 | public class ScheduledExecutorSubclassTe
910      /**
911       * invokeAny(c) throws NPE if c has null elements
912       */
913 <    public void testInvokeAny3() {
913 >    public void testInvokeAny3() throws Exception {
914 >        CountDownLatch latch = new CountDownLatch(1);
915          ExecutorService e = new CustomExecutor(2);
916 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
917 +        l.add(latchAwaitingStringTask(latch));
918 +        l.add(null);
919          try {
827            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
828            l.add(new StringTask());
829            l.add(null);
920              e.invokeAny(l);
921 +            shouldThrow();
922          } catch (NullPointerException success) {
832        } catch(Exception ex) {
833            unexpectedException();
923          } finally {
924 +            latch.countDown();
925              joinPool(e);
926          }
927      }
# Line 839 | Line 929 | public class ScheduledExecutorSubclassTe
929      /**
930       * invokeAny(c) throws ExecutionException if no task completes
931       */
932 <    public void testInvokeAny4() {
932 >    public void testInvokeAny4() throws Exception {
933          ExecutorService e = new CustomExecutor(2);
934 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
935 +        l.add(new NPETask());
936          try {
845            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
846            l.add(new NPETask());
937              e.invokeAny(l);
938 +            shouldThrow();
939          } catch (ExecutionException success) {
940 <        } catch(Exception ex) {
850 <            unexpectedException();
940 >            assertTrue(success.getCause() instanceof NullPointerException);
941          } finally {
942              joinPool(e);
943          }
# Line 856 | Line 946 | public class ScheduledExecutorSubclassTe
946      /**
947       * invokeAny(c) returns result of some task
948       */
949 <    public void testInvokeAny5() {
949 >    public void testInvokeAny5() throws Exception {
950          ExecutorService e = new CustomExecutor(2);
951          try {
952 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
952 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
953              l.add(new StringTask());
954              l.add(new StringTask());
955              String result = e.invokeAny(l);
956              assertSame(TEST_STRING, result);
867        } catch (ExecutionException success) {
868        } catch(Exception ex) {
869            unexpectedException();
957          } finally {
958              joinPool(e);
959          }
# Line 875 | Line 962 | public class ScheduledExecutorSubclassTe
962      /**
963       * invokeAll(null) throws NPE
964       */
965 <    public void testInvokeAll1() {
965 >    public void testInvokeAll1() throws Exception {
966          ExecutorService e = new CustomExecutor(2);
967          try {
968              e.invokeAll(null);
969 +            shouldThrow();
970          } catch (NullPointerException success) {
883        } catch(Exception ex) {
884            unexpectedException();
971          } finally {
972              joinPool(e);
973          }
# Line 890 | Line 976 | public class ScheduledExecutorSubclassTe
976      /**
977       * invokeAll(empty collection) returns empty collection
978       */
979 <    public void testInvokeAll2() {
979 >    public void testInvokeAll2() throws Exception {
980          ExecutorService e = new CustomExecutor(2);
981          try {
982              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
983              assertTrue(r.isEmpty());
898        } catch(Exception ex) {
899            unexpectedException();
984          } finally {
985              joinPool(e);
986          }
# Line 905 | Line 989 | public class ScheduledExecutorSubclassTe
989      /**
990       * invokeAll(c) throws NPE if c has null elements
991       */
992 <    public void testInvokeAll3() {
992 >    public void testInvokeAll3() throws Exception {
993          ExecutorService e = new CustomExecutor(2);
994 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
995 +        l.add(new StringTask());
996 +        l.add(null);
997          try {
911            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
912            l.add(new StringTask());
913            l.add(null);
998              e.invokeAll(l);
999 +            shouldThrow();
1000          } catch (NullPointerException success) {
916        } catch(Exception ex) {
917            unexpectedException();
1001          } finally {
1002              joinPool(e);
1003          }
# Line 923 | Line 1006 | public class ScheduledExecutorSubclassTe
1006      /**
1007       * get of invokeAll(c) throws exception on failed task
1008       */
1009 <    public void testInvokeAll4() {
1009 >    public void testInvokeAll4() throws Exception {
1010          ExecutorService e = new CustomExecutor(2);
1011 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1012 +        l.add(new NPETask());
1013 +        List<Future<String>> futures = e.invokeAll(l);
1014 +        assertEquals(1, futures.size());
1015          try {
1016 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1017 <            l.add(new NPETask());
1018 <            List<Future<String>> result = e.invokeAll(l);
1019 <            assertEquals(1, result.size());
933 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
934 <                it.next().get();
935 <        } catch(ExecutionException success) {
936 <        } catch(Exception ex) {
937 <            unexpectedException();
1016 >            futures.get(0).get();
1017 >            shouldThrow();
1018 >        } catch (ExecutionException success) {
1019 >            assertTrue(success.getCause() instanceof NullPointerException);
1020          } finally {
1021              joinPool(e);
1022          }
# Line 943 | Line 1025 | public class ScheduledExecutorSubclassTe
1025      /**
1026       * invokeAll(c) returns results of all completed tasks
1027       */
1028 <    public void testInvokeAll5() {
1028 >    public void testInvokeAll5() throws Exception {
1029          ExecutorService e = new CustomExecutor(2);
1030          try {
1031 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1031 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1032              l.add(new StringTask());
1033              l.add(new StringTask());
1034 <            List<Future<String>> result = e.invokeAll(l);
1035 <            assertEquals(2, result.size());
1036 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1037 <                assertSame(TEST_STRING, it.next().get());
956 <        } catch (ExecutionException success) {
957 <        } catch(Exception ex) {
958 <            unexpectedException();
1034 >            List<Future<String>> futures = e.invokeAll(l);
1035 >            assertEquals(2, futures.size());
1036 >            for (Future<String> future : futures)
1037 >                assertSame(TEST_STRING, future.get());
1038          } finally {
1039              joinPool(e);
1040          }
# Line 964 | Line 1043 | public class ScheduledExecutorSubclassTe
1043      /**
1044       * timed invokeAny(null) throws NPE
1045       */
1046 <    public void testTimedInvokeAny1() {
1046 >    public void testTimedInvokeAny1() throws Exception {
1047          ExecutorService e = new CustomExecutor(2);
1048          try {
1049 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1049 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1050 >            shouldThrow();
1051          } catch (NullPointerException success) {
972        } catch(Exception ex) {
973            unexpectedException();
1052          } finally {
1053              joinPool(e);
1054          }
# Line 979 | Line 1057 | public class ScheduledExecutorSubclassTe
1057      /**
1058       * timed invokeAny(,,null) throws NPE
1059       */
1060 <    public void testTimedInvokeAnyNullTimeUnit() {
1060 >    public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1061          ExecutorService e = new CustomExecutor(2);
1062 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1063 +        l.add(new StringTask());
1064          try {
985            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
986            l.add(new StringTask());
1065              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1066 +            shouldThrow();
1067          } catch (NullPointerException success) {
989        } catch(Exception ex) {
990            unexpectedException();
1068          } finally {
1069              joinPool(e);
1070          }
# Line 996 | Line 1073 | public class ScheduledExecutorSubclassTe
1073      /**
1074       * timed invokeAny(empty collection) throws IAE
1075       */
1076 <    public void testTimedInvokeAny2() {
1076 >    public void testTimedInvokeAny2() throws Exception {
1077          ExecutorService e = new CustomExecutor(2);
1078          try {
1079 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1079 >            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1080 >            shouldThrow();
1081          } catch (IllegalArgumentException success) {
1004        } catch(Exception ex) {
1005            unexpectedException();
1082          } finally {
1083              joinPool(e);
1084          }
# Line 1011 | Line 1087 | public class ScheduledExecutorSubclassTe
1087      /**
1088       * timed invokeAny(c) throws NPE if c has null elements
1089       */
1090 <    public void testTimedInvokeAny3() {
1090 >    public void testTimedInvokeAny3() throws Exception {
1091 >        CountDownLatch latch = new CountDownLatch(1);
1092          ExecutorService e = new CustomExecutor(2);
1093 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1094 +        l.add(latchAwaitingStringTask(latch));
1095 +        l.add(null);
1096          try {
1097 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1098 <            l.add(new StringTask());
1019 <            l.add(null);
1020 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1097 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1098 >            shouldThrow();
1099          } catch (NullPointerException success) {
1022        } catch(Exception ex) {
1023            ex.printStackTrace();
1024            unexpectedException();
1100          } finally {
1101 +            latch.countDown();
1102              joinPool(e);
1103          }
1104      }
# Line 1030 | Line 1106 | public class ScheduledExecutorSubclassTe
1106      /**
1107       * timed invokeAny(c) throws ExecutionException if no task completes
1108       */
1109 <    public void testTimedInvokeAny4() {
1109 >    public void testTimedInvokeAny4() throws Exception {
1110          ExecutorService e = new CustomExecutor(2);
1111 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1112 +        l.add(new NPETask());
1113          try {
1114 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1115 <            l.add(new NPETask());
1116 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1117 <        } catch(ExecutionException success) {
1040 <        } catch(Exception ex) {
1041 <            unexpectedException();
1114 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1115 >            shouldThrow();
1116 >        } catch (ExecutionException success) {
1117 >            assertTrue(success.getCause() instanceof NullPointerException);
1118          } finally {
1119              joinPool(e);
1120          }
# Line 1047 | Line 1123 | public class ScheduledExecutorSubclassTe
1123      /**
1124       * timed invokeAny(c) returns result of some task
1125       */
1126 <    public void testTimedInvokeAny5() {
1126 >    public void testTimedInvokeAny5() throws Exception {
1127          ExecutorService e = new CustomExecutor(2);
1128          try {
1129 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1129 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1130              l.add(new StringTask());
1131              l.add(new StringTask());
1132 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1132 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1133              assertSame(TEST_STRING, result);
1058        } catch (ExecutionException success) {
1059        } catch(Exception ex) {
1060            unexpectedException();
1134          } finally {
1135              joinPool(e);
1136          }
# Line 1066 | Line 1139 | public class ScheduledExecutorSubclassTe
1139      /**
1140       * timed invokeAll(null) throws NPE
1141       */
1142 <    public void testTimedInvokeAll1() {
1142 >    public void testTimedInvokeAll1() throws Exception {
1143          ExecutorService e = new CustomExecutor(2);
1144          try {
1145 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1145 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1146 >            shouldThrow();
1147          } catch (NullPointerException success) {
1074        } catch(Exception ex) {
1075            unexpectedException();
1148          } finally {
1149              joinPool(e);
1150          }
# Line 1081 | Line 1153 | public class ScheduledExecutorSubclassTe
1153      /**
1154       * timed invokeAll(,,null) throws NPE
1155       */
1156 <    public void testTimedInvokeAllNullTimeUnit() {
1156 >    public void testTimedInvokeAllNullTimeUnit() throws Exception {
1157          ExecutorService e = new CustomExecutor(2);
1158 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1159 +        l.add(new StringTask());
1160          try {
1087            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1088            l.add(new StringTask());
1161              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1162 +            shouldThrow();
1163          } catch (NullPointerException success) {
1091        } catch(Exception ex) {
1092            unexpectedException();
1164          } finally {
1165              joinPool(e);
1166          }
# Line 1098 | Line 1169 | public class ScheduledExecutorSubclassTe
1169      /**
1170       * timed invokeAll(empty collection) returns empty collection
1171       */
1172 <    public void testTimedInvokeAll2() {
1172 >    public void testTimedInvokeAll2() throws Exception {
1173          ExecutorService e = new CustomExecutor(2);
1174          try {
1175 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1175 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1176              assertTrue(r.isEmpty());
1106        } catch(Exception ex) {
1107            unexpectedException();
1177          } finally {
1178              joinPool(e);
1179          }
# Line 1113 | Line 1182 | public class ScheduledExecutorSubclassTe
1182      /**
1183       * timed invokeAll(c) throws NPE if c has null elements
1184       */
1185 <    public void testTimedInvokeAll3() {
1185 >    public void testTimedInvokeAll3() throws Exception {
1186          ExecutorService e = new CustomExecutor(2);
1187 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1188 +        l.add(new StringTask());
1189 +        l.add(null);
1190          try {
1191 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1192 <            l.add(new StringTask());
1121 <            l.add(null);
1122 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1191 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1192 >            shouldThrow();
1193          } catch (NullPointerException success) {
1124        } catch(Exception ex) {
1125            unexpectedException();
1194          } finally {
1195              joinPool(e);
1196          }
# Line 1131 | Line 1199 | public class ScheduledExecutorSubclassTe
1199      /**
1200       * get of element of invokeAll(c) throws exception on failed task
1201       */
1202 <    public void testTimedInvokeAll4() {
1202 >    public void testTimedInvokeAll4() throws Exception {
1203          ExecutorService e = new CustomExecutor(2);
1204 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1205 +        l.add(new NPETask());
1206 +        List<Future<String>> futures =
1207 +            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1208 +        assertEquals(1, futures.size());
1209          try {
1210 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1211 <            l.add(new NPETask());
1212 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1213 <            assertEquals(1, result.size());
1141 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1142 <                it.next().get();
1143 <        } catch(ExecutionException success) {
1144 <        } catch(Exception ex) {
1145 <            unexpectedException();
1210 >            futures.get(0).get();
1211 >            shouldThrow();
1212 >        } catch (ExecutionException success) {
1213 >            assertTrue(success.getCause() instanceof NullPointerException);
1214          } finally {
1215              joinPool(e);
1216          }
# Line 1151 | Line 1219 | public class ScheduledExecutorSubclassTe
1219      /**
1220       * timed invokeAll(c) returns results of all completed tasks
1221       */
1222 <    public void testTimedInvokeAll5() {
1222 >    public void testTimedInvokeAll5() throws Exception {
1223          ExecutorService e = new CustomExecutor(2);
1224          try {
1225 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1225 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1226              l.add(new StringTask());
1227              l.add(new StringTask());
1228 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1229 <            assertEquals(2, result.size());
1230 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1231 <                assertSame(TEST_STRING, it.next().get());
1232 <        } catch (ExecutionException success) {
1165 <        } catch(Exception ex) {
1166 <            unexpectedException();
1228 >            List<Future<String>> futures =
1229 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1230 >            assertEquals(2, futures.size());
1231 >            for (Future<String> future : futures)
1232 >                assertSame(TEST_STRING, future.get());
1233          } finally {
1234              joinPool(e);
1235          }
# Line 1172 | Line 1238 | public class ScheduledExecutorSubclassTe
1238      /**
1239       * timed invokeAll(c) cancels tasks not completed by timeout
1240       */
1241 <    public void testTimedInvokeAll6() {
1241 >    public void testTimedInvokeAll6() throws Exception {
1242          ExecutorService e = new CustomExecutor(2);
1243          try {
1244 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1245 <            l.add(new StringTask());
1246 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1247 <            l.add(new StringTask());
1248 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
1249 <            assertEquals(3, result.size());
1250 <            Iterator<Future<String>> it = result.iterator();
1251 <            Future<String> f1 = it.next();
1252 <            Future<String> f2 = it.next();
1253 <            Future<String> f3 = it.next();
1254 <            assertTrue(f1.isDone());
1255 <            assertTrue(f2.isDone());
1256 <            assertTrue(f3.isDone());
1257 <            assertFalse(f1.isCancelled());
1258 <            assertTrue(f2.isCancelled());
1259 <        } catch(Exception ex) {
1260 <            unexpectedException();
1244 >            for (long timeout = timeoutMillis();;) {
1245 >                List<Callable<String>> tasks = new ArrayList<>();
1246 >                tasks.add(new StringTask("0"));
1247 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1248 >                tasks.add(new StringTask("2"));
1249 >                long startTime = System.nanoTime();
1250 >                List<Future<String>> futures =
1251 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1252 >                assertEquals(tasks.size(), futures.size());
1253 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1254 >                for (Future future : futures)
1255 >                    assertTrue(future.isDone());
1256 >                assertTrue(futures.get(1).isCancelled());
1257 >                try {
1258 >                    assertEquals("0", futures.get(0).get());
1259 >                    assertEquals("2", futures.get(2).get());
1260 >                    break;
1261 >                } catch (CancellationException retryWithLongerTimeout) {
1262 >                    timeout *= 2;
1263 >                    if (timeout >= LONG_DELAY_MS / 2)
1264 >                        fail("expected exactly one task to be cancelled");
1265 >                }
1266 >            }
1267          } finally {
1268              joinPool(e);
1269          }
1270      }
1271  
1200
1272   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines