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.30 by jsr166, Fri Nov 20 22:58:48 2009 UTC vs.
Revision 1.88 by jsr166, Sun Oct 4 02:46:13 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());
502 <        try {
503 <            p1.execute(new SmallRunnable());
504 <            assertFalse(p1.isTerminating());
505 <        } finally {
506 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
500 >        final ThreadPoolExecutor p =
501 >            new ThreadPoolExecutor(1, 1,
502 >                                   LONG_DELAY_MS, MILLISECONDS,
503 >                                   new ArrayBlockingQueue<Runnable>(10));
504 >        try (PoolCleaner cleaner = cleaner(p)) {
505 >            final CountDownLatch threadStarted = new CountDownLatch(1);
506 >            final CountDownLatch done = new CountDownLatch(1);
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 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
518 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
519 >            assertTrue(p.isTerminated());
520 >            assertFalse(p.isTerminating());
521          }
299        assertTrue(p1.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
300        assertTrue(p1.isTerminated());
301        assertFalse(p1.isTerminating());
522      }
523  
524      /**
525       * getQueue returns the work queue, which contains queued tasks
526       */
527      public void testGetQueue() throws InterruptedException {
528 <        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
529 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
530 <        FutureTask[] tasks = new FutureTask[5];
531 <        for (int i = 0; i < 5; i++) {
532 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
533 <            p1.execute(tasks[i]);
534 <        }
535 <        try {
536 <            Thread.sleep(SHORT_DELAY_MS);
537 <            BlockingQueue<Runnable> wq = p1.getQueue();
538 <            assertSame(q, wq);
539 <            assertFalse(wq.contains(tasks[0]));
540 <            assertTrue(wq.contains(tasks[4]));
541 <            for (int i = 1; i < 5; ++i)
542 <                tasks[i].cancel(true);
543 <            p1.shutdownNow();
544 <        } finally {
545 <            joinPool(p1);
528 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
529 >        final ThreadPoolExecutor p =
530 >            new ThreadPoolExecutor(1, 1,
531 >                                   LONG_DELAY_MS, MILLISECONDS,
532 >                                   q);
533 >        try (PoolCleaner cleaner = cleaner(p)) {
534 >            final CountDownLatch threadStarted = new CountDownLatch(1);
535 >            final CountDownLatch done = new CountDownLatch(1);
536 >            FutureTask[] tasks = new FutureTask[5];
537 >            for (int i = 0; i < tasks.length; i++) {
538 >                Callable task = new CheckedCallable<Boolean>() {
539 >                    public Boolean realCall() throws InterruptedException {
540 >                        threadStarted.countDown();
541 >                        assertSame(q, p.getQueue());
542 >                        done.await();
543 >                        return Boolean.TRUE;
544 >                    }};
545 >                tasks[i] = new FutureTask(task);
546 >                p.execute(tasks[i]);
547 >            }
548 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
549 >            assertSame(q, p.getQueue());
550 >            assertFalse(q.contains(tasks[0]));
551 >            assertTrue(q.contains(tasks[tasks.length - 1]));
552 >            assertEquals(tasks.length - 1, q.size());
553 >            done.countDown();
554          }
555      }
556  
# Line 331 | Line 559 | public class ThreadPoolExecutorTest exte
559       */
560      public void testRemove() throws InterruptedException {
561          BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
562 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, MILLISECONDS, q);
563 <        FutureTask[] tasks = new FutureTask[5];
564 <        for (int i = 0; i < 5; i++) {
565 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
566 <            p1.execute(tasks[i]);
567 <        }
568 <        try {
569 <            Thread.sleep(SHORT_DELAY_MS);
570 <            assertFalse(p1.remove(tasks[0]));
562 >        final ThreadPoolExecutor p =
563 >            new ThreadPoolExecutor(1, 1,
564 >                                   LONG_DELAY_MS, MILLISECONDS,
565 >                                   q);
566 >        try (PoolCleaner cleaner = cleaner(p)) {
567 >            Runnable[] tasks = new Runnable[6];
568 >            final CountDownLatch threadStarted = new CountDownLatch(1);
569 >            final CountDownLatch done = new CountDownLatch(1);
570 >            for (int i = 0; i < tasks.length; i++) {
571 >                tasks[i] = new CheckedRunnable() {
572 >                    public void realRun() throws InterruptedException {
573 >                        threadStarted.countDown();
574 >                        done.await();
575 >                    }};
576 >                p.execute(tasks[i]);
577 >            }
578 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
579 >            assertFalse(p.remove(tasks[0]));
580              assertTrue(q.contains(tasks[4]));
581              assertTrue(q.contains(tasks[3]));
582 <            assertTrue(p1.remove(tasks[4]));
583 <            assertFalse(p1.remove(tasks[4]));
582 >            assertTrue(p.remove(tasks[4]));
583 >            assertFalse(p.remove(tasks[4]));
584              assertFalse(q.contains(tasks[4]));
585              assertTrue(q.contains(tasks[3]));
586 <            assertTrue(p1.remove(tasks[3]));
586 >            assertTrue(p.remove(tasks[3]));
587              assertFalse(q.contains(tasks[3]));
588 <        } finally {
352 <            joinPool(p1);
588 >            done.countDown();
589          }
590      }
591  
592      /**
593 <     *   purge removes cancelled tasks from the queue
593 >     * purge removes cancelled tasks from the queue
594       */
595 <    public void testPurge() {
596 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
597 <        FutureTask[] tasks = new FutureTask[5];
598 <        for (int i = 0; i < 5; i++) {
599 <            tasks[i] = new FutureTask(new MediumPossiblyInterruptedRunnable(), Boolean.TRUE);
600 <            p1.execute(tasks[i]);
595 >    public void testPurge() throws InterruptedException {
596 >        final CountDownLatch threadStarted = new CountDownLatch(1);
597 >        final CountDownLatch done = new CountDownLatch(1);
598 >        final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
599 >        final ThreadPoolExecutor p =
600 >            new ThreadPoolExecutor(1, 1,
601 >                                   LONG_DELAY_MS, MILLISECONDS,
602 >                                   q);
603 >        try (PoolCleaner cleaner = cleaner(p)) {
604 >            FutureTask[] tasks = new FutureTask[5];
605 >            for (int i = 0; i < tasks.length; i++) {
606 >                Callable task = new CheckedCallable<Boolean>() {
607 >                    public Boolean realCall() throws InterruptedException {
608 >                        threadStarted.countDown();
609 >                        done.await();
610 >                        return Boolean.TRUE;
611 >                    }};
612 >                tasks[i] = new FutureTask(task);
613 >                p.execute(tasks[i]);
614 >            }
615 >            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
616 >            assertEquals(tasks.length, p.getTaskCount());
617 >            assertEquals(tasks.length - 1, q.size());
618 >            assertEquals(1L, p.getActiveCount());
619 >            assertEquals(0L, p.getCompletedTaskCount());
620 >            tasks[4].cancel(true);
621 >            tasks[3].cancel(false);
622 >            p.purge();
623 >            assertEquals(tasks.length - 3, q.size());
624 >            assertEquals(tasks.length - 2, p.getTaskCount());
625 >            p.purge();         // Nothing to do
626 >            assertEquals(tasks.length - 3, q.size());
627 >            assertEquals(tasks.length - 2, p.getTaskCount());
628 >            done.countDown();
629          }
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);
630      }
631  
632      /**
633 <     *  shutDownNow returns a list containing tasks that were not run
634 <     */
635 <    public void testShutDownNow() {
636 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
637 <        List l;
638 <        try {
639 <            for (int i = 0; i < 5; i++)
640 <                p1.execute(new MediumPossiblyInterruptedRunnable());
641 <        }
642 <        finally {
633 >     * shutdownNow returns a list containing tasks that were not run,
634 >     * and those tasks are drained from the queue
635 >     */
636 >    public void testShutdownNow() throws InterruptedException {
637 >        final int poolSize = 2;
638 >        final int count = 5;
639 >        final AtomicInteger ran = new AtomicInteger(0);
640 >        final ThreadPoolExecutor p =
641 >            new ThreadPoolExecutor(poolSize, poolSize,
642 >                                   LONG_DELAY_MS, MILLISECONDS,
643 >                                   new ArrayBlockingQueue<Runnable>(10));
644 >        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
645 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
646 >            threadsStarted.countDown();
647              try {
648 <                l = p1.shutdownNow();
649 <            } catch (SecurityException ok) { return; }
650 <
651 <        }
652 <        assertTrue(p1.isShutdown());
653 <        assertTrue(l.size() <= 4);
648 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
649 >            } catch (InterruptedException success) {}
650 >            ran.getAndIncrement();
651 >        }};
652 >        for (int i = 0; i < count; i++)
653 >            p.execute(waiter);
654 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
655 >        assertEquals(poolSize, p.getActiveCount());
656 >        assertEquals(0, p.getCompletedTaskCount());
657 >        final List<Runnable> queuedTasks;
658 >        try {
659 >            queuedTasks = p.shutdownNow();
660 >        } catch (SecurityException ok) {
661 >            return; // Allowed in case test doesn't have privs
662 >        }
663 >        assertTrue(p.isShutdown());
664 >        assertTrue(p.getQueue().isEmpty());
665 >        assertEquals(count - poolSize, queuedTasks.size());
666 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
667 >        assertTrue(p.isTerminated());
668 >        assertEquals(poolSize, ran.get());
669 >        assertEquals(poolSize, p.getCompletedTaskCount());
670      }
671  
672      // Exception Tests
673  
396
674      /**
675       * Constructor throws if corePoolSize argument is less than zero
676       */
677      public void testConstructor1() {
678          try {
679 <            new ThreadPoolExecutor(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
679 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
680 >                                   new ArrayBlockingQueue<Runnable>(10));
681              shouldThrow();
682          } catch (IllegalArgumentException success) {}
683      }
# Line 409 | Line 687 | public class ThreadPoolExecutorTest exte
687       */
688      public void testConstructor2() {
689          try {
690 <            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
690 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
691 >                                   new ArrayBlockingQueue<Runnable>(10));
692              shouldThrow();
693          } catch (IllegalArgumentException success) {}
694      }
# Line 419 | Line 698 | public class ThreadPoolExecutorTest exte
698       */
699      public void testConstructor3() {
700          try {
701 <            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
701 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
702 >                                   new ArrayBlockingQueue<Runnable>(10));
703              shouldThrow();
704          } catch (IllegalArgumentException success) {}
705      }
# Line 429 | Line 709 | public class ThreadPoolExecutorTest exte
709       */
710      public void testConstructor4() {
711          try {
712 <            new ThreadPoolExecutor(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
712 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
713 >                                   new ArrayBlockingQueue<Runnable>(10));
714              shouldThrow();
715          } catch (IllegalArgumentException success) {}
716      }
# Line 439 | Line 720 | public class ThreadPoolExecutorTest exte
720       */
721      public void testConstructor5() {
722          try {
723 <            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
723 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
724 >                                   new ArrayBlockingQueue<Runnable>(10));
725              shouldThrow();
726          } catch (IllegalArgumentException success) {}
727      }
# Line 449 | Line 731 | public class ThreadPoolExecutorTest exte
731       */
732      public void testConstructorNullPointerException() {
733          try {
734 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, MILLISECONDS,null);
734 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
735 >                                   (BlockingQueue) null);
736              shouldThrow();
737          } catch (NullPointerException success) {}
738      }
739  
457
458
740      /**
741       * Constructor throws if corePoolSize argument is less than zero
742       */
743      public void testConstructor6() {
744          try {
745 <            new ThreadPoolExecutor(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
745 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
746 >                                   new ArrayBlockingQueue<Runnable>(10),
747 >                                   new SimpleThreadFactory());
748              shouldThrow();
749          } catch (IllegalArgumentException success) {}
750      }
# Line 471 | Line 754 | public class ThreadPoolExecutorTest exte
754       */
755      public void testConstructor7() {
756          try {
757 <            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
757 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
758 >                                   new ArrayBlockingQueue<Runnable>(10),
759 >                                   new SimpleThreadFactory());
760              shouldThrow();
761          } catch (IllegalArgumentException success) {}
762      }
# Line 481 | Line 766 | public class ThreadPoolExecutorTest exte
766       */
767      public void testConstructor8() {
768          try {
769 <            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
769 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
770 >                                   new ArrayBlockingQueue<Runnable>(10),
771 >                                   new SimpleThreadFactory());
772              shouldThrow();
773          } catch (IllegalArgumentException success) {}
774      }
# Line 491 | Line 778 | public class ThreadPoolExecutorTest exte
778       */
779      public void testConstructor9() {
780          try {
781 <            new ThreadPoolExecutor(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
781 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
782 >                                   new ArrayBlockingQueue<Runnable>(10),
783 >                                   new SimpleThreadFactory());
784              shouldThrow();
785          } catch (IllegalArgumentException success) {}
786      }
# Line 501 | Line 790 | public class ThreadPoolExecutorTest exte
790       */
791      public void testConstructor10() {
792          try {
793 <            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
793 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
794 >                                   new ArrayBlockingQueue<Runnable>(10),
795 >                                   new SimpleThreadFactory());
796              shouldThrow();
797          } catch (IllegalArgumentException success) {}
798      }
# Line 511 | Line 802 | public class ThreadPoolExecutorTest exte
802       */
803      public void testConstructorNullPointerException2() {
804          try {
805 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
805 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
806 >                                   (BlockingQueue) null,
807 >                                   new SimpleThreadFactory());
808              shouldThrow();
809          } catch (NullPointerException success) {}
810      }
# Line 521 | Line 814 | public class ThreadPoolExecutorTest exte
814       */
815      public void testConstructorNullPointerException3() {
816          try {
817 <            ThreadFactory f = null;
818 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
817 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
818 >                                   new ArrayBlockingQueue<Runnable>(10),
819 >                                   (ThreadFactory) null);
820              shouldThrow();
821          } catch (NullPointerException success) {}
822      }
823  
530
824      /**
825       * Constructor throws if corePoolSize argument is less than zero
826       */
827      public void testConstructor11() {
828          try {
829 <            new ThreadPoolExecutor(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
829 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
830 >                                   new ArrayBlockingQueue<Runnable>(10),
831 >                                   new NoOpREHandler());
832              shouldThrow();
833          } catch (IllegalArgumentException success) {}
834      }
# Line 543 | Line 838 | public class ThreadPoolExecutorTest exte
838       */
839      public void testConstructor12() {
840          try {
841 <            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
841 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
842 >                                   new ArrayBlockingQueue<Runnable>(10),
843 >                                   new NoOpREHandler());
844              shouldThrow();
845          } catch (IllegalArgumentException success) {}
846      }
# Line 553 | Line 850 | public class ThreadPoolExecutorTest exte
850       */
851      public void testConstructor13() {
852          try {
853 <            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
853 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
854 >                                   new ArrayBlockingQueue<Runnable>(10),
855 >                                   new NoOpREHandler());
856              shouldThrow();
857          } catch (IllegalArgumentException success) {}
858      }
# Line 563 | Line 862 | public class ThreadPoolExecutorTest exte
862       */
863      public void testConstructor14() {
864          try {
865 <            new ThreadPoolExecutor(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
865 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
866 >                                   new ArrayBlockingQueue<Runnable>(10),
867 >                                   new NoOpREHandler());
868              shouldThrow();
869          } catch (IllegalArgumentException success) {}
870      }
# Line 573 | Line 874 | public class ThreadPoolExecutorTest exte
874       */
875      public void testConstructor15() {
876          try {
877 <            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
877 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
878 >                                   new ArrayBlockingQueue<Runnable>(10),
879 >                                   new NoOpREHandler());
880              shouldThrow();
881          } catch (IllegalArgumentException success) {}
882      }
# Line 583 | Line 886 | public class ThreadPoolExecutorTest exte
886       */
887      public void testConstructorNullPointerException4() {
888          try {
889 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
889 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
890 >                                   (BlockingQueue) null,
891 >                                   new NoOpREHandler());
892              shouldThrow();
893          } catch (NullPointerException success) {}
894      }
# Line 593 | Line 898 | public class ThreadPoolExecutorTest exte
898       */
899      public void testConstructorNullPointerException5() {
900          try {
901 <            RejectedExecutionHandler r = null;
902 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
901 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
902 >                                   new ArrayBlockingQueue<Runnable>(10),
903 >                                   (RejectedExecutionHandler) null);
904              shouldThrow();
905          } catch (NullPointerException success) {}
906      }
907  
602
908      /**
909       * Constructor throws if corePoolSize argument is less than zero
910       */
911      public void testConstructor16() {
912          try {
913 <            new ThreadPoolExecutor(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
913 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
914 >                                   new ArrayBlockingQueue<Runnable>(10),
915 >                                   new SimpleThreadFactory(),
916 >                                   new NoOpREHandler());
917              shouldThrow();
918          } catch (IllegalArgumentException success) {}
919      }
# Line 615 | Line 923 | public class ThreadPoolExecutorTest exte
923       */
924      public void testConstructor17() {
925          try {
926 <            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
926 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
927 >                                   new ArrayBlockingQueue<Runnable>(10),
928 >                                   new SimpleThreadFactory(),
929 >                                   new NoOpREHandler());
930              shouldThrow();
931          } catch (IllegalArgumentException success) {}
932      }
# Line 625 | Line 936 | public class ThreadPoolExecutorTest exte
936       */
937      public void testConstructor18() {
938          try {
939 <            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
939 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
940 >                                   new ArrayBlockingQueue<Runnable>(10),
941 >                                   new SimpleThreadFactory(),
942 >                                   new NoOpREHandler());
943              shouldThrow();
944          } catch (IllegalArgumentException success) {}
945      }
# Line 635 | Line 949 | public class ThreadPoolExecutorTest exte
949       */
950      public void testConstructor19() {
951          try {
952 <            new ThreadPoolExecutor(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
952 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
953 >                                   new ArrayBlockingQueue<Runnable>(10),
954 >                                   new SimpleThreadFactory(),
955 >                                   new NoOpREHandler());
956              shouldThrow();
957          } catch (IllegalArgumentException success) {}
958      }
# Line 645 | Line 962 | public class ThreadPoolExecutorTest exte
962       */
963      public void testConstructor20() {
964          try {
965 <            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
965 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
966 >                                   new ArrayBlockingQueue<Runnable>(10),
967 >                                   new SimpleThreadFactory(),
968 >                                   new NoOpREHandler());
969              shouldThrow();
970          } catch (IllegalArgumentException success) {}
971      }
972  
973      /**
974 <     * Constructor throws if workQueue is set to null
974 >     * Constructor throws if workQueue is null
975       */
976      public void testConstructorNullPointerException6() {
977          try {
978 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
978 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
979 >                                   (BlockingQueue) null,
980 >                                   new SimpleThreadFactory(),
981 >                                   new NoOpREHandler());
982              shouldThrow();
983          } catch (NullPointerException success) {}
984      }
985  
986      /**
987 <     * Constructor throws if handler is set to null
987 >     * Constructor throws if handler is null
988       */
989      public void testConstructorNullPointerException7() {
990          try {
991 <            RejectedExecutionHandler r = null;
992 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
991 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
992 >                                   new ArrayBlockingQueue<Runnable>(10),
993 >                                   new SimpleThreadFactory(),
994 >                                   (RejectedExecutionHandler) null);
995              shouldThrow();
996          } catch (NullPointerException success) {}
997      }
998  
999      /**
1000 <     * Constructor throws if ThreadFactory is set top null
1000 >     * Constructor throws if ThreadFactory is null
1001       */
1002      public void testConstructorNullPointerException8() {
1003          try {
1004 <            ThreadFactory f = null;
1005 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f,new NoOpREHandler());
1004 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1005 >                                   new ArrayBlockingQueue<Runnable>(10),
1006 >                                   (ThreadFactory) null,
1007 >                                   new NoOpREHandler());
1008              shouldThrow();
1009          } catch (NullPointerException success) {}
1010      }
1011  
1012 +    /**
1013 +     * get of submitted callable throws InterruptedException if interrupted
1014 +     */
1015 +    public void testInterruptedSubmit() throws InterruptedException {
1016 +        final ThreadPoolExecutor p =
1017 +            new ThreadPoolExecutor(1, 1,
1018 +                                   60, SECONDS,
1019 +                                   new ArrayBlockingQueue<Runnable>(10));
1020 +
1021 +        try (PoolCleaner cleaner = cleaner(p)) {
1022 +            final CountDownLatch threadStarted = new CountDownLatch(1);
1023 +            final CountDownLatch done = new CountDownLatch(1);
1024 +            Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1025 +                public void realRun() throws Exception {
1026 +                    Callable task = new CheckedCallable<Boolean>() {
1027 +                        public Boolean realCall() throws InterruptedException {
1028 +                            threadStarted.countDown();
1029 +                            done.await();
1030 +                            return Boolean.TRUE;
1031 +                        }};
1032 +                    p.submit(task).get();
1033 +                }});
1034 +
1035 +            assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
1036 +            t.interrupt();
1037 +            awaitTermination(t, MEDIUM_DELAY_MS);
1038 +            done.countDown();
1039 +        }
1040 +    }
1041  
1042      /**
1043 <     *  execute throws RejectedExecutionException
688 <     *  if saturated.
1043 >     * execute throws RejectedExecutionException if saturated.
1044       */
1045      public void testSaturatedExecute() {
1046          ThreadPoolExecutor p =
1047              new ThreadPoolExecutor(1, 1,
1048                                     LONG_DELAY_MS, MILLISECONDS,
1049                                     new ArrayBlockingQueue<Runnable>(1));
1050 +        final CountDownLatch done = new CountDownLatch(1);
1051 +        try {
1052 +            Runnable task = new CheckedRunnable() {
1053 +                public void realRun() throws InterruptedException {
1054 +                    done.await();
1055 +                }};
1056 +            for (int i = 0; i < 2; ++i)
1057 +                p.execute(task);
1058 +            for (int i = 0; i < 2; ++i) {
1059 +                try {
1060 +                    p.execute(task);
1061 +                    shouldThrow();
1062 +                } catch (RejectedExecutionException success) {}
1063 +                assertTrue(p.getTaskCount() <= 2);
1064 +            }
1065 +        } finally {
1066 +            done.countDown();
1067 +            joinPool(p);
1068 +        }
1069 +    }
1070 +
1071 +    /**
1072 +     * submit(runnable) throws RejectedExecutionException if saturated.
1073 +     */
1074 +    public void testSaturatedSubmitRunnable() {
1075 +        ThreadPoolExecutor p =
1076 +            new ThreadPoolExecutor(1, 1,
1077 +                                   LONG_DELAY_MS, MILLISECONDS,
1078 +                                   new ArrayBlockingQueue<Runnable>(1));
1079 +        final CountDownLatch done = new CountDownLatch(1);
1080          try {
1081 +            Runnable task = new CheckedRunnable() {
1082 +                public void realRun() throws InterruptedException {
1083 +                    done.await();
1084 +                }};
1085              for (int i = 0; i < 2; ++i)
1086 <                p.execute(new MediumRunnable());
1086 >                p.submit(task);
1087              for (int i = 0; i < 2; ++i) {
1088                  try {
1089 <                    p.execute(new MediumRunnable());
1089 >                    p.execute(task);
1090                      shouldThrow();
1091                  } catch (RejectedExecutionException success) {}
1092 +                assertTrue(p.getTaskCount() <= 2);
1093              }
1094          } finally {
1095 +            done.countDown();
1096              joinPool(p);
1097          }
1098      }
1099  
1100      /**
1101 <     *  executor using CallerRunsPolicy runs task if saturated.
1101 >     * submit(callable) throws RejectedExecutionException if saturated.
1102 >     */
1103 >    public void testSaturatedSubmitCallable() {
1104 >        ThreadPoolExecutor p =
1105 >            new ThreadPoolExecutor(1, 1,
1106 >                                   LONG_DELAY_MS, MILLISECONDS,
1107 >                                   new ArrayBlockingQueue<Runnable>(1));
1108 >        final CountDownLatch done = new CountDownLatch(1);
1109 >        try {
1110 >            Runnable task = new CheckedRunnable() {
1111 >                public void realRun() throws InterruptedException {
1112 >                    done.await();
1113 >                }};
1114 >            for (int i = 0; i < 2; ++i)
1115 >                p.submit(Executors.callable(task));
1116 >            for (int i = 0; i < 2; ++i) {
1117 >                try {
1118 >                    p.execute(task);
1119 >                    shouldThrow();
1120 >                } catch (RejectedExecutionException success) {}
1121 >                assertTrue(p.getTaskCount() <= 2);
1122 >            }
1123 >        } finally {
1124 >            done.countDown();
1125 >            joinPool(p);
1126 >        }
1127 >    }
1128 >
1129 >    /**
1130 >     * executor using CallerRunsPolicy runs task if saturated.
1131       */
1132      public void testSaturatedExecute2() {
1133          RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1134 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1134 >        final ThreadPoolExecutor p =
1135 >            new ThreadPoolExecutor(1, 1,
1136 >                                   LONG_DELAY_MS,
1137 >                                   MILLISECONDS,
1138 >                                   new ArrayBlockingQueue<Runnable>(1),
1139 >                                   h);
1140          try {
716
1141              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1142 <            for (int i = 0; i < 5; ++i) {
1142 >            for (int i = 0; i < tasks.length; ++i)
1143                  tasks[i] = new TrackedNoOpRunnable();
720            }
1144              TrackedLongRunnable mr = new TrackedLongRunnable();
1145              p.execute(mr);
1146 <            for (int i = 0; i < 5; ++i) {
1146 >            for (int i = 0; i < tasks.length; ++i)
1147                  p.execute(tasks[i]);
1148 <            }
726 <            for (int i = 1; i < 5; ++i) {
1148 >            for (int i = 1; i < tasks.length; ++i)
1149                  assertTrue(tasks[i].done);
728            }
1150              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1151          } finally {
1152              joinPool(p);
# Line 733 | Line 1154 | public class ThreadPoolExecutorTest exte
1154      }
1155  
1156      /**
1157 <     *  executor using DiscardPolicy drops task if saturated.
1157 >     * executor using DiscardPolicy drops task if saturated.
1158       */
1159      public void testSaturatedExecute3() {
1160          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1161 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1161 >        final ThreadPoolExecutor p =
1162 >            new ThreadPoolExecutor(1, 1,
1163 >                                   LONG_DELAY_MS, MILLISECONDS,
1164 >                                   new ArrayBlockingQueue<Runnable>(1),
1165 >                                   h);
1166          try {
742
1167              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1168 <            for (int i = 0; i < 5; ++i) {
1168 >            for (int i = 0; i < tasks.length; ++i)
1169                  tasks[i] = new TrackedNoOpRunnable();
746            }
1170              p.execute(new TrackedLongRunnable());
1171 <            for (int i = 0; i < 5; ++i) {
1172 <                p.execute(tasks[i]);
1173 <            }
1174 <            for (int i = 0; i < 5; ++i) {
752 <                assertFalse(tasks[i].done);
753 <            }
1171 >            for (TrackedNoOpRunnable task : tasks)
1172 >                p.execute(task);
1173 >            for (TrackedNoOpRunnable task : tasks)
1174 >                assertFalse(task.done);
1175              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1176          } finally {
1177              joinPool(p);
# Line 758 | Line 1179 | public class ThreadPoolExecutorTest exte
1179      }
1180  
1181      /**
1182 <     *  executor using DiscardOldestPolicy drops oldest task if saturated.
1182 >     * executor using DiscardOldestPolicy drops oldest task if saturated.
1183       */
1184      public void testSaturatedExecute4() {
1185          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1186 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1186 >        final ThreadPoolExecutor p =
1187 >            new ThreadPoolExecutor(1, 1,
1188 >                                   LONG_DELAY_MS, MILLISECONDS,
1189 >                                   new ArrayBlockingQueue<Runnable>(1),
1190 >                                   h);
1191          try {
1192              p.execute(new TrackedLongRunnable());
1193              TrackedLongRunnable r2 = new TrackedLongRunnable();
# Line 779 | Line 1204 | public class ThreadPoolExecutorTest exte
1204      }
1205  
1206      /**
1207 <     *  execute throws RejectedExecutionException if shutdown
1207 >     * execute throws RejectedExecutionException if shutdown
1208       */
1209      public void testRejectedExecutionExceptionOnShutdown() {
1210 <        ThreadPoolExecutor tpe =
1211 <            new ThreadPoolExecutor(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1212 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1213 <        try {
1214 <            tpe.execute(new NoOpRunnable());
1215 <            shouldThrow();
1216 <        } catch (RejectedExecutionException success) {}
1210 >        ThreadPoolExecutor p =
1211 >            new ThreadPoolExecutor(1, 1,
1212 >                                   LONG_DELAY_MS, MILLISECONDS,
1213 >                                   new ArrayBlockingQueue<Runnable>(1));
1214 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1215 >        try {
1216 >            p.execute(new NoOpRunnable());
1217 >            shouldThrow();
1218 >        } catch (RejectedExecutionException success) {}
1219  
1220 <        joinPool(tpe);
1220 >        joinPool(p);
1221      }
1222  
1223      /**
1224 <     *  execute using CallerRunsPolicy drops task on shutdown
1224 >     * execute using CallerRunsPolicy drops task on shutdown
1225       */
1226      public void testCallerRunsOnShutdown() {
1227          RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1228 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1228 >        final ThreadPoolExecutor p =
1229 >            new ThreadPoolExecutor(1, 1,
1230 >                                   LONG_DELAY_MS, MILLISECONDS,
1231 >                                   new ArrayBlockingQueue<Runnable>(1), h);
1232  
1233          try { p.shutdown(); } catch (SecurityException ok) { return; }
1234 <        try {
1234 >        try {
1235              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1236 <            p.execute(r);
1236 >            p.execute(r);
1237              assertFalse(r.done);
1238          } finally {
1239              joinPool(p);
# Line 811 | Line 1241 | public class ThreadPoolExecutorTest exte
1241      }
1242  
1243      /**
1244 <     *  execute using DiscardPolicy drops task on shutdown
1244 >     * execute using DiscardPolicy drops task on shutdown
1245       */
1246      public void testDiscardOnShutdown() {
1247          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1248 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1248 >        ThreadPoolExecutor p =
1249 >            new ThreadPoolExecutor(1, 1,
1250 >                                   LONG_DELAY_MS, MILLISECONDS,
1251 >                                   new ArrayBlockingQueue<Runnable>(1),
1252 >                                   h);
1253  
1254          try { p.shutdown(); } catch (SecurityException ok) { return; }
1255 <        try {
1255 >        try {
1256              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1257 <            p.execute(r);
1257 >            p.execute(r);
1258              assertFalse(r.done);
1259          } finally {
1260              joinPool(p);
1261          }
1262      }
1263  
830
1264      /**
1265 <     *  execute using DiscardOldestPolicy drops task on shutdown
1265 >     * execute using DiscardOldestPolicy drops task on shutdown
1266       */
1267      public void testDiscardOldestOnShutdown() {
1268          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1269 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1269 >        ThreadPoolExecutor p =
1270 >            new ThreadPoolExecutor(1, 1,
1271 >                                   LONG_DELAY_MS, MILLISECONDS,
1272 >                                   new ArrayBlockingQueue<Runnable>(1),
1273 >                                   h);
1274  
1275          try { p.shutdown(); } catch (SecurityException ok) { return; }
1276 <        try {
1276 >        try {
1277              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1278 <            p.execute(r);
1278 >            p.execute(r);
1279              assertFalse(r.done);
1280          } finally {
1281              joinPool(p);
1282          }
1283      }
1284  
848
1285      /**
1286 <     *  execute (null) throws NPE
1286 >     * execute(null) throws NPE
1287       */
1288      public void testExecuteNull() {
1289 <        ThreadPoolExecutor tpe = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1289 >        ThreadPoolExecutor p =
1290 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1291 >                                   new ArrayBlockingQueue<Runnable>(10));
1292          try {
1293 <            tpe.execute(null);
1293 >            p.execute(null);
1294              shouldThrow();
1295 <        } catch (NullPointerException success) {}
1295 >        } catch (NullPointerException success) {}
1296  
1297 <        joinPool(tpe);
1297 >        joinPool(p);
1298      }
1299  
1300      /**
1301 <     *  setCorePoolSize of negative value throws IllegalArgumentException
1301 >     * setCorePoolSize of negative value throws IllegalArgumentException
1302       */
1303      public void testCorePoolSizeIllegalArgumentException() {
1304 <        ThreadPoolExecutor tpe =
1304 >        ThreadPoolExecutor p =
1305              new ThreadPoolExecutor(1, 2,
1306                                     LONG_DELAY_MS, MILLISECONDS,
1307                                     new ArrayBlockingQueue<Runnable>(10));
1308 <        try {
1309 <            tpe.setCorePoolSize(-1);
1310 <            shouldThrow();
1311 <        } catch (IllegalArgumentException success) {
1308 >        try {
1309 >            p.setCorePoolSize(-1);
1310 >            shouldThrow();
1311 >        } catch (IllegalArgumentException success) {
1312          } finally {
1313 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1313 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1314          }
1315 <        joinPool(tpe);
1315 >        joinPool(p);
1316      }
1317  
1318      /**
1319 <     *  setMaximumPoolSize(int) throws IllegalArgumentException if
1320 <     *  given a value less the core pool size
1319 >     * setMaximumPoolSize(int) throws IllegalArgumentException if
1320 >     * given a value less the core pool size
1321       */
1322      public void testMaximumPoolSizeIllegalArgumentException() {
1323 <        ThreadPoolExecutor tpe =
1323 >        ThreadPoolExecutor p =
1324              new ThreadPoolExecutor(2, 3,
1325                                     LONG_DELAY_MS, MILLISECONDS,
1326                                     new ArrayBlockingQueue<Runnable>(10));
1327          try {
1328 <            tpe.setMaximumPoolSize(1);
1328 >            p.setMaximumPoolSize(1);
1329              shouldThrow();
1330          } catch (IllegalArgumentException success) {
1331          } finally {
1332 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1332 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1333          }
1334 <        joinPool(tpe);
1334 >        joinPool(p);
1335      }
1336  
1337      /**
1338 <     *  setMaximumPoolSize throws IllegalArgumentException
1339 <     *  if given a negative value
1338 >     * setMaximumPoolSize throws IllegalArgumentException
1339 >     * if given a negative value
1340       */
1341      public void testMaximumPoolSizeIllegalArgumentException2() {
1342 <        ThreadPoolExecutor tpe =
1342 >        ThreadPoolExecutor p =
1343              new ThreadPoolExecutor(2, 3,
1344                                     LONG_DELAY_MS, MILLISECONDS,
1345                                     new ArrayBlockingQueue<Runnable>(10));
1346          try {
1347 <            tpe.setMaximumPoolSize(-1);
1347 >            p.setMaximumPoolSize(-1);
1348              shouldThrow();
1349          } catch (IllegalArgumentException success) {
1350          } finally {
1351 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1351 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1352          }
1353 <        joinPool(tpe);
1353 >        joinPool(p);
1354      }
1355  
1356 +    /**
1357 +     * Configuration changes that allow core pool size greater than
1358 +     * max pool size result in IllegalArgumentException.
1359 +     */
1360 +    public void testPoolSizeInvariants() {
1361 +        ThreadPoolExecutor p =
1362 +            new ThreadPoolExecutor(1, 1,
1363 +                                   LONG_DELAY_MS, MILLISECONDS,
1364 +                                   new ArrayBlockingQueue<Runnable>(10));
1365 +        for (int s = 1; s < 5; s++) {
1366 +            p.setMaximumPoolSize(s);
1367 +            p.setCorePoolSize(s);
1368 +            try {
1369 +                p.setMaximumPoolSize(s - 1);
1370 +                shouldThrow();
1371 +            } catch (IllegalArgumentException success) {}
1372 +            assertEquals(s, p.getCorePoolSize());
1373 +            assertEquals(s, p.getMaximumPoolSize());
1374 +            try {
1375 +                p.setCorePoolSize(s + 1);
1376 +                shouldThrow();
1377 +            } catch (IllegalArgumentException success) {}
1378 +            assertEquals(s, p.getCorePoolSize());
1379 +            assertEquals(s, p.getMaximumPoolSize());
1380 +        }
1381 +        joinPool(p);
1382 +    }
1383  
1384      /**
1385 <     *  setKeepAliveTime  throws IllegalArgumentException
1386 <     *  when given a negative value
1385 >     * setKeepAliveTime throws IllegalArgumentException
1386 >     * when given a negative value
1387       */
1388      public void testKeepAliveTimeIllegalArgumentException() {
1389 <        ThreadPoolExecutor tpe =
1389 >        ThreadPoolExecutor p =
1390              new ThreadPoolExecutor(2, 3,
1391                                     LONG_DELAY_MS, MILLISECONDS,
1392                                     new ArrayBlockingQueue<Runnable>(10));
1393 <        try {
1394 <            tpe.setKeepAliveTime(-1,MILLISECONDS);
1393 >        try {
1394 >            p.setKeepAliveTime(-1,MILLISECONDS);
1395              shouldThrow();
1396          } catch (IllegalArgumentException success) {
1397          } finally {
1398 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1398 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1399          }
1400 <        joinPool(tpe);
1400 >        joinPool(p);
1401      }
1402  
1403      /**
1404       * terminated() is called on termination
1405       */
1406      public void testTerminated() {
1407 <        ExtendedTPE tpe = new ExtendedTPE();
1408 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1409 <        assertTrue(tpe.terminatedCalled);
1410 <        joinPool(tpe);
1407 >        ExtendedTPE p = new ExtendedTPE();
1408 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1409 >        assertTrue(p.terminatedCalled());
1410 >        joinPool(p);
1411      }
1412  
1413      /**
1414       * beforeExecute and afterExecute are called when executing task
1415       */
1416      public void testBeforeAfter() throws InterruptedException {
1417 <        ExtendedTPE tpe = new ExtendedTPE();
1417 >        ExtendedTPE p = new ExtendedTPE();
1418          try {
1419 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1420 <            tpe.execute(r);
1421 <            Thread.sleep(SHORT_DELAY_MS);
1422 <            assertTrue(r.done);
1423 <            assertTrue(tpe.beforeCalled);
1424 <            assertTrue(tpe.afterCalled);
1425 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1419 >            final CountDownLatch done = new CountDownLatch(1);
1420 >            p.execute(new CheckedRunnable() {
1421 >                public void realRun() {
1422 >                    done.countDown();
1423 >                }});
1424 >            await(p.afterCalled);
1425 >            assertEquals(0, done.getCount());
1426 >            assertTrue(p.afterCalled());
1427 >            assertTrue(p.beforeCalled());
1428 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1429          } finally {
1430 <            joinPool(tpe);
1430 >            joinPool(p);
1431          }
1432      }
1433  
# Line 967 | Line 1435 | public class ThreadPoolExecutorTest exte
1435       * completed submit of callable returns result
1436       */
1437      public void testSubmitCallable() throws Exception {
1438 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1438 >        ExecutorService e =
1439 >            new ThreadPoolExecutor(2, 2,
1440 >                                   LONG_DELAY_MS, MILLISECONDS,
1441 >                                   new ArrayBlockingQueue<Runnable>(10));
1442          try {
1443              Future<String> future = e.submit(new StringTask());
1444              String result = future.get();
# Line 981 | Line 1452 | public class ThreadPoolExecutorTest exte
1452       * completed submit of runnable returns successfully
1453       */
1454      public void testSubmitRunnable() throws Exception {
1455 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1455 >        ExecutorService e =
1456 >            new ThreadPoolExecutor(2, 2,
1457 >                                   LONG_DELAY_MS, MILLISECONDS,
1458 >                                   new ArrayBlockingQueue<Runnable>(10));
1459          try {
1460              Future<?> future = e.submit(new NoOpRunnable());
1461              future.get();
# Line 995 | Line 1469 | public class ThreadPoolExecutorTest exte
1469       * completed submit of (runnable, result) returns result
1470       */
1471      public void testSubmitRunnable2() throws Exception {
1472 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1472 >        ExecutorService e =
1473 >            new ThreadPoolExecutor(2, 2,
1474 >                                   LONG_DELAY_MS, MILLISECONDS,
1475 >                                   new ArrayBlockingQueue<Runnable>(10));
1476          try {
1477              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1478              String result = future.get();
# Line 1005 | Line 1482 | public class ThreadPoolExecutorTest exte
1482          }
1483      }
1484  
1008
1485      /**
1486       * invokeAny(null) throws NPE
1487       */
1488      public void testInvokeAny1() throws Exception {
1489 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1489 >        ExecutorService e =
1490 >            new ThreadPoolExecutor(2, 2,
1491 >                                   LONG_DELAY_MS, MILLISECONDS,
1492 >                                   new ArrayBlockingQueue<Runnable>(10));
1493          try {
1494              e.invokeAny(null);
1495              shouldThrow();
# Line 1024 | Line 1503 | public class ThreadPoolExecutorTest exte
1503       * invokeAny(empty collection) throws IAE
1504       */
1505      public void testInvokeAny2() throws Exception {
1506 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1506 >        ExecutorService e =
1507 >            new ThreadPoolExecutor(2, 2,
1508 >                                   LONG_DELAY_MS, MILLISECONDS,
1509 >                                   new ArrayBlockingQueue<Runnable>(10));
1510          try {
1511              e.invokeAny(new ArrayList<Callable<String>>());
1512              shouldThrow();
# Line 1039 | Line 1521 | public class ThreadPoolExecutorTest exte
1521       */
1522      public void testInvokeAny3() throws Exception {
1523          final CountDownLatch latch = new CountDownLatch(1);
1524 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1524 >        final ExecutorService e =
1525 >            new ThreadPoolExecutor(2, 2,
1526 >                                   LONG_DELAY_MS, MILLISECONDS,
1527 >                                   new ArrayBlockingQueue<Runnable>(10));
1528 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1529 >        l.add(latchAwaitingStringTask(latch));
1530 >        l.add(null);
1531          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);
1532              e.invokeAny(l);
1533              shouldThrow();
1534          } catch (NullPointerException success) {
# Line 1063 | Line 1542 | public class ThreadPoolExecutorTest exte
1542       * invokeAny(c) throws ExecutionException if no task completes
1543       */
1544      public void testInvokeAny4() throws Exception {
1545 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1545 >        ExecutorService e =
1546 >            new ThreadPoolExecutor(2, 2,
1547 >                                   LONG_DELAY_MS, MILLISECONDS,
1548 >                                   new ArrayBlockingQueue<Runnable>(10));
1549 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1550 >        l.add(new NPETask());
1551          try {
1068            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1069            l.add(new NPETask());
1552              e.invokeAny(l);
1553              shouldThrow();
1554          } catch (ExecutionException success) {
# Line 1080 | Line 1562 | public class ThreadPoolExecutorTest exte
1562       * invokeAny(c) returns result of some task
1563       */
1564      public void testInvokeAny5() throws Exception {
1565 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1565 >        ExecutorService e =
1566 >            new ThreadPoolExecutor(2, 2,
1567 >                                   LONG_DELAY_MS, MILLISECONDS,
1568 >                                   new ArrayBlockingQueue<Runnable>(10));
1569          try {
1570 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1570 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1571              l.add(new StringTask());
1572              l.add(new StringTask());
1573              String result = e.invokeAny(l);
# Line 1096 | Line 1581 | public class ThreadPoolExecutorTest exte
1581       * invokeAll(null) throws NPE
1582       */
1583      public void testInvokeAll1() throws Exception {
1584 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1584 >        ExecutorService e =
1585 >            new ThreadPoolExecutor(2, 2,
1586 >                                   LONG_DELAY_MS, MILLISECONDS,
1587 >                                   new ArrayBlockingQueue<Runnable>(10));
1588          try {
1589              e.invokeAll(null);
1590              shouldThrow();
# Line 1110 | Line 1598 | public class ThreadPoolExecutorTest exte
1598       * invokeAll(empty collection) returns empty collection
1599       */
1600      public void testInvokeAll2() throws InterruptedException {
1601 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1601 >        ExecutorService e =
1602 >            new ThreadPoolExecutor(2, 2,
1603 >                                   LONG_DELAY_MS, MILLISECONDS,
1604 >                                   new ArrayBlockingQueue<Runnable>(10));
1605          try {
1606              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1607              assertTrue(r.isEmpty());
# Line 1123 | Line 1614 | public class ThreadPoolExecutorTest exte
1614       * invokeAll(c) throws NPE if c has null elements
1615       */
1616      public void testInvokeAll3() throws Exception {
1617 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1617 >        ExecutorService e =
1618 >            new ThreadPoolExecutor(2, 2,
1619 >                                   LONG_DELAY_MS, MILLISECONDS,
1620 >                                   new ArrayBlockingQueue<Runnable>(10));
1621 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1622 >        l.add(new StringTask());
1623 >        l.add(null);
1624          try {
1128            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1129            l.add(new StringTask());
1130            l.add(null);
1625              e.invokeAll(l);
1626              shouldThrow();
1627          } catch (NullPointerException success) {
# Line 1140 | Line 1634 | public class ThreadPoolExecutorTest exte
1634       * get of element of invokeAll(c) throws exception on failed task
1635       */
1636      public void testInvokeAll4() throws Exception {
1637 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1637 >        ExecutorService e =
1638 >            new ThreadPoolExecutor(2, 2,
1639 >                                   LONG_DELAY_MS, MILLISECONDS,
1640 >                                   new ArrayBlockingQueue<Runnable>(10));
1641          try {
1642 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1642 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1643              l.add(new NPETask());
1644 <            List<Future<String>> result = e.invokeAll(l);
1645 <            assertEquals(1, result.size());
1646 <            for (Future<String> future : result) {
1647 <                try {
1648 <                    future.get();
1649 <                    shouldThrow();
1650 <                } catch (ExecutionException success) {
1154 <                    Throwable cause = success.getCause();
1155 <                    assertTrue(cause instanceof NullPointerException);
1156 <                }
1644 >            List<Future<String>> futures = e.invokeAll(l);
1645 >            assertEquals(1, futures.size());
1646 >            try {
1647 >                futures.get(0).get();
1648 >                shouldThrow();
1649 >            } catch (ExecutionException success) {
1650 >                assertTrue(success.getCause() instanceof NullPointerException);
1651              }
1652          } finally {
1653              joinPool(e);
# Line 1164 | Line 1658 | public class ThreadPoolExecutorTest exte
1658       * invokeAll(c) returns results of all completed tasks
1659       */
1660      public void testInvokeAll5() throws Exception {
1661 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1661 >        ExecutorService e =
1662 >            new ThreadPoolExecutor(2, 2,
1663 >                                   LONG_DELAY_MS, MILLISECONDS,
1664 >                                   new ArrayBlockingQueue<Runnable>(10));
1665          try {
1666 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1666 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1667              l.add(new StringTask());
1668              l.add(new StringTask());
1669 <            List<Future<String>> result = e.invokeAll(l);
1670 <            assertEquals(2, result.size());
1671 <            for (Future<String> future : result)
1669 >            List<Future<String>> futures = e.invokeAll(l);
1670 >            assertEquals(2, futures.size());
1671 >            for (Future<String> future : futures)
1672                  assertSame(TEST_STRING, future.get());
1673          } finally {
1674              joinPool(e);
1675          }
1676      }
1677  
1181
1182
1678      /**
1679       * timed invokeAny(null) throws NPE
1680       */
1681      public void testTimedInvokeAny1() throws Exception {
1682 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1682 >        ExecutorService e =
1683 >            new ThreadPoolExecutor(2, 2,
1684 >                                   LONG_DELAY_MS, MILLISECONDS,
1685 >                                   new ArrayBlockingQueue<Runnable>(10));
1686          try {
1687              e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1688              shouldThrow();
# Line 1198 | Line 1696 | public class ThreadPoolExecutorTest exte
1696       * timed invokeAny(,,null) throws NPE
1697       */
1698      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1699 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1699 >        ExecutorService e =
1700 >            new ThreadPoolExecutor(2, 2,
1701 >                                   LONG_DELAY_MS, MILLISECONDS,
1702 >                                   new ArrayBlockingQueue<Runnable>(10));
1703 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1704 >        l.add(new StringTask());
1705          try {
1203            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1204            l.add(new StringTask());
1706              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1707              shouldThrow();
1708          } catch (NullPointerException success) {
# Line 1214 | Line 1715 | public class ThreadPoolExecutorTest exte
1715       * timed invokeAny(empty collection) throws IAE
1716       */
1717      public void testTimedInvokeAny2() throws Exception {
1718 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1718 >        ExecutorService e =
1719 >            new ThreadPoolExecutor(2, 2,
1720 >                                   LONG_DELAY_MS, MILLISECONDS,
1721 >                                   new ArrayBlockingQueue<Runnable>(10));
1722          try {
1723              e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1724              shouldThrow();
# Line 1229 | Line 1733 | public class ThreadPoolExecutorTest exte
1733       */
1734      public void testTimedInvokeAny3() throws Exception {
1735          final CountDownLatch latch = new CountDownLatch(1);
1736 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1736 >        final ExecutorService e =
1737 >            new ThreadPoolExecutor(2, 2,
1738 >                                   LONG_DELAY_MS, MILLISECONDS,
1739 >                                   new ArrayBlockingQueue<Runnable>(10));
1740 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1741 >        l.add(latchAwaitingStringTask(latch));
1742 >        l.add(null);
1743          try {
1234            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1235            l.add(new Callable<String>() {
1236                      public String call() {
1237                          try {
1238                              latch.await();
1239                          } catch (InterruptedException ok) {}
1240                          return TEST_STRING;
1241                      }});
1242            l.add(null);
1744              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1745              shouldThrow();
1746          } catch (NullPointerException success) {
# Line 1253 | Line 1754 | public class ThreadPoolExecutorTest exte
1754       * timed invokeAny(c) throws ExecutionException if no task completes
1755       */
1756      public void testTimedInvokeAny4() throws Exception {
1757 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1757 >        ExecutorService e =
1758 >            new ThreadPoolExecutor(2, 2,
1759 >                                   LONG_DELAY_MS, MILLISECONDS,
1760 >                                   new ArrayBlockingQueue<Runnable>(10));
1761 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1762 >        l.add(new NPETask());
1763          try {
1258            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1259            l.add(new NPETask());
1764              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1765              shouldThrow();
1766          } catch (ExecutionException success) {
# Line 1270 | Line 1774 | public class ThreadPoolExecutorTest exte
1774       * timed invokeAny(c) returns result of some task
1775       */
1776      public void testTimedInvokeAny5() throws Exception {
1777 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1777 >        ExecutorService e =
1778 >            new ThreadPoolExecutor(2, 2,
1779 >                                   LONG_DELAY_MS, MILLISECONDS,
1780 >                                   new ArrayBlockingQueue<Runnable>(10));
1781          try {
1782 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1782 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1783              l.add(new StringTask());
1784              l.add(new StringTask());
1785              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 1286 | Line 1793 | public class ThreadPoolExecutorTest exte
1793       * timed invokeAll(null) throws NPE
1794       */
1795      public void testTimedInvokeAll1() throws Exception {
1796 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1796 >        ExecutorService e =
1797 >            new ThreadPoolExecutor(2, 2,
1798 >                                   LONG_DELAY_MS, MILLISECONDS,
1799 >                                   new ArrayBlockingQueue<Runnable>(10));
1800          try {
1801              e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1802              shouldThrow();
# Line 1300 | Line 1810 | public class ThreadPoolExecutorTest exte
1810       * timed invokeAll(,,null) throws NPE
1811       */
1812      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1813 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1813 >        ExecutorService e =
1814 >            new ThreadPoolExecutor(2, 2,
1815 >                                   LONG_DELAY_MS, MILLISECONDS,
1816 >                                   new ArrayBlockingQueue<Runnable>(10));
1817 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1818 >        l.add(new StringTask());
1819          try {
1305            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1306            l.add(new StringTask());
1820              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1821              shouldThrow();
1822          } catch (NullPointerException success) {
# Line 1316 | Line 1829 | public class ThreadPoolExecutorTest exte
1829       * timed invokeAll(empty collection) returns empty collection
1830       */
1831      public void testTimedInvokeAll2() throws InterruptedException {
1832 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1832 >        ExecutorService e =
1833 >            new ThreadPoolExecutor(2, 2,
1834 >                                   LONG_DELAY_MS, MILLISECONDS,
1835 >                                   new ArrayBlockingQueue<Runnable>(10));
1836          try {
1837              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1838              assertTrue(r.isEmpty());
# Line 1329 | Line 1845 | public class ThreadPoolExecutorTest exte
1845       * timed invokeAll(c) throws NPE if c has null elements
1846       */
1847      public void testTimedInvokeAll3() throws Exception {
1848 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1848 >        ExecutorService e =
1849 >            new ThreadPoolExecutor(2, 2,
1850 >                                   LONG_DELAY_MS, MILLISECONDS,
1851 >                                   new ArrayBlockingQueue<Runnable>(10));
1852 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1853 >        l.add(new StringTask());
1854 >        l.add(null);
1855          try {
1334            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1335            l.add(new StringTask());
1336            l.add(null);
1856              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1857              shouldThrow();
1858          } catch (NullPointerException success) {
# Line 1346 | Line 1865 | public class ThreadPoolExecutorTest exte
1865       * get of element of invokeAll(c) throws exception on failed task
1866       */
1867      public void testTimedInvokeAll4() throws Exception {
1868 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1868 >        ExecutorService e =
1869 >            new ThreadPoolExecutor(2, 2,
1870 >                                   LONG_DELAY_MS, MILLISECONDS,
1871 >                                   new ArrayBlockingQueue<Runnable>(10));
1872 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1873 >        l.add(new NPETask());
1874 >        List<Future<String>> futures =
1875 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1876 >        assertEquals(1, futures.size());
1877          try {
1878 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1352 <            l.add(new NPETask());
1353 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1354 <            assertEquals(1, result.size());
1355 <            for (Future<String> future : result)
1356 <                future.get();
1878 >            futures.get(0).get();
1879              shouldThrow();
1880          } catch (ExecutionException success) {
1881              assertTrue(success.getCause() instanceof NullPointerException);
# Line 1366 | Line 1888 | public class ThreadPoolExecutorTest exte
1888       * timed invokeAll(c) returns results of all completed tasks
1889       */
1890      public void testTimedInvokeAll5() throws Exception {
1891 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1891 >        ExecutorService e =
1892 >            new ThreadPoolExecutor(2, 2,
1893 >                                   LONG_DELAY_MS, MILLISECONDS,
1894 >                                   new ArrayBlockingQueue<Runnable>(10));
1895          try {
1896 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1896 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1897              l.add(new StringTask());
1898              l.add(new StringTask());
1899 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1900 <            assertEquals(2, result.size());
1901 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1902 <                assertSame(TEST_STRING, it.next().get());
1899 >            List<Future<String>> futures =
1900 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1901 >            assertEquals(2, futures.size());
1902 >            for (Future<String> future : futures)
1903 >                assertSame(TEST_STRING, future.get());
1904          } finally {
1905              joinPool(e);
1906          }
# Line 1384 | Line 1910 | public class ThreadPoolExecutorTest exte
1910       * timed invokeAll(c) cancels tasks not completed by timeout
1911       */
1912      public void testTimedInvokeAll6() throws Exception {
1913 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1913 >        ExecutorService e =
1914 >            new ThreadPoolExecutor(2, 2,
1915 >                                   LONG_DELAY_MS, MILLISECONDS,
1916 >                                   new ArrayBlockingQueue<Runnable>(10));
1917          try {
1918 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1919 <            l.add(new StringTask());
1920 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1921 <            l.add(new StringTask());
1922 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1923 <            assertEquals(3, result.size());
1924 <            Iterator<Future<String>> it = result.iterator();
1925 <            Future<String> f1 = it.next();
1926 <            Future<String> f2 = it.next();
1927 <            Future<String> f3 = it.next();
1928 <            assertTrue(f1.isDone());
1929 <            assertTrue(f2.isDone());
1930 <            assertTrue(f3.isDone());
1931 <            assertFalse(f1.isCancelled());
1932 <            assertTrue(f2.isCancelled());
1918 >            for (long timeout = timeoutMillis();;) {
1919 >                List<Callable<String>> tasks = new ArrayList<>();
1920 >                tasks.add(new StringTask("0"));
1921 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1922 >                tasks.add(new StringTask("2"));
1923 >                long startTime = System.nanoTime();
1924 >                List<Future<String>> futures =
1925 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1926 >                assertEquals(tasks.size(), futures.size());
1927 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1928 >                for (Future future : futures)
1929 >                    assertTrue(future.isDone());
1930 >                assertTrue(futures.get(1).isCancelled());
1931 >                try {
1932 >                    assertEquals("0", futures.get(0).get());
1933 >                    assertEquals("2", futures.get(2).get());
1934 >                    break;
1935 >                } catch (CancellationException retryWithLongerTimeout) {
1936 >                    timeout *= 2;
1937 >                    if (timeout >= LONG_DELAY_MS / 2)
1938 >                        fail("expected exactly one task to be cancelled");
1939 >                }
1940 >            }
1941          } finally {
1942              joinPool(e);
1943          }
# Line 1411 | Line 1948 | public class ThreadPoolExecutorTest exte
1948       * thread factory fails to create more
1949       */
1950      public void testFailingThreadFactory() throws InterruptedException {
1951 <        ExecutorService e = new ThreadPoolExecutor(100, 100, LONG_DELAY_MS, MILLISECONDS, new LinkedBlockingQueue<Runnable>(), new FailingThreadFactory());
1951 >        final ExecutorService e =
1952 >            new ThreadPoolExecutor(100, 100,
1953 >                                   LONG_DELAY_MS, MILLISECONDS,
1954 >                                   new LinkedBlockingQueue<Runnable>(),
1955 >                                   new FailingThreadFactory());
1956          try {
1957 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1958 <            for (int k = 0; k < 100; ++k) {
1959 <                e.execute(new NoOpRunnable());
1960 <            }
1961 <            Thread.sleep(LONG_DELAY_MS);
1957 >            final int TASKS = 100;
1958 >            final CountDownLatch done = new CountDownLatch(TASKS);
1959 >            for (int k = 0; k < TASKS; ++k)
1960 >                e.execute(new CheckedRunnable() {
1961 >                    public void realRun() {
1962 >                        done.countDown();
1963 >                    }});
1964 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1965          } finally {
1966              joinPool(e);
1967          }
# Line 1427 | Line 1971 | public class ThreadPoolExecutorTest exte
1971       * allowsCoreThreadTimeOut is by default false.
1972       */
1973      public void testAllowsCoreThreadTimeOut() {
1974 <        ThreadPoolExecutor tpe = new ThreadPoolExecutor(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1975 <        assertFalse(tpe.allowsCoreThreadTimeOut());
1976 <        joinPool(tpe);
1974 >        final ThreadPoolExecutor p =
1975 >            new ThreadPoolExecutor(2, 2,
1976 >                                   1000, MILLISECONDS,
1977 >                                   new ArrayBlockingQueue<Runnable>(10));
1978 >        assertFalse(p.allowsCoreThreadTimeOut());
1979 >        joinPool(p);
1980      }
1981  
1982      /**
1983       * allowCoreThreadTimeOut(true) causes idle threads to time out
1984       */
1985 <    public void testAllowCoreThreadTimeOut_true() throws InterruptedException {
1986 <        ThreadPoolExecutor tpe = new ThreadPoolExecutor(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1987 <        tpe.allowCoreThreadTimeOut(true);
1988 <        tpe.execute(new NoOpRunnable());
1985 >    public void testAllowCoreThreadTimeOut_true() throws Exception {
1986 >        long keepAliveTime = timeoutMillis();
1987 >        final ThreadPoolExecutor p =
1988 >            new ThreadPoolExecutor(2, 10,
1989 >                                   keepAliveTime, MILLISECONDS,
1990 >                                   new ArrayBlockingQueue<Runnable>(10));
1991 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1992          try {
1993 <            Thread.sleep(MEDIUM_DELAY_MS);
1994 <            assertEquals(0, tpe.getPoolSize());
1993 >            p.allowCoreThreadTimeOut(true);
1994 >            p.execute(new CheckedRunnable() {
1995 >                public void realRun() {
1996 >                    threadStarted.countDown();
1997 >                    assertEquals(1, p.getPoolSize());
1998 >                }});
1999 >            await(threadStarted);
2000 >            delay(keepAliveTime);
2001 >            long startTime = System.nanoTime();
2002 >            while (p.getPoolSize() > 0
2003 >                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
2004 >                Thread.yield();
2005 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
2006 >            assertEquals(0, p.getPoolSize());
2007          } finally {
2008 <            joinPool(tpe);
2008 >            joinPool(p);
2009          }
2010      }
2011  
2012      /**
2013       * allowCoreThreadTimeOut(false) causes idle threads not to time out
2014       */
2015 <    public void testAllowCoreThreadTimeOut_false() throws InterruptedException {
2016 <        ThreadPoolExecutor tpe = new ThreadPoolExecutor(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
2017 <        tpe.allowCoreThreadTimeOut(false);
2018 <        tpe.execute(new NoOpRunnable());
2015 >    public void testAllowCoreThreadTimeOut_false() throws Exception {
2016 >        long keepAliveTime = timeoutMillis();
2017 >        final ThreadPoolExecutor p =
2018 >            new ThreadPoolExecutor(2, 10,
2019 >                                   keepAliveTime, MILLISECONDS,
2020 >                                   new ArrayBlockingQueue<Runnable>(10));
2021 >        final CountDownLatch threadStarted = new CountDownLatch(1);
2022          try {
2023 <            Thread.sleep(MEDIUM_DELAY_MS);
2024 <            assertTrue(tpe.getPoolSize() >= 1);
2023 >            p.allowCoreThreadTimeOut(false);
2024 >            p.execute(new CheckedRunnable() {
2025 >                public void realRun() throws InterruptedException {
2026 >                    threadStarted.countDown();
2027 >                    assertTrue(p.getPoolSize() >= 1);
2028 >                }});
2029 >            delay(2 * keepAliveTime);
2030 >            assertTrue(p.getPoolSize() >= 1);
2031          } finally {
2032 <            joinPool(tpe);
2032 >            joinPool(p);
2033          }
2034      }
2035  
# Line 1468 | Line 2039 | public class ThreadPoolExecutorTest exte
2039       */
2040      public void testRejectedRecycledTask() throws InterruptedException {
2041          final int nTasks = 1000;
2042 <        final AtomicInteger nRun = new AtomicInteger(0);
2042 >        final CountDownLatch done = new CountDownLatch(nTasks);
2043          final Runnable recycledTask = new Runnable() {
2044 <                public void run() {
2045 <                    nRun.getAndIncrement();
2046 <                } };
2044 >            public void run() {
2045 >                done.countDown();
2046 >            }};
2047          final ThreadPoolExecutor p =
2048 <            new ThreadPoolExecutor(1, 30, 60, TimeUnit.SECONDS,
2048 >            new ThreadPoolExecutor(1, 30,
2049 >                                   60, SECONDS,
2050                                     new ArrayBlockingQueue(30));
2051          try {
2052              for (int i = 0; i < nTasks; ++i) {
# Line 1483 | Line 2055 | public class ThreadPoolExecutorTest exte
2055                          p.execute(recycledTask);
2056                          break;
2057                      }
2058 <                    catch (RejectedExecutionException ignore) {
1487 <                    }
2058 >                    catch (RejectedExecutionException ignore) {}
2059                  }
2060              }
2061 <            Thread.sleep(5000); // enough time to run all tasks
2062 <            assertEquals(nRun.get(), nTasks);
2061 >            // enough time to run all tasks
2062 >            assertTrue(done.await(nTasks * SHORT_DELAY_MS, MILLISECONDS));
2063 >        } finally {
2064 >            joinPool(p);
2065 >        }
2066 >    }
2067 >
2068 >    /**
2069 >     * get(cancelled task) throws CancellationException
2070 >     */
2071 >    public void testGet_cancelled() throws Exception {
2072 >        final ExecutorService e =
2073 >            new ThreadPoolExecutor(1, 1,
2074 >                                   LONG_DELAY_MS, MILLISECONDS,
2075 >                                   new LinkedBlockingQueue<Runnable>());
2076 >        try {
2077 >            final CountDownLatch blockerStarted = new CountDownLatch(1);
2078 >            final CountDownLatch done = new CountDownLatch(1);
2079 >            final List<Future<?>> futures = new ArrayList<>();
2080 >            for (int i = 0; i < 2; i++) {
2081 >                Runnable r = new CheckedRunnable() { public void realRun()
2082 >                                                         throws Throwable {
2083 >                    blockerStarted.countDown();
2084 >                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
2085 >                }};
2086 >                futures.add(e.submit(r));
2087 >            }
2088 >            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2089 >            for (Future<?> future : futures) future.cancel(false);
2090 >            for (Future<?> future : futures) {
2091 >                try {
2092 >                    future.get();
2093 >                    shouldThrow();
2094 >                } catch (CancellationException success) {}
2095 >                try {
2096 >                    future.get(LONG_DELAY_MS, MILLISECONDS);
2097 >                    shouldThrow();
2098 >                } catch (CancellationException success) {}
2099 >                assertTrue(future.isCancelled());
2100 >                assertTrue(future.isDone());
2101 >            }
2102 >            done.countDown();
2103          } finally {
2104 <            p.shutdown();
2104 >            joinPool(e);
2105          }
2106      }
2107  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines