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

Comparing jsr166/src/test/tck/ThreadPoolExecutorTest.java (file contents):
Revision 1.18 by dl, Tue Jan 20 20:30:08 2004 UTC vs.
Revision 1.68 by jsr166, Sun Oct 4 01:27:32 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
5 < * Other contributors include Andrew Wright, Jeffrey Hayes,
6 < * Pat Fisher, Mike Judd.
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9 < import java.util.concurrent.*;
10 < import junit.framework.*;
11 < import java.util.*;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
11 > import static java.util.concurrent.TimeUnit.SECONDS;
12 >
13 > import java.util.ArrayList;
14 > import java.util.List;
15 > import java.util.concurrent.ArrayBlockingQueue;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.Callable;
18 > import java.util.concurrent.CancellationException;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.ExecutionException;
21 > import java.util.concurrent.Executors;
22 > import java.util.concurrent.ExecutorService;
23 > import java.util.concurrent.Future;
24 > import java.util.concurrent.FutureTask;
25 > import java.util.concurrent.LinkedBlockingQueue;
26 > import java.util.concurrent.RejectedExecutionException;
27 > import java.util.concurrent.RejectedExecutionHandler;
28 > import java.util.concurrent.SynchronousQueue;
29 > import java.util.concurrent.ThreadFactory;
30 > import java.util.concurrent.ThreadPoolExecutor;
31 > import java.util.concurrent.TimeUnit;
32 > import java.util.concurrent.atomic.AtomicInteger;
33 >
34 > import junit.framework.Test;
35 > import junit.framework.TestSuite;
36  
37   public class ThreadPoolExecutorTest extends JSR166TestCase {
38      public static void main(String[] args) {
39 <        junit.textui.TestRunner.run (suite());  
39 >        main(suite(), args);
40      }
41      public static Test suite() {
42          return new TestSuite(ThreadPoolExecutorTest.class);
43      }
44 <    
44 >
45      static class ExtendedTPE extends ThreadPoolExecutor {
46 <        volatile boolean beforeCalled = false;
47 <        volatile boolean afterCalled = false;
48 <        volatile boolean terminatedCalled = false;
46 >        final CountDownLatch beforeCalled = new CountDownLatch(1);
47 >        final CountDownLatch afterCalled = new CountDownLatch(1);
48 >        final CountDownLatch terminatedCalled = new CountDownLatch(1);
49 >
50          public ExtendedTPE() {
51 <            super(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new SynchronousQueue<Runnable>());
51 >            super(1, 1, LONG_DELAY_MS, MILLISECONDS, new SynchronousQueue<Runnable>());
52          }
53          protected void beforeExecute(Thread t, Runnable r) {
54 <            beforeCalled = true;
54 >            beforeCalled.countDown();
55          }
56          protected void afterExecute(Runnable r, Throwable t) {
57 <            afterCalled = true;
57 >            afterCalled.countDown();
58          }
59          protected void terminated() {
60 <            terminatedCalled = true;
60 >            terminatedCalled.countDown();
61 >        }
62 >
63 >        public boolean beforeCalled() {
64 >            return beforeCalled.getCount() == 0;
65 >        }
66 >        public boolean afterCalled() {
67 >            return afterCalled.getCount() == 0;
68 >        }
69 >        public boolean terminatedCalled() {
70 >            return terminatedCalled.getCount() == 0;
71 >        }
72 >    }
73 >
74 >    static class FailingThreadFactory implements ThreadFactory {
75 >        int calls = 0;
76 >        public Thread newThread(Runnable r) {
77 >            if (++calls > 1) return null;
78 >            return new Thread(r);
79          }
80      }
81  
82      /**
83 <     *  execute successfully executes a runnable
83 >     * execute successfully executes a runnable
84       */
85 <    public void testExecute() {
86 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
85 >    public void testExecute() throws InterruptedException {
86 >        final ThreadPoolExecutor p =
87 >            new ThreadPoolExecutor(1, 1,
88 >                                   LONG_DELAY_MS, MILLISECONDS,
89 >                                   new ArrayBlockingQueue<Runnable>(10));
90 >        final CountDownLatch done = new CountDownLatch(1);
91 >        final Runnable task = new CheckedRunnable() {
92 >            public void realRun() {
93 >                done.countDown();
94 >            }};
95          try {
96 <            p1.execute(new Runnable() {
97 <                    public void run() {
98 <                        try {
99 <                            Thread.sleep(SHORT_DELAY_MS);
100 <                        } catch(InterruptedException e){
50 <                            threadUnexpectedException();
51 <                        }
52 <                    }
53 <                });
54 <            Thread.sleep(SMALL_DELAY_MS);
55 <        } catch(InterruptedException e){
56 <            unexpectedException();
57 <        }
58 <        joinPool(p1);
96 >            p.execute(task);
97 >            assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
98 >        } finally {
99 >            joinPool(p);
100 >        }
101      }
102  
103      /**
104 <     *  getActiveCount increases but doesn't overestimate, when a
105 <     *  thread becomes active
104 >     * getActiveCount increases but doesn't overestimate, when a
105 >     * thread becomes active
106       */
107 <    public void testGetActiveCount() {
108 <        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
109 <        assertEquals(0, p2.getActiveCount());
110 <        p2.execute(new MediumRunnable());
111 <        try {
112 <            Thread.sleep(SHORT_DELAY_MS);
113 <        } catch(Exception e){
114 <            unexpectedException();
107 >    public void testGetActiveCount() throws InterruptedException {
108 >        final ThreadPoolExecutor p =
109 >            new ThreadPoolExecutor(2, 2,
110 >                                   LONG_DELAY_MS, MILLISECONDS,
111 >                                   new ArrayBlockingQueue<Runnable>(10));
112 >        final CountDownLatch threadStarted = new CountDownLatch(1);
113 >        final CountDownLatch done = new CountDownLatch(1);
114 >        try {
115 >            assertEquals(0, p.getActiveCount());
116 >            p.execute(new CheckedRunnable() {
117 >                public void realRun() throws InterruptedException {
118 >                    threadStarted.countDown();
119 >                    assertEquals(1, p.getActiveCount());
120 >                    done.await();
121 >                }});
122 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
123 >            assertEquals(1, p.getActiveCount());
124 >        } finally {
125 >            done.countDown();
126 >            joinPool(p);
127          }
74        assertEquals(1, p2.getActiveCount());
75        joinPool(p2);
128      }
129  
130      /**
131 <     *  prestartCoreThread starts a thread if under corePoolSize, else doesn't
131 >     * prestartCoreThread starts a thread if under corePoolSize, else doesn't
132       */
133      public void testPrestartCoreThread() {
134 <        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
135 <        assertEquals(0, p2.getPoolSize());
136 <        assertTrue(p2.prestartCoreThread());
137 <        assertEquals(1, p2.getPoolSize());
138 <        assertTrue(p2.prestartCoreThread());
139 <        assertEquals(2, p2.getPoolSize());
140 <        assertFalse(p2.prestartCoreThread());
141 <        assertEquals(2, p2.getPoolSize());
142 <        joinPool(p2);
134 >        final ThreadPoolExecutor p =
135 >            new ThreadPoolExecutor(2, 6,
136 >                                   LONG_DELAY_MS, MILLISECONDS,
137 >                                   new ArrayBlockingQueue<Runnable>(10));
138 >        try (PoolCleaner cleaner = cleaner(p)) {
139 >            assertEquals(0, p.getPoolSize());
140 >            assertTrue(p.prestartCoreThread());
141 >            assertEquals(1, p.getPoolSize());
142 >            assertTrue(p.prestartCoreThread());
143 >            assertEquals(2, p.getPoolSize());
144 >            assertFalse(p.prestartCoreThread());
145 >            assertEquals(2, p.getPoolSize());
146 >            p.setCorePoolSize(4);
147 >            assertTrue(p.prestartCoreThread());
148 >            assertEquals(3, p.getPoolSize());
149 >            assertTrue(p.prestartCoreThread());
150 >            assertEquals(4, p.getPoolSize());
151 >            assertFalse(p.prestartCoreThread());
152 >            assertEquals(4, p.getPoolSize());
153 >        }
154      }
155  
156      /**
157 <     *  prestartAllCoreThreads starts all corePoolSize threads
157 >     * prestartAllCoreThreads starts all corePoolSize threads
158       */
159      public void testPrestartAllCoreThreads() {
160 <        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
161 <        assertEquals(0, p2.getPoolSize());
162 <        p2.prestartAllCoreThreads();
163 <        assertEquals(2, p2.getPoolSize());
164 <        p2.prestartAllCoreThreads();
165 <        assertEquals(2, p2.getPoolSize());
166 <        joinPool(p2);
167 <    }
168 <    
169 <    /**
170 <     *   getCompletedTaskCount increases, but doesn't overestimate,
171 <     *   when tasks complete
172 <     */
173 <    public void testGetCompletedTaskCount() {
174 <        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
175 <        assertEquals(0, p2.getCompletedTaskCount());
176 <        p2.execute(new ShortRunnable());
177 <        try {
178 <            Thread.sleep(SMALL_DELAY_MS);
179 <        } catch(Exception e){
180 <            unexpectedException();
181 <        }
182 <        assertEquals(1, p2.getCompletedTaskCount());
183 <        try { p2.shutdown(); } catch(SecurityException ok) { return; }
184 <        joinPool(p2);
160 >        final ThreadPoolExecutor p =
161 >            new ThreadPoolExecutor(2, 6,
162 >                                   LONG_DELAY_MS, MILLISECONDS,
163 >                                   new ArrayBlockingQueue<Runnable>(10));
164 >        try (PoolCleaner cleaner = cleaner(p)) {
165 >            assertEquals(0, p.getPoolSize());
166 >            p.prestartAllCoreThreads();
167 >            assertEquals(2, p.getPoolSize());
168 >            p.prestartAllCoreThreads();
169 >            assertEquals(2, p.getPoolSize());
170 >            p.setCorePoolSize(4);
171 >            p.prestartAllCoreThreads();
172 >            assertEquals(4, p.getPoolSize());
173 >            p.prestartAllCoreThreads();
174 >            assertEquals(4, p.getPoolSize());
175 >        }
176 >    }
177 >
178 >    /**
179 >     * getCompletedTaskCount increases, but doesn't overestimate,
180 >     * when tasks complete
181 >     */
182 >    public void testGetCompletedTaskCount() throws InterruptedException {
183 >        final ThreadPoolExecutor p =
184 >            new ThreadPoolExecutor(2, 2,
185 >                                   LONG_DELAY_MS, MILLISECONDS,
186 >                                   new ArrayBlockingQueue<Runnable>(10));
187 >        try (PoolCleaner cleaner = cleaner(p)) {
188 >            final CountDownLatch threadStarted = new CountDownLatch(1);
189 >            final CountDownLatch threadProceed = new CountDownLatch(1);
190 >            final CountDownLatch threadDone = new CountDownLatch(1);
191 >            assertEquals(0, p.getCompletedTaskCount());
192 >            p.execute(new CheckedRunnable() {
193 >                public void realRun() throws InterruptedException {
194 >                    threadStarted.countDown();
195 >                    assertEquals(0, p.getCompletedTaskCount());
196 >                    threadProceed.await();
197 >                    threadDone.countDown();
198 >                }});
199 >            await(threadStarted);
200 >            assertEquals(0, p.getCompletedTaskCount());
201 >            threadProceed.countDown();
202 >            threadDone.await();
203 >            long startTime = System.nanoTime();
204 >            while (p.getCompletedTaskCount() != 1) {
205 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
206 >                    fail("timed out");
207 >                Thread.yield();
208 >            }
209 >        }
210      }
211 <    
211 >
212      /**
213 <     *   getCorePoolSize returns size given in constructor if not otherwise set
213 >     * getCorePoolSize returns size given in constructor if not otherwise set
214       */
215      public void testGetCorePoolSize() {
216 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
217 <        assertEquals(1, p1.getCorePoolSize());
218 <        joinPool(p1);
216 >        final ThreadPoolExecutor p =
217 >            new ThreadPoolExecutor(1, 1,
218 >                                   LONG_DELAY_MS, MILLISECONDS,
219 >                                   new ArrayBlockingQueue<Runnable>(10));
220 >        assertEquals(1, p.getCorePoolSize());
221 >        joinPool(p);
222      }
223 <    
223 >
224      /**
225 <     *   getKeepAliveTime returns value given in constructor if not otherwise set
225 >     * getKeepAliveTime returns value given in constructor if not otherwise set
226       */
227      public void testGetKeepAliveTime() {
228 <        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, 1000, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
229 <        assertEquals(1, p2.getKeepAliveTime(TimeUnit.SECONDS));
230 <        joinPool(p2);
228 >        final ThreadPoolExecutor p =
229 >            new ThreadPoolExecutor(2, 2,
230 >                                   1000, MILLISECONDS,
231 >                                   new ArrayBlockingQueue<Runnable>(10));
232 >        assertEquals(1, p.getKeepAliveTime(SECONDS));
233 >        joinPool(p);
234      }
235  
236 <
143 <    /**
236 >    /**
237       * getThreadFactory returns factory in constructor if not set
238       */
239      public void testGetThreadFactory() {
240          ThreadFactory tf = new SimpleThreadFactory();
241 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), tf, new NoOpREHandler());
241 >        final ThreadPoolExecutor p =
242 >            new ThreadPoolExecutor(1, 2,
243 >                                   LONG_DELAY_MS, MILLISECONDS,
244 >                                   new ArrayBlockingQueue<Runnable>(10),
245 >                                   tf,
246 >                                   new NoOpREHandler());
247          assertSame(tf, p.getThreadFactory());
248          joinPool(p);
249      }
250  
251 <    /**
251 >    /**
252       * setThreadFactory sets the thread factory returned by getThreadFactory
253       */
254      public void testSetThreadFactory() {
255 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
255 >        final ThreadPoolExecutor p =
256 >            new ThreadPoolExecutor(1, 2,
257 >                                   LONG_DELAY_MS, MILLISECONDS,
258 >                                   new ArrayBlockingQueue<Runnable>(10));
259          ThreadFactory tf = new SimpleThreadFactory();
260          p.setThreadFactory(tf);
261          assertSame(tf, p.getThreadFactory());
262          joinPool(p);
263      }
264  
265 <
165 <    /**
265 >    /**
266       * setThreadFactory(null) throws NPE
267       */
268      public void testSetThreadFactoryNull() {
269 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
269 >        final ThreadPoolExecutor p =
270 >            new ThreadPoolExecutor(1, 2,
271 >                                   LONG_DELAY_MS, MILLISECONDS,
272 >                                   new ArrayBlockingQueue<Runnable>(10));
273          try {
274              p.setThreadFactory(null);
275              shouldThrow();
# Line 176 | Line 279 | public class ThreadPoolExecutorTest exte
279          }
280      }
281  
282 <    /**
282 >    /**
283       * getRejectedExecutionHandler returns handler in constructor if not set
284       */
285      public void testGetRejectedExecutionHandler() {
286 <        RejectedExecutionHandler h = new NoOpREHandler();
287 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), h);
286 >        final RejectedExecutionHandler h = new NoOpREHandler();
287 >        final ThreadPoolExecutor p =
288 >            new ThreadPoolExecutor(1, 2,
289 >                                   LONG_DELAY_MS, MILLISECONDS,
290 >                                   new ArrayBlockingQueue<Runnable>(10),
291 >                                   h);
292          assertSame(h, p.getRejectedExecutionHandler());
293          joinPool(p);
294      }
295  
296 <    /**
296 >    /**
297       * setRejectedExecutionHandler sets the handler returned by
298       * getRejectedExecutionHandler
299       */
300      public void testSetRejectedExecutionHandler() {
301 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
301 >        final ThreadPoolExecutor p =
302 >            new ThreadPoolExecutor(1, 2,
303 >                                   LONG_DELAY_MS, MILLISECONDS,
304 >                                   new ArrayBlockingQueue<Runnable>(10));
305          RejectedExecutionHandler h = new NoOpREHandler();
306          p.setRejectedExecutionHandler(h);
307          assertSame(h, p.getRejectedExecutionHandler());
308          joinPool(p);
309      }
310  
311 <
202 <    /**
311 >    /**
312       * setRejectedExecutionHandler(null) throws NPE
313       */
314      public void testSetRejectedExecutionHandlerNull() {
315 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
315 >        final ThreadPoolExecutor p =
316 >            new ThreadPoolExecutor(1, 2,
317 >                                   LONG_DELAY_MS, MILLISECONDS,
318 >                                   new ArrayBlockingQueue<Runnable>(10));
319          try {
320              p.setRejectedExecutionHandler(null);
321              shouldThrow();
# Line 213 | Line 325 | public class ThreadPoolExecutorTest exte
325          }
326      }
327  
216    
328      /**
329 <     *   getLargestPoolSize increases, but doesn't overestimate, when
330 <     *   multiple threads active
329 >     * getLargestPoolSize increases, but doesn't overestimate, when
330 >     * multiple threads active
331       */
332 <    public void testGetLargestPoolSize() {
333 <        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
334 <        try {
335 <            assertEquals(0, p2.getLargestPoolSize());
336 <            p2.execute(new MediumRunnable());
337 <            p2.execute(new MediumRunnable());
338 <            Thread.sleep(SHORT_DELAY_MS);
339 <            assertEquals(2, p2.getLargestPoolSize());
340 <        } catch(Exception e){
341 <            unexpectedException();
342 <        }
343 <        joinPool(p2);
332 >    public void testGetLargestPoolSize() throws InterruptedException {
333 >        final int THREADS = 3;
334 >        final ThreadPoolExecutor p =
335 >            new ThreadPoolExecutor(THREADS, THREADS,
336 >                                   LONG_DELAY_MS, MILLISECONDS,
337 >                                   new ArrayBlockingQueue<Runnable>(10));
338 >        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
339 >        final CountDownLatch done = new CountDownLatch(1);
340 >        try {
341 >            assertEquals(0, p.getLargestPoolSize());
342 >            for (int i = 0; i < THREADS; i++)
343 >                p.execute(new CheckedRunnable() {
344 >                    public void realRun() throws InterruptedException {
345 >                        threadsStarted.countDown();
346 >                        done.await();
347 >                        assertEquals(THREADS, p.getLargestPoolSize());
348 >                    }});
349 >            assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
350 >            assertEquals(THREADS, p.getLargestPoolSize());
351 >        } finally {
352 >            done.countDown();
353 >            joinPool(p);
354 >            assertEquals(THREADS, p.getLargestPoolSize());
355 >        }
356      }
357 <    
357 >
358      /**
359 <     *   getMaximumPoolSize returns value given in constructor if not
360 <     *   otherwise set
359 >     * getMaximumPoolSize returns value given in constructor if not
360 >     * otherwise set
361       */
362      public void testGetMaximumPoolSize() {
363 <        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
364 <        assertEquals(2, p2.getMaximumPoolSize());
365 <        joinPool(p2);
366 <    }
367 <    
368 <    /**
246 <     *   getPoolSize increases, but doesn't overestimate, when threads
247 <     *   become active
248 <     */
249 <    public void testGetPoolSize() {
250 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
251 <        assertEquals(0, p1.getPoolSize());
252 <        p1.execute(new MediumRunnable());
253 <        assertEquals(1, p1.getPoolSize());
254 <        joinPool(p1);
363 >        final ThreadPoolExecutor p =
364 >            new ThreadPoolExecutor(2, 3,
365 >                                   LONG_DELAY_MS, MILLISECONDS,
366 >                                   new ArrayBlockingQueue<Runnable>(10));
367 >        assertEquals(3, p.getMaximumPoolSize());
368 >        joinPool(p);
369      }
370 <    
370 >
371      /**
372 <     *  getTaskCount increases, but doesn't overestimate, when tasks submitted
372 >     * getPoolSize increases, but doesn't overestimate, when threads
373 >     * become active
374       */
375 <    public void testGetTaskCount() {
376 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
377 <        try {
378 <            assertEquals(0, p1.getTaskCount());
379 <            p1.execute(new MediumRunnable());
380 <            Thread.sleep(SHORT_DELAY_MS);
381 <            assertEquals(1, p1.getTaskCount());
382 <        } catch(Exception e){
383 <            unexpectedException();
384 <        }
385 <        joinPool(p1);
375 >    public void testGetPoolSize() throws InterruptedException {
376 >        final ThreadPoolExecutor p =
377 >            new ThreadPoolExecutor(1, 1,
378 >                                   LONG_DELAY_MS, MILLISECONDS,
379 >                                   new ArrayBlockingQueue<Runnable>(10));
380 >        final CountDownLatch threadStarted = new CountDownLatch(1);
381 >        final CountDownLatch done = new CountDownLatch(1);
382 >        try {
383 >            assertEquals(0, p.getPoolSize());
384 >            p.execute(new CheckedRunnable() {
385 >                public void realRun() throws InterruptedException {
386 >                    threadStarted.countDown();
387 >                    assertEquals(1, p.getPoolSize());
388 >                    done.await();
389 >                }});
390 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
391 >            assertEquals(1, p.getPoolSize());
392 >        } finally {
393 >            done.countDown();
394 >            joinPool(p);
395 >        }
396      }
397 <    
397 >
398      /**
399 <     *   isShutDown is false before shutdown, true after
399 >     * getTaskCount increases, but doesn't overestimate, when tasks submitted
400       */
401 <    public void testIsShutdown() {
402 <        
403 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
404 <        assertFalse(p1.isShutdown());
405 <        try { p1.shutdown(); } catch(SecurityException ok) { return; }
406 <        assertTrue(p1.isShutdown());
407 <        joinPool(p1);
401 >    public void testGetTaskCount() throws InterruptedException {
402 >        final ThreadPoolExecutor p =
403 >            new ThreadPoolExecutor(1, 1,
404 >                                   LONG_DELAY_MS, MILLISECONDS,
405 >                                   new ArrayBlockingQueue<Runnable>(10));
406 >        final CountDownLatch threadStarted = new CountDownLatch(1);
407 >        final CountDownLatch done = new CountDownLatch(1);
408 >        try {
409 >            assertEquals(0, p.getTaskCount());
410 >            p.execute(new CheckedRunnable() {
411 >                public void realRun() throws InterruptedException {
412 >                    threadStarted.countDown();
413 >                    assertEquals(1, p.getTaskCount());
414 >                    done.await();
415 >                }});
416 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
417 >            assertEquals(1, p.getTaskCount());
418 >        } finally {
419 >            done.countDown();
420 >            joinPool(p);
421 >        }
422      }
423  
285        
424      /**
425 <     *  isTerminated is false before termination, true after
425 >     * isShutdown is false before shutdown, true after
426       */
427 <    public void testIsTerminated() {
428 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
429 <        assertFalse(p1.isTerminated());
430 <        try {
431 <            p1.execute(new MediumRunnable());
432 <        } finally {
433 <            try { p1.shutdown(); } catch(SecurityException ok) { return; }
434 <        }
435 <        try {
298 <            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
299 <            assertTrue(p1.isTerminated());
300 <        } catch(Exception e){
301 <            unexpectedException();
302 <        }      
427 >    public void testIsShutdown() {
428 >        final ThreadPoolExecutor p =
429 >            new ThreadPoolExecutor(1, 1,
430 >                                   LONG_DELAY_MS, MILLISECONDS,
431 >                                   new ArrayBlockingQueue<Runnable>(10));
432 >        assertFalse(p.isShutdown());
433 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
434 >        assertTrue(p.isShutdown());
435 >        joinPool(p);
436      }
437  
438      /**
439 <     *  isTerminating is not true when running or when terminated
439 >     * awaitTermination on a non-shutdown pool times out
440       */
441 <    public void testIsTerminating() {
442 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
443 <        assertFalse(p1.isTerminating());
444 <        try {
445 <            p1.execute(new SmallRunnable());
446 <            assertFalse(p1.isTerminating());
447 <        } finally {
448 <            try { p1.shutdown(); } catch(SecurityException ok) { return; }
449 <        }
450 <        try {
451 <            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
452 <            assertTrue(p1.isTerminated());
453 <            assertFalse(p1.isTerminating());
454 <        } catch(Exception e){
455 <            unexpectedException();
456 <        }      
441 >    public void testAwaitTermination_timesOut() throws InterruptedException {
442 >        final ThreadPoolExecutor p =
443 >            new ThreadPoolExecutor(1, 1,
444 >                                   LONG_DELAY_MS, MILLISECONDS,
445 >                                   new ArrayBlockingQueue<Runnable>(10));
446 >        assertFalse(p.isTerminated());
447 >        assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
448 >        assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
449 >        assertFalse(p.awaitTermination(-1L, NANOSECONDS));
450 >        assertFalse(p.awaitTermination(-1L, MILLISECONDS));
451 >        assertFalse(p.awaitTermination(0L, NANOSECONDS));
452 >        assertFalse(p.awaitTermination(0L, MILLISECONDS));
453 >        long timeoutNanos = 999999L;
454 >        long startTime = System.nanoTime();
455 >        assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
456 >        assertTrue(System.nanoTime() - startTime >= timeoutNanos);
457 >        assertFalse(p.isTerminated());
458 >        startTime = System.nanoTime();
459 >        long timeoutMillis = timeoutMillis();
460 >        assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
461 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
462 >        assertFalse(p.isTerminated());
463 >        p.shutdown();
464 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
465 >        assertTrue(p.isTerminated());
466 >    }
467 >
468 >    /**
469 >     * isTerminated is false before termination, true after
470 >     */
471 >    public void testIsTerminated() throws InterruptedException {
472 >        final ThreadPoolExecutor p =
473 >            new ThreadPoolExecutor(1, 1,
474 >                                   LONG_DELAY_MS, MILLISECONDS,
475 >                                   new ArrayBlockingQueue<Runnable>(10));
476 >        final CountDownLatch threadStarted = new CountDownLatch(1);
477 >        final CountDownLatch done = new CountDownLatch(1);
478 >        assertFalse(p.isTerminated());
479 >        try {
480 >            p.execute(new CheckedRunnable() {
481 >                public void realRun() throws InterruptedException {
482 >                    assertFalse(p.isTerminated());
483 >                    threadStarted.countDown();
484 >                    done.await();
485 >                }});
486 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
487 >            assertFalse(p.isTerminating());
488 >            done.countDown();
489 >        } finally {
490 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
491 >        }
492 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
493 >        assertTrue(p.isTerminated());
494 >    }
495 >
496 >    /**
497 >     * isTerminating is not true when running or when terminated
498 >     */
499 >    public void testIsTerminating() throws InterruptedException {
500 >        final ThreadPoolExecutor p =
501 >            new ThreadPoolExecutor(1, 1,
502 >                                   LONG_DELAY_MS, MILLISECONDS,
503 >                                   new ArrayBlockingQueue<Runnable>(10));
504 >        final CountDownLatch threadStarted = new CountDownLatch(1);
505 >        final CountDownLatch done = new CountDownLatch(1);
506 >        try {
507 >            assertFalse(p.isTerminating());
508 >            p.execute(new CheckedRunnable() {
509 >                public void realRun() throws InterruptedException {
510 >                    assertFalse(p.isTerminating());
511 >                    threadStarted.countDown();
512 >                    done.await();
513 >                }});
514 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
515 >            assertFalse(p.isTerminating());
516 >            done.countDown();
517 >        } finally {
518 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
519 >        }
520 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
521 >        assertTrue(p.isTerminated());
522 >        assertFalse(p.isTerminating());
523      }
524  
525      /**
526       * getQueue returns the work queue, which contains queued tasks
527       */
528 <    public void testGetQueue() {
529 <        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
530 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, q);
531 <        FutureTask[] tasks = new FutureTask[5];
532 <        for(int i = 0; i < 5; i++){
533 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
534 <            p1.execute(tasks[i]);
535 <        }
536 <        try {
537 <            Thread.sleep(SHORT_DELAY_MS);
538 <            BlockingQueue<Runnable> wq = p1.getQueue();
539 <            assertSame(q, wq);
540 <            assertFalse(wq.contains(tasks[0]));
541 <            assertTrue(wq.contains(tasks[4]));
542 <        } catch(Exception e) {
543 <            unexpectedException();
528 >    public void testGetQueue() throws InterruptedException {
529 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
530 >        final ThreadPoolExecutor p =
531 >            new ThreadPoolExecutor(1, 1,
532 >                                   LONG_DELAY_MS, MILLISECONDS,
533 >                                   q);
534 >        final CountDownLatch threadStarted = new CountDownLatch(1);
535 >        final CountDownLatch done = new CountDownLatch(1);
536 >        try {
537 >            FutureTask[] tasks = new FutureTask[5];
538 >            for (int i = 0; i < tasks.length; i++) {
539 >                Callable task = new CheckedCallable<Boolean>() {
540 >                    public Boolean realCall() throws InterruptedException {
541 >                        threadStarted.countDown();
542 >                        assertSame(q, p.getQueue());
543 >                        done.await();
544 >                        return Boolean.TRUE;
545 >                    }};
546 >                tasks[i] = new FutureTask(task);
547 >                p.execute(tasks[i]);
548 >            }
549 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
550 >            assertSame(q, p.getQueue());
551 >            assertFalse(q.contains(tasks[0]));
552 >            assertTrue(q.contains(tasks[tasks.length - 1]));
553 >            assertEquals(tasks.length - 1, q.size());
554          } finally {
555 <            joinPool(p1);
555 >            done.countDown();
556 >            joinPool(p);
557          }
558      }
559  
560      /**
561       * remove(task) removes queued task, and fails to remove active task
562       */
563 <    public void testRemove() {
563 >    public void testRemove() throws InterruptedException {
564          BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
565 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, q);
566 <        FutureTask[] tasks = new FutureTask[5];
567 <        for(int i = 0; i < 5; i++){
568 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
569 <            p1.execute(tasks[i]);
570 <        }
571 <        try {
572 <            Thread.sleep(SHORT_DELAY_MS);
573 <            assertFalse(p1.remove(tasks[0]));
565 >        final ThreadPoolExecutor p =
566 >            new ThreadPoolExecutor(1, 1,
567 >                                   LONG_DELAY_MS, MILLISECONDS,
568 >                                   q);
569 >        Runnable[] tasks = new Runnable[5];
570 >        final CountDownLatch threadStarted = new CountDownLatch(1);
571 >        final CountDownLatch done = new CountDownLatch(1);
572 >        try {
573 >            for (int i = 0; i < tasks.length; i++) {
574 >                tasks[i] = new CheckedRunnable() {
575 >                    public void realRun() throws InterruptedException {
576 >                        threadStarted.countDown();
577 >                        done.await();
578 >                    }};
579 >                p.execute(tasks[i]);
580 >            }
581 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
582 >            assertFalse(p.remove(tasks[0]));
583              assertTrue(q.contains(tasks[4]));
584              assertTrue(q.contains(tasks[3]));
585 <            assertTrue(p1.remove(tasks[4]));
586 <            assertFalse(p1.remove(tasks[4]));
585 >            assertTrue(p.remove(tasks[4]));
586 >            assertFalse(p.remove(tasks[4]));
587              assertFalse(q.contains(tasks[4]));
588              assertTrue(q.contains(tasks[3]));
589 <            assertTrue(p1.remove(tasks[3]));
589 >            assertTrue(p.remove(tasks[3]));
590              assertFalse(q.contains(tasks[3]));
372        } catch(Exception e) {
373            unexpectedException();
591          } finally {
592 <            joinPool(p1);
592 >            done.countDown();
593 >            joinPool(p);
594          }
595      }
596  
597      /**
598 <     *   purge removes cancelled tasks from the queue
598 >     * purge removes cancelled tasks from the queue
599       */
600 <    public void testPurge() {
601 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
600 >    public void testPurge() throws InterruptedException {
601 >        final CountDownLatch threadStarted = new CountDownLatch(1);
602 >        final CountDownLatch done = new CountDownLatch(1);
603 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
604 >        final ThreadPoolExecutor p =
605 >            new ThreadPoolExecutor(1, 1,
606 >                                   LONG_DELAY_MS, MILLISECONDS,
607 >                                   q);
608          FutureTask[] tasks = new FutureTask[5];
609 <        for(int i = 0; i < 5; i++){
610 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
611 <            p1.execute(tasks[i]);
609 >        try {
610 >            for (int i = 0; i < tasks.length; i++) {
611 >                Callable task = new CheckedCallable<Boolean>() {
612 >                    public Boolean realCall() throws InterruptedException {
613 >                        threadStarted.countDown();
614 >                        done.await();
615 >                        return Boolean.TRUE;
616 >                    }};
617 >                tasks[i] = new FutureTask(task);
618 >                p.execute(tasks[i]);
619 >            }
620 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
621 >            assertEquals(tasks.length, p.getTaskCount());
622 >            assertEquals(tasks.length - 1, q.size());
623 >            assertEquals(1L, p.getActiveCount());
624 >            assertEquals(0L, p.getCompletedTaskCount());
625 >            tasks[4].cancel(true);
626 >            tasks[3].cancel(false);
627 >            p.purge();
628 >            assertEquals(tasks.length - 3, q.size());
629 >            assertEquals(tasks.length - 2, p.getTaskCount());
630 >            p.purge();         // Nothing to do
631 >            assertEquals(tasks.length - 3, q.size());
632 >            assertEquals(tasks.length - 2, p.getTaskCount());
633 >        } finally {
634 >            done.countDown();
635 >            joinPool(p);
636          }
389        tasks[4].cancel(true);
390        tasks[3].cancel(true);
391        p1.purge();
392        long count = p1.getTaskCount();
393        assertTrue(count >= 2 && count < 5);
394        joinPool(p1);
637      }
638  
639      /**
640 <     *  shutDownNow returns a list containing tasks that were not run
640 >     * shutdownNow returns a list containing tasks that were not run,
641 >     * and those tasks are drained from the queue
642       */
643 <    public void testShutDownNow() {
644 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
645 <        List l;
646 <        try {
647 <            for(int i = 0; i < 5; i++)
648 <                p1.execute(new MediumPossiblyInterruptedRunnable());
649 <        }
650 <        finally {
643 >    public void testShutdownNow() throws InterruptedException {
644 >        final int poolSize = 2;
645 >        final int count = 5;
646 >        final AtomicInteger ran = new AtomicInteger(0);
647 >        final ThreadPoolExecutor p =
648 >            new ThreadPoolExecutor(poolSize, poolSize,
649 >                                   LONG_DELAY_MS, MILLISECONDS,
650 >                                   new ArrayBlockingQueue<Runnable>(10));
651 >        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
652 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
653 >            threadsStarted.countDown();
654              try {
655 <                l = p1.shutdownNow();
656 <            } catch (SecurityException ok) { return; }
657 <            
658 <        }
659 <        assertTrue(p1.isShutdown());
660 <        assertTrue(l.size() <= 4);
655 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
656 >            } catch (InterruptedException success) {}
657 >            ran.getAndIncrement();
658 >        }};
659 >        for (int i = 0; i < count; i++)
660 >            p.execute(waiter);
661 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
662 >        assertEquals(poolSize, p.getActiveCount());
663 >        assertEquals(0, p.getCompletedTaskCount());
664 >        final List<Runnable> queuedTasks;
665 >        try {
666 >            queuedTasks = p.shutdownNow();
667 >        } catch (SecurityException ok) {
668 >            return; // Allowed in case test doesn't have privs
669 >        }
670 >        assertTrue(p.isShutdown());
671 >        assertTrue(p.getQueue().isEmpty());
672 >        assertEquals(count - poolSize, queuedTasks.size());
673 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
674 >        assertTrue(p.isTerminated());
675 >        assertEquals(poolSize, ran.get());
676 >        assertEquals(poolSize, p.getCompletedTaskCount());
677      }
678  
679      // Exception Tests
418    
680  
681 <    /**
682 <     * Constructor throws if corePoolSize argument is less than zero
681 >    /**
682 >     * Constructor throws if corePoolSize argument is less than zero
683       */
684      public void testConstructor1() {
685          try {
686 <            new ThreadPoolExecutor(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
686 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
687 >                                   new ArrayBlockingQueue<Runnable>(10));
688              shouldThrow();
689 <        }
428 <        catch (IllegalArgumentException success){}
689 >        } catch (IllegalArgumentException success) {}
690      }
691 <    
692 <    /**
693 <     * Constructor throws if maximumPoolSize is less than zero
691 >
692 >    /**
693 >     * Constructor throws if maximumPoolSize is less than zero
694       */
695      public void testConstructor2() {
696          try {
697 <            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
697 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
698 >                                   new ArrayBlockingQueue<Runnable>(10));
699              shouldThrow();
700 <        }
439 <        catch (IllegalArgumentException success){}
700 >        } catch (IllegalArgumentException success) {}
701      }
702 <    
703 <    /**
704 <     * Constructor throws if maximumPoolSize is equal to zero
702 >
703 >    /**
704 >     * Constructor throws if maximumPoolSize is equal to zero
705       */
706      public void testConstructor3() {
707          try {
708 <            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
708 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
709 >                                   new ArrayBlockingQueue<Runnable>(10));
710              shouldThrow();
711 <        }
450 <        catch (IllegalArgumentException success){}
711 >        } catch (IllegalArgumentException success) {}
712      }
713  
714 <    /**
715 <     * Constructor throws if keepAliveTime is less than zero
714 >    /**
715 >     * Constructor throws if keepAliveTime is less than zero
716       */
717      public void testConstructor4() {
718          try {
719 <            new ThreadPoolExecutor(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
719 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
720 >                                   new ArrayBlockingQueue<Runnable>(10));
721              shouldThrow();
722 <        }
461 <        catch (IllegalArgumentException success){}
722 >        } catch (IllegalArgumentException success) {}
723      }
724  
725 <    /**
726 <     * Constructor throws if corePoolSize is greater than the maximumPoolSize
725 >    /**
726 >     * Constructor throws if corePoolSize is greater than the maximumPoolSize
727       */
728      public void testConstructor5() {
729          try {
730 <            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
730 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
731 >                                   new ArrayBlockingQueue<Runnable>(10));
732              shouldThrow();
733 <        }
472 <        catch (IllegalArgumentException success){}
733 >        } catch (IllegalArgumentException success) {}
734      }
735 <        
736 <    /**
737 <     * Constructor throws if workQueue is set to null
735 >
736 >    /**
737 >     * Constructor throws if workQueue is set to null
738       */
739      public void testConstructorNullPointerException() {
740          try {
741 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null);
741 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
742 >                                   (BlockingQueue) null);
743              shouldThrow();
744 <        }
483 <        catch (NullPointerException success){}  
744 >        } catch (NullPointerException success) {}
745      }
485    
746  
747 <    
748 <    /**
489 <     * Constructor throws if corePoolSize argument is less than zero
747 >    /**
748 >     * Constructor throws if corePoolSize argument is less than zero
749       */
750      public void testConstructor6() {
751          try {
752 <            new ThreadPoolExecutor(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
752 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
753 >                                   new ArrayBlockingQueue<Runnable>(10),
754 >                                   new SimpleThreadFactory());
755              shouldThrow();
756 <        } catch (IllegalArgumentException success){}
756 >        } catch (IllegalArgumentException success) {}
757      }
758 <    
759 <    /**
760 <     * Constructor throws if maximumPoolSize is less than zero
758 >
759 >    /**
760 >     * Constructor throws if maximumPoolSize is less than zero
761       */
762      public void testConstructor7() {
763          try {
764 <            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
764 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
765 >                                   new ArrayBlockingQueue<Runnable>(10),
766 >                                   new SimpleThreadFactory());
767              shouldThrow();
768 <        }
506 <        catch (IllegalArgumentException success){}
768 >        } catch (IllegalArgumentException success) {}
769      }
770  
771 <    /**
772 <     * Constructor throws if maximumPoolSize is equal to zero
771 >    /**
772 >     * Constructor throws if maximumPoolSize is equal to zero
773       */
774      public void testConstructor8() {
775          try {
776 <            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
776 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
777 >                                   new ArrayBlockingQueue<Runnable>(10),
778 >                                   new SimpleThreadFactory());
779              shouldThrow();
780 <        }
517 <        catch (IllegalArgumentException success){}
780 >        } catch (IllegalArgumentException success) {}
781      }
782  
783 <    /**
784 <     * Constructor throws if keepAliveTime is less than zero
783 >    /**
784 >     * Constructor throws if keepAliveTime is less than zero
785       */
786      public void testConstructor9() {
787          try {
788 <            new ThreadPoolExecutor(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
788 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
789 >                                   new ArrayBlockingQueue<Runnable>(10),
790 >                                   new SimpleThreadFactory());
791              shouldThrow();
792 <        }
528 <        catch (IllegalArgumentException success){}
792 >        } catch (IllegalArgumentException success) {}
793      }
794  
795 <    /**
796 <     * Constructor throws if corePoolSize is greater than the maximumPoolSize
795 >    /**
796 >     * Constructor throws if corePoolSize is greater than the maximumPoolSize
797       */
798      public void testConstructor10() {
799          try {
800 <            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
800 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
801 >                                   new ArrayBlockingQueue<Runnable>(10),
802 >                                   new SimpleThreadFactory());
803              shouldThrow();
804 <        }
539 <        catch (IllegalArgumentException success){}
804 >        } catch (IllegalArgumentException success) {}
805      }
806  
807 <    /**
808 <     * Constructor throws if workQueue is set to null
807 >    /**
808 >     * Constructor throws if workQueue is set to null
809       */
810      public void testConstructorNullPointerException2() {
811          try {
812 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null,new SimpleThreadFactory());
812 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
813 >                                   (BlockingQueue) null,
814 >                                   new SimpleThreadFactory());
815              shouldThrow();
816 <        }
550 <        catch (NullPointerException success){}  
816 >        } catch (NullPointerException success) {}
817      }
818  
819 <    /**
820 <     * Constructor throws if threadFactory is set to null
819 >    /**
820 >     * Constructor throws if threadFactory is set to null
821       */
822      public void testConstructorNullPointerException3() {
823          try {
824 <            ThreadFactory f = null;
825 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
824 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
825 >                                   new ArrayBlockingQueue<Runnable>(10),
826 >                                   (ThreadFactory) null);
827              shouldThrow();
828 <        }
562 <        catch (NullPointerException success){}  
828 >        } catch (NullPointerException success) {}
829      }
830 <
831 <    
832 <    /**
567 <     * Constructor throws if corePoolSize argument is less than zero
830 >
831 >    /**
832 >     * Constructor throws if corePoolSize argument is less than zero
833       */
834      public void testConstructor11() {
835          try {
836 <            new ThreadPoolExecutor(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
836 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
837 >                                   new ArrayBlockingQueue<Runnable>(10),
838 >                                   new NoOpREHandler());
839              shouldThrow();
840 <        }
574 <        catch (IllegalArgumentException success){}
840 >        } catch (IllegalArgumentException success) {}
841      }
842  
843 <    /**
844 <     * Constructor throws if maximumPoolSize is less than zero
843 >    /**
844 >     * Constructor throws if maximumPoolSize is less than zero
845       */
846      public void testConstructor12() {
847          try {
848 <            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
848 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
849 >                                   new ArrayBlockingQueue<Runnable>(10),
850 >                                   new NoOpREHandler());
851              shouldThrow();
852 <        }
585 <        catch (IllegalArgumentException success){}
852 >        } catch (IllegalArgumentException success) {}
853      }
854  
855 <    /**
856 <     * Constructor throws if maximumPoolSize is equal to zero
855 >    /**
856 >     * Constructor throws if maximumPoolSize is equal to zero
857       */
858      public void testConstructor13() {
859          try {
860 <            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
860 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
861 >                                   new ArrayBlockingQueue<Runnable>(10),
862 >                                   new NoOpREHandler());
863              shouldThrow();
864 <        }
596 <        catch (IllegalArgumentException success){}
864 >        } catch (IllegalArgumentException success) {}
865      }
866  
867 <    /**
868 <     * Constructor throws if keepAliveTime is less than zero
867 >    /**
868 >     * Constructor throws if keepAliveTime is less than zero
869       */
870      public void testConstructor14() {
871          try {
872 <            new ThreadPoolExecutor(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
872 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
873 >                                   new ArrayBlockingQueue<Runnable>(10),
874 >                                   new NoOpREHandler());
875              shouldThrow();
876 <        }
607 <        catch (IllegalArgumentException success){}
876 >        } catch (IllegalArgumentException success) {}
877      }
878  
879 <    /**
880 <     * Constructor throws if corePoolSize is greater than the maximumPoolSize
879 >    /**
880 >     * Constructor throws if corePoolSize is greater than the maximumPoolSize
881       */
882      public void testConstructor15() {
883          try {
884 <            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
884 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
885 >                                   new ArrayBlockingQueue<Runnable>(10),
886 >                                   new NoOpREHandler());
887              shouldThrow();
888 <        }
618 <        catch (IllegalArgumentException success){}
888 >        } catch (IllegalArgumentException success) {}
889      }
890  
891 <    /**
892 <     * Constructor throws if workQueue is set to null
891 >    /**
892 >     * Constructor throws if workQueue is set to null
893       */
894      public void testConstructorNullPointerException4() {
895          try {
896 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null,new NoOpREHandler());
896 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
897 >                                   (BlockingQueue) null,
898 >                                   new NoOpREHandler());
899              shouldThrow();
900 <        }
629 <        catch (NullPointerException success){}  
900 >        } catch (NullPointerException success) {}
901      }
902  
903 <    /**
904 <     * Constructor throws if handler is set to null
903 >    /**
904 >     * Constructor throws if handler is set to null
905       */
906      public void testConstructorNullPointerException5() {
907          try {
908 <            RejectedExecutionHandler r = null;
909 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
908 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
909 >                                   new ArrayBlockingQueue<Runnable>(10),
910 >                                   (RejectedExecutionHandler) null);
911              shouldThrow();
912 <        }
641 <        catch (NullPointerException success){}  
912 >        } catch (NullPointerException success) {}
913      }
914  
915 <    
916 <    /**
646 <     * Constructor throws if corePoolSize argument is less than zero
915 >    /**
916 >     * Constructor throws if corePoolSize argument is less than zero
917       */
918      public void testConstructor16() {
919          try {
920 <            new ThreadPoolExecutor(-1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
920 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
921 >                                   new ArrayBlockingQueue<Runnable>(10),
922 >                                   new SimpleThreadFactory(),
923 >                                   new NoOpREHandler());
924              shouldThrow();
925 <        }
653 <        catch (IllegalArgumentException success){}
925 >        } catch (IllegalArgumentException success) {}
926      }
927  
928 <    /**
929 <     * Constructor throws if maximumPoolSize is less than zero
928 >    /**
929 >     * Constructor throws if maximumPoolSize is less than zero
930       */
931      public void testConstructor17() {
932          try {
933 <            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
933 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
934 >                                   new ArrayBlockingQueue<Runnable>(10),
935 >                                   new SimpleThreadFactory(),
936 >                                   new NoOpREHandler());
937              shouldThrow();
938 <        }
664 <        catch (IllegalArgumentException success){}
938 >        } catch (IllegalArgumentException success) {}
939      }
940  
941 <    /**
942 <     * Constructor throws if maximumPoolSize is equal to zero
941 >    /**
942 >     * Constructor throws if maximumPoolSize is equal to zero
943       */
944      public void testConstructor18() {
945          try {
946 <            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
946 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
947 >                                   new ArrayBlockingQueue<Runnable>(10),
948 >                                   new SimpleThreadFactory(),
949 >                                   new NoOpREHandler());
950              shouldThrow();
951 <        }
675 <        catch (IllegalArgumentException success){}
951 >        } catch (IllegalArgumentException success) {}
952      }
953  
954 <    /**
955 <     * Constructor throws if keepAliveTime is less than zero
954 >    /**
955 >     * Constructor throws if keepAliveTime is less than zero
956       */
957      public void testConstructor19() {
958          try {
959 <            new ThreadPoolExecutor(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
959 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
960 >                                   new ArrayBlockingQueue<Runnable>(10),
961 >                                   new SimpleThreadFactory(),
962 >                                   new NoOpREHandler());
963              shouldThrow();
964 <        }
686 <        catch (IllegalArgumentException success){}
964 >        } catch (IllegalArgumentException success) {}
965      }
966  
967 <    /**
968 <     * Constructor throws if corePoolSize is greater than the maximumPoolSize
967 >    /**
968 >     * Constructor throws if corePoolSize is greater than the maximumPoolSize
969       */
970      public void testConstructor20() {
971          try {
972 <            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
972 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
973 >                                   new ArrayBlockingQueue<Runnable>(10),
974 >                                   new SimpleThreadFactory(),
975 >                                   new NoOpREHandler());
976              shouldThrow();
977 <        }
697 <        catch (IllegalArgumentException success){}
977 >        } catch (IllegalArgumentException success) {}
978      }
979  
980 <    /**
981 <     * Constructor throws if workQueue is set to null
980 >    /**
981 >     * Constructor throws if workQueue is null
982       */
983      public void testConstructorNullPointerException6() {
984          try {
985 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
985 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
986 >                                   (BlockingQueue) null,
987 >                                   new SimpleThreadFactory(),
988 >                                   new NoOpREHandler());
989              shouldThrow();
990 <        }
708 <        catch (NullPointerException success){}  
990 >        } catch (NullPointerException success) {}
991      }
992  
993 <    /**
994 <     * Constructor throws if handler is set to null
993 >    /**
994 >     * Constructor throws if handler is null
995       */
996      public void testConstructorNullPointerException7() {
997          try {
998 <            RejectedExecutionHandler r = null;
999 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
998 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
999 >                                   new ArrayBlockingQueue<Runnable>(10),
1000 >                                   new SimpleThreadFactory(),
1001 >                                   (RejectedExecutionHandler) null);
1002              shouldThrow();
1003 <        }
720 <        catch (NullPointerException success){}  
1003 >        } catch (NullPointerException success) {}
1004      }
1005  
1006 <    /**
1007 <     * Constructor throws if ThreadFactory is set top null
1006 >    /**
1007 >     * Constructor throws if ThreadFactory is null
1008       */
1009      public void testConstructorNullPointerException8() {
1010          try {
1011 <            ThreadFactory f = null;
1012 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f,new NoOpREHandler());
1013 <            shouldThrow();
1011 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1012 >                                   new ArrayBlockingQueue<Runnable>(10),
1013 >                                   (ThreadFactory) null,
1014 >                                   new NoOpREHandler());
1015 >            shouldThrow();
1016 >        } catch (NullPointerException success) {}
1017 >    }
1018 >
1019 >    /**
1020 >     * get of submitted callable throws InterruptedException if interrupted
1021 >     */
1022 >    public void testInterruptedSubmit() throws InterruptedException {
1023 >        final ThreadPoolExecutor p =
1024 >            new ThreadPoolExecutor(1, 1,
1025 >                                   60, SECONDS,
1026 >                                   new ArrayBlockingQueue<Runnable>(10));
1027 >
1028 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1029 >        final CountDownLatch done = new CountDownLatch(1);
1030 >        try {
1031 >            Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1032 >                public void realRun() throws Exception {
1033 >                    Callable task = new CheckedCallable<Boolean>() {
1034 >                        public Boolean realCall() throws InterruptedException {
1035 >                            threadStarted.countDown();
1036 >                            done.await();
1037 >                            return Boolean.TRUE;
1038 >                        }};
1039 >                    p.submit(task).get();
1040 >                }});
1041 >
1042 >            assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1043 >            t.interrupt();
1044 >            awaitTermination(t, MEDIUM_DELAY_MS);
1045 >        } finally {
1046 >            done.countDown();
1047 >            joinPool(p);
1048          }
732        catch (NullPointerException successdn8){}  
1049      }
734    
1050  
1051      /**
1052 <     *  execute throws RejectedExecutionException
738 <     *  if saturated.
1052 >     * execute throws RejectedExecutionException if saturated.
1053       */
1054      public void testSaturatedExecute() {
1055 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
1056 <        try {
1057 <            
1058 <            for(int i = 0; i < 5; ++i){
1059 <                p.execute(new MediumRunnable());
1055 >        ThreadPoolExecutor p =
1056 >            new ThreadPoolExecutor(1, 1,
1057 >                                   LONG_DELAY_MS, MILLISECONDS,
1058 >                                   new ArrayBlockingQueue<Runnable>(1));
1059 >        final CountDownLatch done = new CountDownLatch(1);
1060 >        try {
1061 >            Runnable task = new CheckedRunnable() {
1062 >                public void realRun() throws InterruptedException {
1063 >                    done.await();
1064 >                }};
1065 >            for (int i = 0; i < 2; ++i)
1066 >                p.execute(task);
1067 >            for (int i = 0; i < 2; ++i) {
1068 >                try {
1069 >                    p.execute(task);
1070 >                    shouldThrow();
1071 >                } catch (RejectedExecutionException success) {}
1072 >                assertTrue(p.getTaskCount() <= 2);
1073              }
1074 <            shouldThrow();
1075 <        } catch(RejectedExecutionException success){}
1076 <        joinPool(p);
1074 >        } finally {
1075 >            done.countDown();
1076 >            joinPool(p);
1077 >        }
1078 >    }
1079 >
1080 >    /**
1081 >     * submit(runnable) throws RejectedExecutionException if saturated.
1082 >     */
1083 >    public void testSaturatedSubmitRunnable() {
1084 >        ThreadPoolExecutor p =
1085 >            new ThreadPoolExecutor(1, 1,
1086 >                                   LONG_DELAY_MS, MILLISECONDS,
1087 >                                   new ArrayBlockingQueue<Runnable>(1));
1088 >        final CountDownLatch done = new CountDownLatch(1);
1089 >        try {
1090 >            Runnable task = new CheckedRunnable() {
1091 >                public void realRun() throws InterruptedException {
1092 >                    done.await();
1093 >                }};
1094 >            for (int i = 0; i < 2; ++i)
1095 >                p.submit(task);
1096 >            for (int i = 0; i < 2; ++i) {
1097 >                try {
1098 >                    p.execute(task);
1099 >                    shouldThrow();
1100 >                } catch (RejectedExecutionException success) {}
1101 >                assertTrue(p.getTaskCount() <= 2);
1102 >            }
1103 >        } finally {
1104 >            done.countDown();
1105 >            joinPool(p);
1106 >        }
1107 >    }
1108 >
1109 >    /**
1110 >     * submit(callable) throws RejectedExecutionException if saturated.
1111 >     */
1112 >    public void testSaturatedSubmitCallable() {
1113 >        ThreadPoolExecutor p =
1114 >            new ThreadPoolExecutor(1, 1,
1115 >                                   LONG_DELAY_MS, MILLISECONDS,
1116 >                                   new ArrayBlockingQueue<Runnable>(1));
1117 >        final CountDownLatch done = new CountDownLatch(1);
1118 >        try {
1119 >            Runnable task = new CheckedRunnable() {
1120 >                public void realRun() throws InterruptedException {
1121 >                    done.await();
1122 >                }};
1123 >            for (int i = 0; i < 2; ++i)
1124 >                p.submit(Executors.callable(task));
1125 >            for (int i = 0; i < 2; ++i) {
1126 >                try {
1127 >                    p.execute(task);
1128 >                    shouldThrow();
1129 >                } catch (RejectedExecutionException success) {}
1130 >                assertTrue(p.getTaskCount() <= 2);
1131 >            }
1132 >        } finally {
1133 >            done.countDown();
1134 >            joinPool(p);
1135 >        }
1136      }
1137  
1138      /**
1139 <     *  executor using CallerRunsPolicy runs task if saturated.
1139 >     * executor using CallerRunsPolicy runs task if saturated.
1140       */
1141      public void testSaturatedExecute2() {
1142          RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1143 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1143 >        final ThreadPoolExecutor p =
1144 >            new ThreadPoolExecutor(1, 1,
1145 >                                   LONG_DELAY_MS,
1146 >                                   MILLISECONDS,
1147 >                                   new ArrayBlockingQueue<Runnable>(1),
1148 >                                   h);
1149          try {
759            
1150              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1151 <            for(int i = 0; i < 5; ++i){
1151 >            for (int i = 0; i < tasks.length; ++i)
1152                  tasks[i] = new TrackedNoOpRunnable();
763            }
1153              TrackedLongRunnable mr = new TrackedLongRunnable();
1154              p.execute(mr);
1155 <            for(int i = 0; i < 5; ++i){
1155 >            for (int i = 0; i < tasks.length; ++i)
1156                  p.execute(tasks[i]);
1157 <            }
769 <            for(int i = 1; i < 5; ++i) {
1157 >            for (int i = 1; i < tasks.length; ++i)
1158                  assertTrue(tasks[i].done);
1159 <            }
772 <            try { p.shutdownNow(); } catch(SecurityException ok) { return; }
773 <        } catch(RejectedExecutionException ex){
774 <            unexpectedException();
1159 >            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1160          } finally {
1161              joinPool(p);
1162          }
1163      }
1164  
1165      /**
1166 <     *  executor using DiscardPolicy drops task if saturated.
1166 >     * executor using DiscardPolicy drops task if saturated.
1167       */
1168      public void testSaturatedExecute3() {
1169          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1170 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1170 >        final ThreadPoolExecutor p =
1171 >            new ThreadPoolExecutor(1, 1,
1172 >                                   LONG_DELAY_MS, MILLISECONDS,
1173 >                                   new ArrayBlockingQueue<Runnable>(1),
1174 >                                   h);
1175          try {
787            
1176              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1177 <            for(int i = 0; i < 5; ++i){
1177 >            for (int i = 0; i < tasks.length; ++i)
1178                  tasks[i] = new TrackedNoOpRunnable();
791            }
1179              p.execute(new TrackedLongRunnable());
1180 <            for(int i = 0; i < 5; ++i){
1181 <                p.execute(tasks[i]);
1182 <            }
1183 <            for(int i = 0; i < 5; ++i){
1184 <                assertFalse(tasks[i].done);
798 <            }
799 <            try { p.shutdownNow(); } catch(SecurityException ok) { return; }
800 <        } catch(RejectedExecutionException ex){
801 <            unexpectedException();
1180 >            for (TrackedNoOpRunnable task : tasks)
1181 >                p.execute(task);
1182 >            for (TrackedNoOpRunnable task : tasks)
1183 >                assertFalse(task.done);
1184 >            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1185          } finally {
1186              joinPool(p);
1187          }
1188      }
1189  
1190      /**
1191 <     *  executor using DiscardOldestPolicy drops oldest task if saturated.
1191 >     * executor using DiscardOldestPolicy drops oldest task if saturated.
1192       */
1193      public void testSaturatedExecute4() {
1194          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1195 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1195 >        final ThreadPoolExecutor p =
1196 >            new ThreadPoolExecutor(1, 1,
1197 >                                   LONG_DELAY_MS, MILLISECONDS,
1198 >                                   new ArrayBlockingQueue<Runnable>(1),
1199 >                                   h);
1200          try {
1201              p.execute(new TrackedLongRunnable());
1202              TrackedLongRunnable r2 = new TrackedLongRunnable();
# Line 819 | Line 1206 | public class ThreadPoolExecutorTest exte
1206              p.execute(r3);
1207              assertFalse(p.getQueue().contains(r2));
1208              assertTrue(p.getQueue().contains(r3));
1209 <            try { p.shutdownNow(); } catch(SecurityException ok) { return; }
823 <        } catch(RejectedExecutionException ex){
824 <            unexpectedException();
1209 >            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1210          } finally {
1211              joinPool(p);
1212          }
1213      }
1214  
1215      /**
1216 <     *  execute throws RejectedExecutionException if shutdown
1216 >     * execute throws RejectedExecutionException if shutdown
1217       */
1218      public void testRejectedExecutionExceptionOnShutdown() {
1219 <        ThreadPoolExecutor tpe =
1220 <            new ThreadPoolExecutor(1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1221 <        try { tpe.shutdown(); } catch(SecurityException ok) { return; }
1222 <        try {
1223 <            tpe.execute(new NoOpRunnable());
1224 <            shouldThrow();
1225 <        } catch(RejectedExecutionException success){}
1226 <        
1227 <        joinPool(tpe);
1219 >        ThreadPoolExecutor p =
1220 >            new ThreadPoolExecutor(1, 1,
1221 >                                   LONG_DELAY_MS, MILLISECONDS,
1222 >                                   new ArrayBlockingQueue<Runnable>(1));
1223 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1224 >        try {
1225 >            p.execute(new NoOpRunnable());
1226 >            shouldThrow();
1227 >        } catch (RejectedExecutionException success) {}
1228 >
1229 >        joinPool(p);
1230      }
1231  
1232      /**
1233 <     *  execute using CallerRunsPolicy drops task on shutdown
1233 >     * execute using CallerRunsPolicy drops task on shutdown
1234       */
1235      public void testCallerRunsOnShutdown() {
1236          RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1237 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1237 >        final ThreadPoolExecutor p =
1238 >            new ThreadPoolExecutor(1, 1,
1239 >                                   LONG_DELAY_MS, MILLISECONDS,
1240 >                                   new ArrayBlockingQueue<Runnable>(1), h);
1241  
1242 <        try { p.shutdown(); } catch(SecurityException ok) { return; }
1243 <        try {
1242 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1243 >        try {
1244              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1245 <            p.execute(r);
1245 >            p.execute(r);
1246              assertFalse(r.done);
857        } catch(RejectedExecutionException success){
858            unexpectedException();
1247          } finally {
1248              joinPool(p);
1249          }
1250      }
1251  
1252      /**
1253 <     *  execute using DiscardPolicy drops task on shutdown
1253 >     * execute using DiscardPolicy drops task on shutdown
1254       */
1255      public void testDiscardOnShutdown() {
1256          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1257 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1257 >        ThreadPoolExecutor p =
1258 >            new ThreadPoolExecutor(1, 1,
1259 >                                   LONG_DELAY_MS, MILLISECONDS,
1260 >                                   new ArrayBlockingQueue<Runnable>(1),
1261 >                                   h);
1262  
1263 <        try { p.shutdown(); } catch(SecurityException ok) { return; }
1264 <        try {
1263 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1264 >        try {
1265              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1266 <            p.execute(r);
1266 >            p.execute(r);
1267              assertFalse(r.done);
876        } catch(RejectedExecutionException success){
877            unexpectedException();
1268          } finally {
1269              joinPool(p);
1270          }
1271      }
1272  
883
1273      /**
1274 <     *  execute using DiscardOldestPolicy drops task on shutdown
1274 >     * execute using DiscardOldestPolicy drops task on shutdown
1275       */
1276      public void testDiscardOldestOnShutdown() {
1277          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1278 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1278 >        ThreadPoolExecutor p =
1279 >            new ThreadPoolExecutor(1, 1,
1280 >                                   LONG_DELAY_MS, MILLISECONDS,
1281 >                                   new ArrayBlockingQueue<Runnable>(1),
1282 >                                   h);
1283  
1284 <        try { p.shutdown(); } catch(SecurityException ok) { return; }
1285 <        try {
1284 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1285 >        try {
1286              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1287 <            p.execute(r);
1287 >            p.execute(r);
1288              assertFalse(r.done);
896        } catch(RejectedExecutionException success){
897            unexpectedException();
1289          } finally {
1290              joinPool(p);
1291          }
1292      }
1293  
903
1294      /**
1295 <     *  execute (null) throws NPE
1295 >     * execute(null) throws NPE
1296       */
1297      public void testExecuteNull() {
1298 <        ThreadPoolExecutor tpe = null;
1298 >        ThreadPoolExecutor p =
1299 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1300 >                                   new ArrayBlockingQueue<Runnable>(10));
1301          try {
1302 <            tpe = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
911 <            tpe.execute(null);
1302 >            p.execute(null);
1303              shouldThrow();
1304 <        } catch(NullPointerException success){}
1305 <        
1306 <        joinPool(tpe);
1304 >        } catch (NullPointerException success) {}
1305 >
1306 >        joinPool(p);
1307      }
1308 <    
1308 >
1309      /**
1310 <     *  setCorePoolSize of negative value throws IllegalArgumentException
1310 >     * setCorePoolSize of negative value throws IllegalArgumentException
1311       */
1312      public void testCorePoolSizeIllegalArgumentException() {
1313 <        ThreadPoolExecutor tpe = null;
1314 <        try {
1315 <            tpe = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1316 <        } catch(Exception e){}
926 <        try {
927 <            tpe.setCorePoolSize(-1);
928 <            shouldThrow();
929 <        } catch(IllegalArgumentException success){
930 <        } finally {
931 <            try { tpe.shutdown(); } catch(SecurityException ok) { return; }
932 <        }
933 <        joinPool(tpe);
934 <    }  
935 <
936 <    /**
937 <     *  setMaximumPoolSize(int) throws IllegalArgumentException if
938 <     *  given a value less the core pool size
939 <     */  
940 <    public void testMaximumPoolSizeIllegalArgumentException() {
941 <        ThreadPoolExecutor tpe = null;
1313 >        ThreadPoolExecutor p =
1314 >            new ThreadPoolExecutor(1, 2,
1315 >                                   LONG_DELAY_MS, MILLISECONDS,
1316 >                                   new ArrayBlockingQueue<Runnable>(10));
1317          try {
1318 <            tpe = new ThreadPoolExecutor(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1319 <        } catch(Exception e){}
1318 >            p.setCorePoolSize(-1);
1319 >            shouldThrow();
1320 >        } catch (IllegalArgumentException success) {
1321 >        } finally {
1322 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1323 >        }
1324 >        joinPool(p);
1325 >    }
1326 >
1327 >    /**
1328 >     * setMaximumPoolSize(int) throws IllegalArgumentException if
1329 >     * given a value less the core pool size
1330 >     */
1331 >    public void testMaximumPoolSizeIllegalArgumentException() {
1332 >        ThreadPoolExecutor p =
1333 >            new ThreadPoolExecutor(2, 3,
1334 >                                   LONG_DELAY_MS, MILLISECONDS,
1335 >                                   new ArrayBlockingQueue<Runnable>(10));
1336          try {
1337 <            tpe.setMaximumPoolSize(1);
1337 >            p.setMaximumPoolSize(1);
1338              shouldThrow();
1339 <        } catch(IllegalArgumentException success){
1339 >        } catch (IllegalArgumentException success) {
1340          } finally {
1341 <            try { tpe.shutdown(); } catch(SecurityException ok) { return; }
1341 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1342          }
1343 <        joinPool(tpe);
1343 >        joinPool(p);
1344      }
1345 <    
1345 >
1346      /**
1347 <     *  setMaximumPoolSize throws IllegalArgumentException
1348 <     *  if given a negative value
1347 >     * setMaximumPoolSize throws IllegalArgumentException
1348 >     * if given a negative value
1349       */
1350      public void testMaximumPoolSizeIllegalArgumentException2() {
1351 <        ThreadPoolExecutor tpe = null;
1351 >        ThreadPoolExecutor p =
1352 >            new ThreadPoolExecutor(2, 3,
1353 >                                   LONG_DELAY_MS, MILLISECONDS,
1354 >                                   new ArrayBlockingQueue<Runnable>(10));
1355          try {
1356 <            tpe = new ThreadPoolExecutor(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
963 <        } catch(Exception e){}
964 <        try {
965 <            tpe.setMaximumPoolSize(-1);
1356 >            p.setMaximumPoolSize(-1);
1357              shouldThrow();
1358 <        } catch(IllegalArgumentException success){
1358 >        } catch (IllegalArgumentException success) {
1359          } finally {
1360 <            try { tpe.shutdown(); } catch(SecurityException ok) { return; }
1360 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1361          }
1362 <        joinPool(tpe);
1362 >        joinPool(p);
1363      }
973    
1364  
1365      /**
1366 <     *  setKeepAliveTime  throws IllegalArgumentException
1367 <     *  when given a negative value
1366 >     * Configuration changes that allow core pool size greater than
1367 >     * max pool size result in IllegalArgumentException.
1368 >     */
1369 >    public void testPoolSizeInvariants() {
1370 >        ThreadPoolExecutor p =
1371 >            new ThreadPoolExecutor(1, 1,
1372 >                                   LONG_DELAY_MS, MILLISECONDS,
1373 >                                   new ArrayBlockingQueue<Runnable>(10));
1374 >        for (int s = 1; s < 5; s++) {
1375 >            p.setMaximumPoolSize(s);
1376 >            p.setCorePoolSize(s);
1377 >            try {
1378 >                p.setMaximumPoolSize(s - 1);
1379 >                shouldThrow();
1380 >            } catch (IllegalArgumentException success) {}
1381 >            assertEquals(s, p.getCorePoolSize());
1382 >            assertEquals(s, p.getMaximumPoolSize());
1383 >            try {
1384 >                p.setCorePoolSize(s + 1);
1385 >                shouldThrow();
1386 >            } catch (IllegalArgumentException success) {}
1387 >            assertEquals(s, p.getCorePoolSize());
1388 >            assertEquals(s, p.getMaximumPoolSize());
1389 >        }
1390 >        joinPool(p);
1391 >    }
1392 >
1393 >    /**
1394 >     * setKeepAliveTime throws IllegalArgumentException
1395 >     * when given a negative value
1396       */
1397      public void testKeepAliveTimeIllegalArgumentException() {
1398 <        ThreadPoolExecutor tpe = null;
1398 >        ThreadPoolExecutor p =
1399 >            new ThreadPoolExecutor(2, 3,
1400 >                                   LONG_DELAY_MS, MILLISECONDS,
1401 >                                   new ArrayBlockingQueue<Runnable>(10));
1402          try {
1403 <            tpe = new ThreadPoolExecutor(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
983 <        } catch(Exception e){}
984 <        
985 <        try {
986 <            tpe.setKeepAliveTime(-1,TimeUnit.MILLISECONDS);
1403 >            p.setKeepAliveTime(-1,MILLISECONDS);
1404              shouldThrow();
1405 <        } catch(IllegalArgumentException success){
1405 >        } catch (IllegalArgumentException success) {
1406          } finally {
1407 <            try { tpe.shutdown(); } catch(SecurityException ok) { return; }
1407 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1408          }
1409 <        joinPool(tpe);
1409 >        joinPool(p);
1410      }
1411  
1412      /**
1413       * terminated() is called on termination
1414       */
1415      public void testTerminated() {
1416 <        ExtendedTPE tpe = new ExtendedTPE();
1417 <        try { tpe.shutdown(); } catch(SecurityException ok) { return; }
1418 <        assertTrue(tpe.terminatedCalled);
1419 <        joinPool(tpe);
1416 >        ExtendedTPE p = new ExtendedTPE();
1417 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1418 >        assertTrue(p.terminatedCalled());
1419 >        joinPool(p);
1420      }
1421  
1422      /**
1423       * beforeExecute and afterExecute are called when executing task
1424       */
1425 <    public void testBeforeAfter() {
1426 <        ExtendedTPE tpe = new ExtendedTPE();
1425 >    public void testBeforeAfter() throws InterruptedException {
1426 >        ExtendedTPE p = new ExtendedTPE();
1427          try {
1428 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1429 <            tpe.execute(r);
1430 <            Thread.sleep(SHORT_DELAY_MS);
1431 <            assertTrue(r.done);
1432 <            assertTrue(tpe.beforeCalled);
1433 <            assertTrue(tpe.afterCalled);
1434 <            try { tpe.shutdown(); } catch(SecurityException ok) { return; }
1435 <        }
1436 <        catch(Exception ex) {
1437 <            unexpectedException();
1428 >            final CountDownLatch done = new CountDownLatch(1);
1429 >            p.execute(new CheckedRunnable() {
1430 >                public void realRun() {
1431 >                    done.countDown();
1432 >                }});
1433 >            await(p.afterCalled);
1434 >            assertEquals(0, done.getCount());
1435 >            assertTrue(p.afterCalled());
1436 >            assertTrue(p.beforeCalled());
1437 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1438          } finally {
1439 <            joinPool(tpe);
1439 >            joinPool(p);
1440          }
1441      }
1442  
1443      /**
1444       * completed submit of callable returns result
1445       */
1446 <    public void testSubmitCallable() {
1447 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1446 >    public void testSubmitCallable() throws Exception {
1447 >        ExecutorService e =
1448 >            new ThreadPoolExecutor(2, 2,
1449 >                                   LONG_DELAY_MS, MILLISECONDS,
1450 >                                   new ArrayBlockingQueue<Runnable>(10));
1451          try {
1452              Future<String> future = e.submit(new StringTask());
1453              String result = future.get();
1454              assertSame(TEST_STRING, result);
1035        }
1036        catch (ExecutionException ex) {
1037            unexpectedException();
1038        }
1039        catch (InterruptedException ex) {
1040            unexpectedException();
1455          } finally {
1456              joinPool(e);
1457          }
# Line 1046 | Line 1460 | public class ThreadPoolExecutorTest exte
1460      /**
1461       * completed submit of runnable returns successfully
1462       */
1463 <    public void testSubmitRunnable() {
1464 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1463 >    public void testSubmitRunnable() throws Exception {
1464 >        ExecutorService e =
1465 >            new ThreadPoolExecutor(2, 2,
1466 >                                   LONG_DELAY_MS, MILLISECONDS,
1467 >                                   new ArrayBlockingQueue<Runnable>(10));
1468          try {
1469              Future<?> future = e.submit(new NoOpRunnable());
1470              future.get();
1471              assertTrue(future.isDone());
1055        }
1056        catch (ExecutionException ex) {
1057            unexpectedException();
1058        }
1059        catch (InterruptedException ex) {
1060            unexpectedException();
1472          } finally {
1473              joinPool(e);
1474          }
# Line 1066 | Line 1477 | public class ThreadPoolExecutorTest exte
1477      /**
1478       * completed submit of (runnable, result) returns result
1479       */
1480 <    public void testSubmitRunnable2() {
1481 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1480 >    public void testSubmitRunnable2() throws Exception {
1481 >        ExecutorService e =
1482 >            new ThreadPoolExecutor(2, 2,
1483 >                                   LONG_DELAY_MS, MILLISECONDS,
1484 >                                   new ArrayBlockingQueue<Runnable>(10));
1485          try {
1486              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1487              String result = future.get();
1488              assertSame(TEST_STRING, result);
1075        }
1076        catch (ExecutionException ex) {
1077            unexpectedException();
1078        }
1079        catch (InterruptedException ex) {
1080            unexpectedException();
1489          } finally {
1490              joinPool(e);
1491          }
1492      }
1493  
1086
1087
1088
1089
1494      /**
1495       * invokeAny(null) throws NPE
1496       */
1497 <    public void testInvokeAny1() {
1498 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1497 >    public void testInvokeAny1() throws Exception {
1498 >        ExecutorService e =
1499 >            new ThreadPoolExecutor(2, 2,
1500 >                                   LONG_DELAY_MS, MILLISECONDS,
1501 >                                   new ArrayBlockingQueue<Runnable>(10));
1502          try {
1503              e.invokeAny(null);
1504 +            shouldThrow();
1505          } catch (NullPointerException success) {
1098        } catch(Exception ex) {
1099            unexpectedException();
1506          } finally {
1507              joinPool(e);
1508          }
# Line 1105 | Line 1511 | public class ThreadPoolExecutorTest exte
1511      /**
1512       * invokeAny(empty collection) throws IAE
1513       */
1514 <    public void testInvokeAny2() {
1515 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1514 >    public void testInvokeAny2() throws Exception {
1515 >        ExecutorService e =
1516 >            new ThreadPoolExecutor(2, 2,
1517 >                                   LONG_DELAY_MS, MILLISECONDS,
1518 >                                   new ArrayBlockingQueue<Runnable>(10));
1519          try {
1520              e.invokeAny(new ArrayList<Callable<String>>());
1521 +            shouldThrow();
1522          } catch (IllegalArgumentException success) {
1113        } catch(Exception ex) {
1114            unexpectedException();
1523          } finally {
1524              joinPool(e);
1525          }
# Line 1120 | Line 1528 | public class ThreadPoolExecutorTest exte
1528      /**
1529       * invokeAny(c) throws NPE if c has null elements
1530       */
1531 <    public void testInvokeAny3() {
1532 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1531 >    public void testInvokeAny3() throws Exception {
1532 >        final CountDownLatch latch = new CountDownLatch(1);
1533 >        final ExecutorService e =
1534 >            new ThreadPoolExecutor(2, 2,
1535 >                                   LONG_DELAY_MS, MILLISECONDS,
1536 >                                   new ArrayBlockingQueue<Runnable>(10));
1537 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1538 >        l.add(latchAwaitingStringTask(latch));
1539 >        l.add(null);
1540          try {
1126            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1127            l.add(new StringTask());
1128            l.add(null);
1541              e.invokeAny(l);
1542 +            shouldThrow();
1543          } catch (NullPointerException success) {
1131        } catch(Exception ex) {
1132            unexpectedException();
1544          } finally {
1545 +            latch.countDown();
1546              joinPool(e);
1547          }
1548      }
# Line 1138 | Line 1550 | public class ThreadPoolExecutorTest exte
1550      /**
1551       * invokeAny(c) throws ExecutionException if no task completes
1552       */
1553 <    public void testInvokeAny4() {
1554 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1553 >    public void testInvokeAny4() throws Exception {
1554 >        ExecutorService e =
1555 >            new ThreadPoolExecutor(2, 2,
1556 >                                   LONG_DELAY_MS, MILLISECONDS,
1557 >                                   new ArrayBlockingQueue<Runnable>(10));
1558 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1559 >        l.add(new NPETask());
1560          try {
1144            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1145            l.add(new NPETask());
1561              e.invokeAny(l);
1562 +            shouldThrow();
1563          } catch (ExecutionException success) {
1564 <        } catch(Exception ex) {
1149 <            unexpectedException();
1564 >            assertTrue(success.getCause() instanceof NullPointerException);
1565          } finally {
1566              joinPool(e);
1567          }
# Line 1155 | Line 1570 | public class ThreadPoolExecutorTest exte
1570      /**
1571       * invokeAny(c) returns result of some task
1572       */
1573 <    public void testInvokeAny5() {
1574 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1573 >    public void testInvokeAny5() throws Exception {
1574 >        ExecutorService e =
1575 >            new ThreadPoolExecutor(2, 2,
1576 >                                   LONG_DELAY_MS, MILLISECONDS,
1577 >                                   new ArrayBlockingQueue<Runnable>(10));
1578          try {
1579 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1579 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1580              l.add(new StringTask());
1581              l.add(new StringTask());
1582              String result = e.invokeAny(l);
1583              assertSame(TEST_STRING, result);
1166        } catch (ExecutionException success) {
1167        } catch(Exception ex) {
1168            unexpectedException();
1584          } finally {
1585              joinPool(e);
1586          }
# Line 1174 | Line 1589 | public class ThreadPoolExecutorTest exte
1589      /**
1590       * invokeAll(null) throws NPE
1591       */
1592 <    public void testInvokeAll1() {
1593 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1592 >    public void testInvokeAll1() throws Exception {
1593 >        ExecutorService e =
1594 >            new ThreadPoolExecutor(2, 2,
1595 >                                   LONG_DELAY_MS, MILLISECONDS,
1596 >                                   new ArrayBlockingQueue<Runnable>(10));
1597          try {
1598              e.invokeAll(null);
1599 +            shouldThrow();
1600          } catch (NullPointerException success) {
1182        } catch(Exception ex) {
1183            unexpectedException();
1601          } finally {
1602              joinPool(e);
1603          }
# Line 1189 | Line 1606 | public class ThreadPoolExecutorTest exte
1606      /**
1607       * invokeAll(empty collection) returns empty collection
1608       */
1609 <    public void testInvokeAll2() {
1610 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1609 >    public void testInvokeAll2() throws InterruptedException {
1610 >        ExecutorService e =
1611 >            new ThreadPoolExecutor(2, 2,
1612 >                                   LONG_DELAY_MS, MILLISECONDS,
1613 >                                   new ArrayBlockingQueue<Runnable>(10));
1614          try {
1615              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1616              assertTrue(r.isEmpty());
1197        } catch(Exception ex) {
1198            unexpectedException();
1617          } finally {
1618              joinPool(e);
1619          }
# Line 1204 | Line 1622 | public class ThreadPoolExecutorTest exte
1622      /**
1623       * invokeAll(c) throws NPE if c has null elements
1624       */
1625 <    public void testInvokeAll3() {
1626 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1625 >    public void testInvokeAll3() throws Exception {
1626 >        ExecutorService e =
1627 >            new ThreadPoolExecutor(2, 2,
1628 >                                   LONG_DELAY_MS, MILLISECONDS,
1629 >                                   new ArrayBlockingQueue<Runnable>(10));
1630 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1631 >        l.add(new StringTask());
1632 >        l.add(null);
1633          try {
1210            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1211            l.add(new StringTask());
1212            l.add(null);
1634              e.invokeAll(l);
1635 +            shouldThrow();
1636          } catch (NullPointerException success) {
1215        } catch(Exception ex) {
1216            unexpectedException();
1637          } finally {
1638              joinPool(e);
1639          }
# Line 1222 | Line 1642 | public class ThreadPoolExecutorTest exte
1642      /**
1643       * get of element of invokeAll(c) throws exception on failed task
1644       */
1645 <    public void testInvokeAll4() {
1646 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1645 >    public void testInvokeAll4() throws Exception {
1646 >        ExecutorService e =
1647 >            new ThreadPoolExecutor(2, 2,
1648 >                                   LONG_DELAY_MS, MILLISECONDS,
1649 >                                   new ArrayBlockingQueue<Runnable>(10));
1650          try {
1651 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1651 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1652              l.add(new NPETask());
1653 <            List<Future<String>> result = e.invokeAll(l);
1654 <            assertEquals(1, result.size());
1655 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1656 <                it.next().get();
1657 <        } catch(ExecutionException success) {
1658 <        } catch(Exception ex) {
1659 <            unexpectedException();
1653 >            List<Future<String>> futures = e.invokeAll(l);
1654 >            assertEquals(1, futures.size());
1655 >            try {
1656 >                futures.get(0).get();
1657 >                shouldThrow();
1658 >            } catch (ExecutionException success) {
1659 >                assertTrue(success.getCause() instanceof NullPointerException);
1660 >            }
1661          } finally {
1662              joinPool(e);
1663          }
# Line 1242 | Line 1666 | public class ThreadPoolExecutorTest exte
1666      /**
1667       * invokeAll(c) returns results of all completed tasks
1668       */
1669 <    public void testInvokeAll5() {
1670 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1669 >    public void testInvokeAll5() throws Exception {
1670 >        ExecutorService e =
1671 >            new ThreadPoolExecutor(2, 2,
1672 >                                   LONG_DELAY_MS, MILLISECONDS,
1673 >                                   new ArrayBlockingQueue<Runnable>(10));
1674          try {
1675 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1675 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1676              l.add(new StringTask());
1677              l.add(new StringTask());
1678 <            List<Future<String>> result = e.invokeAll(l);
1679 <            assertEquals(2, result.size());
1680 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1681 <                assertSame(TEST_STRING, it.next().get());
1255 <        } catch (ExecutionException success) {
1256 <        } catch(Exception ex) {
1257 <            unexpectedException();
1678 >            List<Future<String>> futures = e.invokeAll(l);
1679 >            assertEquals(2, futures.size());
1680 >            for (Future<String> future : futures)
1681 >                assertSame(TEST_STRING, future.get());
1682          } finally {
1683              joinPool(e);
1684          }
1685      }
1686  
1263
1264
1687      /**
1688       * timed invokeAny(null) throws NPE
1689       */
1690 <    public void testTimedInvokeAny1() {
1691 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1690 >    public void testTimedInvokeAny1() throws Exception {
1691 >        ExecutorService e =
1692 >            new ThreadPoolExecutor(2, 2,
1693 >                                   LONG_DELAY_MS, MILLISECONDS,
1694 >                                   new ArrayBlockingQueue<Runnable>(10));
1695          try {
1696 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1696 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1697 >            shouldThrow();
1698          } catch (NullPointerException success) {
1273        } catch(Exception ex) {
1274            unexpectedException();
1699          } finally {
1700              joinPool(e);
1701          }
# Line 1280 | Line 1704 | public class ThreadPoolExecutorTest exte
1704      /**
1705       * timed invokeAny(,,null) throws NPE
1706       */
1707 <    public void testTimedInvokeAnyNullTimeUnit() {
1708 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1707 >    public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1708 >        ExecutorService e =
1709 >            new ThreadPoolExecutor(2, 2,
1710 >                                   LONG_DELAY_MS, MILLISECONDS,
1711 >                                   new ArrayBlockingQueue<Runnable>(10));
1712 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1713 >        l.add(new StringTask());
1714          try {
1286            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1287            l.add(new StringTask());
1715              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1716 +            shouldThrow();
1717          } catch (NullPointerException success) {
1290        } catch(Exception ex) {
1291            unexpectedException();
1718          } finally {
1719              joinPool(e);
1720          }
# Line 1297 | Line 1723 | public class ThreadPoolExecutorTest exte
1723      /**
1724       * timed invokeAny(empty collection) throws IAE
1725       */
1726 <    public void testTimedInvokeAny2() {
1727 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1726 >    public void testTimedInvokeAny2() throws Exception {
1727 >        ExecutorService e =
1728 >            new ThreadPoolExecutor(2, 2,
1729 >                                   LONG_DELAY_MS, MILLISECONDS,
1730 >                                   new ArrayBlockingQueue<Runnable>(10));
1731          try {
1732 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1732 >            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1733 >            shouldThrow();
1734          } catch (IllegalArgumentException success) {
1305        } catch(Exception ex) {
1306            unexpectedException();
1735          } finally {
1736              joinPool(e);
1737          }
# Line 1312 | Line 1740 | public class ThreadPoolExecutorTest exte
1740      /**
1741       * timed invokeAny(c) throws NPE if c has null elements
1742       */
1743 <    public void testTimedInvokeAny3() {
1744 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1743 >    public void testTimedInvokeAny3() throws Exception {
1744 >        final CountDownLatch latch = new CountDownLatch(1);
1745 >        final ExecutorService e =
1746 >            new ThreadPoolExecutor(2, 2,
1747 >                                   LONG_DELAY_MS, MILLISECONDS,
1748 >                                   new ArrayBlockingQueue<Runnable>(10));
1749 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1750 >        l.add(latchAwaitingStringTask(latch));
1751 >        l.add(null);
1752          try {
1753 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1754 <            l.add(new StringTask());
1320 <            l.add(null);
1321 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1753 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1754 >            shouldThrow();
1755          } catch (NullPointerException success) {
1323        } catch(Exception ex) {
1324            ex.printStackTrace();
1325            unexpectedException();
1756          } finally {
1757 +            latch.countDown();
1758              joinPool(e);
1759          }
1760      }
# Line 1331 | Line 1762 | public class ThreadPoolExecutorTest exte
1762      /**
1763       * timed invokeAny(c) throws ExecutionException if no task completes
1764       */
1765 <    public void testTimedInvokeAny4() {
1766 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1765 >    public void testTimedInvokeAny4() throws Exception {
1766 >        ExecutorService e =
1767 >            new ThreadPoolExecutor(2, 2,
1768 >                                   LONG_DELAY_MS, MILLISECONDS,
1769 >                                   new ArrayBlockingQueue<Runnable>(10));
1770 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1771 >        l.add(new NPETask());
1772          try {
1773 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1774 <            l.add(new NPETask());
1775 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1776 <        } catch(ExecutionException success) {
1341 <        } catch(Exception ex) {
1342 <            unexpectedException();
1773 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1774 >            shouldThrow();
1775 >        } catch (ExecutionException success) {
1776 >            assertTrue(success.getCause() instanceof NullPointerException);
1777          } finally {
1778              joinPool(e);
1779          }
# Line 1348 | Line 1782 | public class ThreadPoolExecutorTest exte
1782      /**
1783       * timed invokeAny(c) returns result of some task
1784       */
1785 <    public void testTimedInvokeAny5() {
1786 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1785 >    public void testTimedInvokeAny5() throws Exception {
1786 >        ExecutorService e =
1787 >            new ThreadPoolExecutor(2, 2,
1788 >                                   LONG_DELAY_MS, MILLISECONDS,
1789 >                                   new ArrayBlockingQueue<Runnable>(10));
1790          try {
1791 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1791 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1792              l.add(new StringTask());
1793              l.add(new StringTask());
1794 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1794 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1795              assertSame(TEST_STRING, result);
1359        } catch (ExecutionException success) {
1360        } catch(Exception ex) {
1361            unexpectedException();
1796          } finally {
1797              joinPool(e);
1798          }
# Line 1367 | Line 1801 | public class ThreadPoolExecutorTest exte
1801      /**
1802       * timed invokeAll(null) throws NPE
1803       */
1804 <    public void testTimedInvokeAll1() {
1805 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1804 >    public void testTimedInvokeAll1() throws Exception {
1805 >        ExecutorService e =
1806 >            new ThreadPoolExecutor(2, 2,
1807 >                                   LONG_DELAY_MS, MILLISECONDS,
1808 >                                   new ArrayBlockingQueue<Runnable>(10));
1809          try {
1810 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1810 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1811 >            shouldThrow();
1812          } catch (NullPointerException success) {
1375        } catch(Exception ex) {
1376            unexpectedException();
1813          } finally {
1814              joinPool(e);
1815          }
# Line 1382 | Line 1818 | public class ThreadPoolExecutorTest exte
1818      /**
1819       * timed invokeAll(,,null) throws NPE
1820       */
1821 <    public void testTimedInvokeAllNullTimeUnit() {
1822 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1821 >    public void testTimedInvokeAllNullTimeUnit() throws Exception {
1822 >        ExecutorService e =
1823 >            new ThreadPoolExecutor(2, 2,
1824 >                                   LONG_DELAY_MS, MILLISECONDS,
1825 >                                   new ArrayBlockingQueue<Runnable>(10));
1826 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1827 >        l.add(new StringTask());
1828          try {
1388            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1389            l.add(new StringTask());
1829              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1830 +            shouldThrow();
1831          } catch (NullPointerException success) {
1392        } catch(Exception ex) {
1393            unexpectedException();
1832          } finally {
1833              joinPool(e);
1834          }
# Line 1399 | Line 1837 | public class ThreadPoolExecutorTest exte
1837      /**
1838       * timed invokeAll(empty collection) returns empty collection
1839       */
1840 <    public void testTimedInvokeAll2() {
1841 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1840 >    public void testTimedInvokeAll2() throws InterruptedException {
1841 >        ExecutorService e =
1842 >            new ThreadPoolExecutor(2, 2,
1843 >                                   LONG_DELAY_MS, MILLISECONDS,
1844 >                                   new ArrayBlockingQueue<Runnable>(10));
1845          try {
1846 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1846 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1847              assertTrue(r.isEmpty());
1407        } catch(Exception ex) {
1408            unexpectedException();
1848          } finally {
1849              joinPool(e);
1850          }
# Line 1414 | Line 1853 | public class ThreadPoolExecutorTest exte
1853      /**
1854       * timed invokeAll(c) throws NPE if c has null elements
1855       */
1856 <    public void testTimedInvokeAll3() {
1857 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1856 >    public void testTimedInvokeAll3() throws Exception {
1857 >        ExecutorService e =
1858 >            new ThreadPoolExecutor(2, 2,
1859 >                                   LONG_DELAY_MS, MILLISECONDS,
1860 >                                   new ArrayBlockingQueue<Runnable>(10));
1861 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1862 >        l.add(new StringTask());
1863 >        l.add(null);
1864          try {
1865 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1866 <            l.add(new StringTask());
1422 <            l.add(null);
1423 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1865 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1866 >            shouldThrow();
1867          } catch (NullPointerException success) {
1425        } catch(Exception ex) {
1426            unexpectedException();
1868          } finally {
1869              joinPool(e);
1870          }
# Line 1432 | Line 1873 | public class ThreadPoolExecutorTest exte
1873      /**
1874       * get of element of invokeAll(c) throws exception on failed task
1875       */
1876 <    public void testTimedInvokeAll4() {
1877 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1876 >    public void testTimedInvokeAll4() throws Exception {
1877 >        ExecutorService e =
1878 >            new ThreadPoolExecutor(2, 2,
1879 >                                   LONG_DELAY_MS, MILLISECONDS,
1880 >                                   new ArrayBlockingQueue<Runnable>(10));
1881 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1882 >        l.add(new NPETask());
1883 >        List<Future<String>> futures =
1884 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1885 >        assertEquals(1, futures.size());
1886          try {
1887 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1888 <            l.add(new NPETask());
1889 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1890 <            assertEquals(1, result.size());
1442 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1443 <                it.next().get();
1444 <        } catch(ExecutionException success) {
1445 <        } catch(Exception ex) {
1446 <            unexpectedException();
1887 >            futures.get(0).get();
1888 >            shouldThrow();
1889 >        } catch (ExecutionException success) {
1890 >            assertTrue(success.getCause() instanceof NullPointerException);
1891          } finally {
1892              joinPool(e);
1893          }
# Line 1452 | Line 1896 | public class ThreadPoolExecutorTest exte
1896      /**
1897       * timed invokeAll(c) returns results of all completed tasks
1898       */
1899 <    public void testTimedInvokeAll5() {
1900 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1899 >    public void testTimedInvokeAll5() throws Exception {
1900 >        ExecutorService e =
1901 >            new ThreadPoolExecutor(2, 2,
1902 >                                   LONG_DELAY_MS, MILLISECONDS,
1903 >                                   new ArrayBlockingQueue<Runnable>(10));
1904          try {
1905 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1905 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1906              l.add(new StringTask());
1907              l.add(new StringTask());
1908 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1909 <            assertEquals(2, result.size());
1910 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1911 <                assertSame(TEST_STRING, it.next().get());
1912 <        } catch (ExecutionException success) {
1466 <        } catch(Exception ex) {
1467 <            unexpectedException();
1908 >            List<Future<String>> futures =
1909 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1910 >            assertEquals(2, futures.size());
1911 >            for (Future<String> future : futures)
1912 >                assertSame(TEST_STRING, future.get());
1913          } finally {
1914              joinPool(e);
1915          }
# Line 1473 | Line 1918 | public class ThreadPoolExecutorTest exte
1918      /**
1919       * timed invokeAll(c) cancels tasks not completed by timeout
1920       */
1921 <    public void testTimedInvokeAll6() {
1922 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1921 >    public void testTimedInvokeAll6() throws Exception {
1922 >        ExecutorService e =
1923 >            new ThreadPoolExecutor(2, 2,
1924 >                                   LONG_DELAY_MS, MILLISECONDS,
1925 >                                   new ArrayBlockingQueue<Runnable>(10));
1926 >        try {
1927 >            for (long timeout = timeoutMillis();;) {
1928 >                List<Callable<String>> tasks = new ArrayList<>();
1929 >                tasks.add(new StringTask("0"));
1930 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1931 >                tasks.add(new StringTask("2"));
1932 >                long startTime = System.nanoTime();
1933 >                List<Future<String>> futures =
1934 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1935 >                assertEquals(tasks.size(), futures.size());
1936 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1937 >                for (Future future : futures)
1938 >                    assertTrue(future.isDone());
1939 >                assertTrue(futures.get(1).isCancelled());
1940 >                try {
1941 >                    assertEquals("0", futures.get(0).get());
1942 >                    assertEquals("2", futures.get(2).get());
1943 >                    break;
1944 >                } catch (CancellationException retryWithLongerTimeout) {
1945 >                    timeout *= 2;
1946 >                    if (timeout >= LONG_DELAY_MS / 2)
1947 >                        fail("expected exactly one task to be cancelled");
1948 >                }
1949 >            }
1950 >        } finally {
1951 >            joinPool(e);
1952 >        }
1953 >    }
1954 >
1955 >    /**
1956 >     * Execution continues if there is at least one thread even if
1957 >     * thread factory fails to create more
1958 >     */
1959 >    public void testFailingThreadFactory() throws InterruptedException {
1960 >        final ExecutorService e =
1961 >            new ThreadPoolExecutor(100, 100,
1962 >                                   LONG_DELAY_MS, MILLISECONDS,
1963 >                                   new LinkedBlockingQueue<Runnable>(),
1964 >                                   new FailingThreadFactory());
1965          try {
1966 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1967 <            l.add(new StringTask());
1968 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1969 <            l.add(new StringTask());
1970 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
1971 <            assertEquals(3, result.size());
1972 <            Iterator<Future<String>> it = result.iterator();
1973 <            Future<String> f1 = it.next();
1487 <            Future<String> f2 = it.next();
1488 <            Future<String> f3 = it.next();
1489 <            assertTrue(f1.isDone());
1490 <            assertTrue(f2.isDone());
1491 <            assertTrue(f3.isDone());
1492 <            assertFalse(f1.isCancelled());
1493 <            assertTrue(f2.isCancelled());
1494 <        } catch(Exception ex) {
1495 <            unexpectedException();
1966 >            final int TASKS = 100;
1967 >            final CountDownLatch done = new CountDownLatch(TASKS);
1968 >            for (int k = 0; k < TASKS; ++k)
1969 >                e.execute(new CheckedRunnable() {
1970 >                    public void realRun() {
1971 >                        done.countDown();
1972 >                    }});
1973 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1974          } finally {
1975              joinPool(e);
1976          }
1977      }
1978  
1979 +    /**
1980 +     * allowsCoreThreadTimeOut is by default false.
1981 +     */
1982 +    public void testAllowsCoreThreadTimeOut() {
1983 +        final ThreadPoolExecutor p =
1984 +            new ThreadPoolExecutor(2, 2,
1985 +                                   1000, MILLISECONDS,
1986 +                                   new ArrayBlockingQueue<Runnable>(10));
1987 +        assertFalse(p.allowsCoreThreadTimeOut());
1988 +        joinPool(p);
1989 +    }
1990 +
1991 +    /**
1992 +     * allowCoreThreadTimeOut(true) causes idle threads to time out
1993 +     */
1994 +    public void testAllowCoreThreadTimeOut_true() throws Exception {
1995 +        long keepAliveTime = timeoutMillis();
1996 +        final ThreadPoolExecutor p =
1997 +            new ThreadPoolExecutor(2, 10,
1998 +                                   keepAliveTime, MILLISECONDS,
1999 +                                   new ArrayBlockingQueue<Runnable>(10));
2000 +        final CountDownLatch threadStarted = new CountDownLatch(1);
2001 +        try {
2002 +            p.allowCoreThreadTimeOut(true);
2003 +            p.execute(new CheckedRunnable() {
2004 +                public void realRun() {
2005 +                    threadStarted.countDown();
2006 +                    assertEquals(1, p.getPoolSize());
2007 +                }});
2008 +            await(threadStarted);
2009 +            delay(keepAliveTime);
2010 +            long startTime = System.nanoTime();
2011 +            while (p.getPoolSize() > 0
2012 +                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
2013 +                Thread.yield();
2014 +            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
2015 +            assertEquals(0, p.getPoolSize());
2016 +        } finally {
2017 +            joinPool(p);
2018 +        }
2019 +    }
2020 +
2021 +    /**
2022 +     * allowCoreThreadTimeOut(false) causes idle threads not to time out
2023 +     */
2024 +    public void testAllowCoreThreadTimeOut_false() throws Exception {
2025 +        long keepAliveTime = timeoutMillis();
2026 +        final ThreadPoolExecutor p =
2027 +            new ThreadPoolExecutor(2, 10,
2028 +                                   keepAliveTime, MILLISECONDS,
2029 +                                   new ArrayBlockingQueue<Runnable>(10));
2030 +        final CountDownLatch threadStarted = new CountDownLatch(1);
2031 +        try {
2032 +            p.allowCoreThreadTimeOut(false);
2033 +            p.execute(new CheckedRunnable() {
2034 +                public void realRun() throws InterruptedException {
2035 +                    threadStarted.countDown();
2036 +                    assertTrue(p.getPoolSize() >= 1);
2037 +                }});
2038 +            delay(2 * keepAliveTime);
2039 +            assertTrue(p.getPoolSize() >= 1);
2040 +        } finally {
2041 +            joinPool(p);
2042 +        }
2043 +    }
2044 +
2045 +    /**
2046 +     * execute allows the same task to be submitted multiple times, even
2047 +     * if rejected
2048 +     */
2049 +    public void testRejectedRecycledTask() throws InterruptedException {
2050 +        final int nTasks = 1000;
2051 +        final CountDownLatch done = new CountDownLatch(nTasks);
2052 +        final Runnable recycledTask = new Runnable() {
2053 +            public void run() {
2054 +                done.countDown();
2055 +            }};
2056 +        final ThreadPoolExecutor p =
2057 +            new ThreadPoolExecutor(1, 30,
2058 +                                   60, SECONDS,
2059 +                                   new ArrayBlockingQueue(30));
2060 +        try {
2061 +            for (int i = 0; i < nTasks; ++i) {
2062 +                for (;;) {
2063 +                    try {
2064 +                        p.execute(recycledTask);
2065 +                        break;
2066 +                    }
2067 +                    catch (RejectedExecutionException ignore) {}
2068 +                }
2069 +            }
2070 +            // enough time to run all tasks
2071 +            assertTrue(done.await(nTasks * SHORT_DELAY_MS, MILLISECONDS));
2072 +        } finally {
2073 +            joinPool(p);
2074 +        }
2075 +    }
2076 +
2077 +    /**
2078 +     * get(cancelled task) throws CancellationException
2079 +     */
2080 +    public void testGet_cancelled() throws Exception {
2081 +        final ExecutorService e =
2082 +            new ThreadPoolExecutor(1, 1,
2083 +                                   LONG_DELAY_MS, MILLISECONDS,
2084 +                                   new LinkedBlockingQueue<Runnable>());
2085 +        try {
2086 +            final CountDownLatch blockerStarted = new CountDownLatch(1);
2087 +            final CountDownLatch done = new CountDownLatch(1);
2088 +            final List<Future<?>> futures = new ArrayList<>();
2089 +            for (int i = 0; i < 2; i++) {
2090 +                Runnable r = new CheckedRunnable() { public void realRun()
2091 +                                                         throws Throwable {
2092 +                    blockerStarted.countDown();
2093 +                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
2094 +                }};
2095 +                futures.add(e.submit(r));
2096 +            }
2097 +            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2098 +            for (Future<?> future : futures) future.cancel(false);
2099 +            for (Future<?> future : futures) {
2100 +                try {
2101 +                    future.get();
2102 +                    shouldThrow();
2103 +                } catch (CancellationException success) {}
2104 +                try {
2105 +                    future.get(LONG_DELAY_MS, MILLISECONDS);
2106 +                    shouldThrow();
2107 +                } catch (CancellationException success) {}
2108 +                assertTrue(future.isCancelled());
2109 +                assertTrue(future.isDone());
2110 +            }
2111 +            done.countDown();
2112 +        } finally {
2113 +            joinPool(e);
2114 +        }
2115 +    }
2116  
2117   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines