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.26 by jsr166, Mon Nov 16 05:30:08 2009 UTC vs.
Revision 1.48 by jsr166, Mon May 20 16:51:56 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines