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.29 by jsr166, Fri Nov 20 16:02:10 2009 UTC vs.
Revision 1.84 by jsr166, Sun Oct 4 02:31:15 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines