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.34 by jsr166, Wed Aug 25 00:07:03 2010 UTC vs.
Revision 1.94 by jsr166, Sun Oct 4 03:52:33 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 <        assertTrue(p1.isShutdown());
652 <        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  
395
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 408 | 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 418 | 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 428 | 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 438 | 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 448 | 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  
456
457
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 470 | 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 480 | 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 490 | 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 500 | 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 510 | 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 520 | 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  
529
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 542 | 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 552 | 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 562 | 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 572 | 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 582 | 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 592 | 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  
601
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 614 | 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 624 | 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 634 | 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 644 | 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
687 <     *  if saturated.
1043 >     * execute throws RejectedExecutionException if saturated.
1044       */
1045      public void testSaturatedExecute() {
1046 +        final ThreadPoolExecutor p =
1047 +            new ThreadPoolExecutor(1, 1,
1048 +                                   LONG_DELAY_MS, MILLISECONDS,
1049 +                                   new ArrayBlockingQueue<Runnable>(1));
1050 +        try (PoolCleaner cleaner = cleaner(p)) {
1051 +            final CountDownLatch done = new CountDownLatch(1);
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 +            done.countDown();
1066 +        }
1067 +    }
1068 +
1069 +    /**
1070 +     * submit(runnable) throws RejectedExecutionException if saturated.
1071 +     */
1072 +    public void testSaturatedSubmitRunnable() {
1073          ThreadPoolExecutor p =
1074              new ThreadPoolExecutor(1, 1,
1075                                     LONG_DELAY_MS, MILLISECONDS,
1076                                     new ArrayBlockingQueue<Runnable>(1));
1077 +        final CountDownLatch done = new CountDownLatch(1);
1078          try {
1079 +            Runnable task = new CheckedRunnable() {
1080 +                public void realRun() throws InterruptedException {
1081 +                    done.await();
1082 +                }};
1083              for (int i = 0; i < 2; ++i)
1084 <                p.execute(new MediumRunnable());
1084 >                p.submit(task);
1085              for (int i = 0; i < 2; ++i) {
1086                  try {
1087 <                    p.execute(new MediumRunnable());
1087 >                    p.execute(task);
1088                      shouldThrow();
1089                  } catch (RejectedExecutionException success) {}
1090 +                assertTrue(p.getTaskCount() <= 2);
1091              }
1092          } finally {
1093 +            done.countDown();
1094              joinPool(p);
1095          }
1096      }
1097  
1098      /**
1099 <     *  executor using CallerRunsPolicy runs task if saturated.
1099 >     * submit(callable) throws RejectedExecutionException if saturated.
1100       */
1101 <    public void testSaturatedExecute2() {
1102 <        RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1103 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1101 >    public void testSaturatedSubmitCallable() {
1102 >        ThreadPoolExecutor p =
1103 >            new ThreadPoolExecutor(1, 1,
1104 >                                   LONG_DELAY_MS, MILLISECONDS,
1105 >                                   new ArrayBlockingQueue<Runnable>(1));
1106 >        final CountDownLatch done = new CountDownLatch(1);
1107          try {
1108 <
1109 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1110 <            for (int i = 0; i < 5; ++i) {
1111 <                tasks[i] = new TrackedNoOpRunnable();
1112 <            }
1113 <            TrackedLongRunnable mr = new TrackedLongRunnable();
1114 <            p.execute(mr);
1115 <            for (int i = 0; i < 5; ++i) {
1116 <                p.execute(tasks[i]);
1117 <            }
1118 <            for (int i = 1; i < 5; ++i) {
1119 <                assertTrue(tasks[i].done);
1108 >            Runnable task = new CheckedRunnable() {
1109 >                public void realRun() throws InterruptedException {
1110 >                    done.await();
1111 >                }};
1112 >            for (int i = 0; i < 2; ++i)
1113 >                p.submit(Executors.callable(task));
1114 >            for (int i = 0; i < 2; ++i) {
1115 >                try {
1116 >                    p.execute(task);
1117 >                    shouldThrow();
1118 >                } catch (RejectedExecutionException success) {}
1119 >                assertTrue(p.getTaskCount() <= 2);
1120              }
728            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1121          } finally {
1122 +            done.countDown();
1123              joinPool(p);
1124          }
1125      }
1126  
1127      /**
1128 <     *  executor using DiscardPolicy drops task if saturated.
1128 >     * executor using CallerRunsPolicy runs task if saturated.
1129       */
1130 <    public void testSaturatedExecute3() {
1131 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1132 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1133 <        try {
1134 <
1130 >    public void testSaturatedExecute2() {
1131 >        final ThreadPoolExecutor p =
1132 >            new ThreadPoolExecutor(1, 1,
1133 >                                   LONG_DELAY_MS,
1134 >                                   MILLISECONDS,
1135 >                                   new ArrayBlockingQueue<Runnable>(1),
1136 >                                   new ThreadPoolExecutor.CallerRunsPolicy());
1137 >        try (PoolCleaner cleaner = cleaner(p)) {
1138 >            final CountDownLatch done = new CountDownLatch(1);
1139 >            Runnable blocker = new CheckedRunnable() {
1140 >                public void realRun() throws InterruptedException {
1141 >                    done.await();
1142 >                }};
1143 >            p.execute(blocker);
1144              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1145 <            for (int i = 0; i < 5; ++i) {
1145 >            for (int i = 0; i < tasks.length; i++)
1146                  tasks[i] = new TrackedNoOpRunnable();
1147 <            }
746 <            p.execute(new TrackedLongRunnable());
747 <            for (int i = 0; i < 5; ++i) {
1147 >            for (int i = 0; i < tasks.length; i++)
1148                  p.execute(tasks[i]);
1149 <            }
1150 <            for (int i = 0; i < 5; ++i) {
1149 >            for (int i = 1; i < tasks.length; i++)
1150 >                assertTrue(tasks[i].done);
1151 >            assertFalse(tasks[0].done); // waiting in queue
1152 >            done.countDown();
1153 >        }
1154 >    }
1155 >
1156 >    /**
1157 >     * executor using DiscardPolicy drops task if saturated.
1158 >     */
1159 >    public void testSaturatedExecute3() {
1160 >        final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1161 >        for (int i = 0; i < tasks.length; ++i)
1162 >            tasks[i] = new TrackedNoOpRunnable();
1163 >        final ThreadPoolExecutor p =
1164 >            new ThreadPoolExecutor(1, 1,
1165 >                          LONG_DELAY_MS, MILLISECONDS,
1166 >                          new ArrayBlockingQueue<Runnable>(1),
1167 >                          new ThreadPoolExecutor.DiscardPolicy());
1168 >        try (PoolCleaner cleaner = cleaner(p)) {
1169 >            final CountDownLatch done = new CountDownLatch(1);
1170 >            p.execute(awaiter(done));
1171 >
1172 >            for (TrackedNoOpRunnable task : tasks)
1173 >                p.execute(task);
1174 >            for (int i = 1; i < tasks.length; i++)
1175                  assertFalse(tasks[i].done);
1176 <            }
753 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
754 <        } finally {
755 <            joinPool(p);
1176 >            done.countDown();
1177          }
1178 +        for (int i = 1; i < tasks.length; i++)
1179 +            assertFalse(tasks[i].done);
1180 +        assertTrue(tasks[0].done); // was waiting in queue
1181      }
1182  
1183      /**
1184 <     *  executor using DiscardOldestPolicy drops oldest task if saturated.
1184 >     * executor using DiscardOldestPolicy drops oldest task if saturated.
1185       */
1186      public void testSaturatedExecute4() {
1187 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1188 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1189 <        try {
1190 <            p.execute(new TrackedLongRunnable());
1191 <            TrackedLongRunnable r2 = new TrackedLongRunnable();
1187 >        final CountDownLatch done = new CountDownLatch(1);
1188 >        LatchAwaiter r1 = awaiter(done);
1189 >        LatchAwaiter r2 = awaiter(done);
1190 >        LatchAwaiter r3 = awaiter(done);
1191 >        final ThreadPoolExecutor p =
1192 >            new ThreadPoolExecutor(1, 1,
1193 >                                   LONG_DELAY_MS, MILLISECONDS,
1194 >                                   new ArrayBlockingQueue<Runnable>(1),
1195 >                                   new ThreadPoolExecutor.DiscardOldestPolicy());
1196 >        try (PoolCleaner cleaner = cleaner(p)) {
1197 >            assertEquals(LatchAwaiter.NEW, r1.state);
1198 >            assertEquals(LatchAwaiter.NEW, r2.state);
1199 >            assertEquals(LatchAwaiter.NEW, r3.state);
1200 >            p.execute(r1);
1201              p.execute(r2);
1202              assertTrue(p.getQueue().contains(r2));
770            TrackedNoOpRunnable r3 = new TrackedNoOpRunnable();
1203              p.execute(r3);
1204              assertFalse(p.getQueue().contains(r2));
1205              assertTrue(p.getQueue().contains(r3));
1206 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
775 <        } finally {
776 <            joinPool(p);
1206 >            done.countDown();
1207          }
1208 +        assertEquals(LatchAwaiter.DONE, r1.state);
1209 +        assertEquals(LatchAwaiter.NEW, r2.state);
1210 +        assertEquals(LatchAwaiter.DONE, r3.state);
1211      }
1212  
1213      /**
1214 <     *  execute throws RejectedExecutionException if shutdown
1214 >     * execute throws RejectedExecutionException if shutdown
1215       */
1216      public void testRejectedExecutionExceptionOnShutdown() {
1217 <        ThreadPoolExecutor tpe =
1218 <            new ThreadPoolExecutor(1,1,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1219 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1220 <        try {
1221 <            tpe.execute(new NoOpRunnable());
1222 <            shouldThrow();
1223 <        } catch (RejectedExecutionException success) {}
1224 <
1225 <        joinPool(tpe);
1217 >        ThreadPoolExecutor p =
1218 >            new ThreadPoolExecutor(1, 1,
1219 >                                   LONG_DELAY_MS, MILLISECONDS,
1220 >                                   new ArrayBlockingQueue<Runnable>(1));
1221 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1222 >        try (PoolCleaner cleaner = cleaner(p)) {
1223 >            try {
1224 >                p.execute(new NoOpRunnable());
1225 >                shouldThrow();
1226 >            } catch (RejectedExecutionException success) {}
1227 >        }
1228      }
1229  
1230      /**
1231 <     *  execute using CallerRunsPolicy drops task on shutdown
1231 >     * execute using CallerRunsPolicy drops task on shutdown
1232       */
1233      public void testCallerRunsOnShutdown() {
1234          RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1235 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1235 >        final ThreadPoolExecutor p =
1236 >            new ThreadPoolExecutor(1, 1,
1237 >                                   LONG_DELAY_MS, MILLISECONDS,
1238 >                                   new ArrayBlockingQueue<Runnable>(1), h);
1239  
1240          try { p.shutdown(); } catch (SecurityException ok) { return; }
1241 <        try {
1241 >        try (PoolCleaner cleaner = cleaner(p)) {
1242              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1243              p.execute(r);
1244              assertFalse(r.done);
807        } finally {
808            joinPool(p);
1245          }
1246      }
1247  
1248      /**
1249 <     *  execute using DiscardPolicy drops task on shutdown
1249 >     * execute using DiscardPolicy drops task on shutdown
1250       */
1251      public void testDiscardOnShutdown() {
1252          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1253 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1253 >        ThreadPoolExecutor p =
1254 >            new ThreadPoolExecutor(1, 1,
1255 >                                   LONG_DELAY_MS, MILLISECONDS,
1256 >                                   new ArrayBlockingQueue<Runnable>(1),
1257 >                                   h);
1258  
1259          try { p.shutdown(); } catch (SecurityException ok) { return; }
1260          try {
# Line 826 | Line 1266 | public class ThreadPoolExecutorTest exte
1266          }
1267      }
1268  
829
1269      /**
1270 <     *  execute using DiscardOldestPolicy drops task on shutdown
1270 >     * execute using DiscardOldestPolicy drops task on shutdown
1271       */
1272      public void testDiscardOldestOnShutdown() {
1273          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1274 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1274 >        ThreadPoolExecutor p =
1275 >            new ThreadPoolExecutor(1, 1,
1276 >                                   LONG_DELAY_MS, MILLISECONDS,
1277 >                                   new ArrayBlockingQueue<Runnable>(1),
1278 >                                   h);
1279  
1280          try { p.shutdown(); } catch (SecurityException ok) { return; }
1281          try {
# Line 844 | Line 1287 | public class ThreadPoolExecutorTest exte
1287          }
1288      }
1289  
847
1290      /**
1291       * execute(null) throws NPE
1292       */
1293      public void testExecuteNull() {
1294 <        ThreadPoolExecutor tpe = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1294 >        ThreadPoolExecutor p =
1295 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1296 >                                   new ArrayBlockingQueue<Runnable>(10));
1297          try {
1298 <            tpe.execute(null);
1298 >            p.execute(null);
1299              shouldThrow();
1300          } catch (NullPointerException success) {}
1301  
1302 <        joinPool(tpe);
1302 >        joinPool(p);
1303      }
1304  
1305      /**
1306       * setCorePoolSize of negative value throws IllegalArgumentException
1307       */
1308      public void testCorePoolSizeIllegalArgumentException() {
1309 <        ThreadPoolExecutor tpe =
1309 >        ThreadPoolExecutor p =
1310              new ThreadPoolExecutor(1, 2,
1311                                     LONG_DELAY_MS, MILLISECONDS,
1312                                     new ArrayBlockingQueue<Runnable>(10));
1313          try {
1314 <            tpe.setCorePoolSize(-1);
1314 >            p.setCorePoolSize(-1);
1315              shouldThrow();
1316          } catch (IllegalArgumentException success) {
1317          } finally {
1318 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1318 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1319          }
1320 <        joinPool(tpe);
1320 >        joinPool(p);
1321      }
1322  
1323      /**
1324 <     *  setMaximumPoolSize(int) throws IllegalArgumentException if
1325 <     *  given a value less the core pool size
1324 >     * setMaximumPoolSize(int) throws IllegalArgumentException if
1325 >     * given a value less the core pool size
1326       */
1327      public void testMaximumPoolSizeIllegalArgumentException() {
1328 <        ThreadPoolExecutor tpe =
1328 >        ThreadPoolExecutor p =
1329              new ThreadPoolExecutor(2, 3,
1330                                     LONG_DELAY_MS, MILLISECONDS,
1331                                     new ArrayBlockingQueue<Runnable>(10));
1332          try {
1333 <            tpe.setMaximumPoolSize(1);
1333 >            p.setMaximumPoolSize(1);
1334              shouldThrow();
1335          } catch (IllegalArgumentException success) {
1336          } finally {
1337 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1337 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1338          }
1339 <        joinPool(tpe);
1339 >        joinPool(p);
1340      }
1341  
1342      /**
1343 <     *  setMaximumPoolSize throws IllegalArgumentException
1344 <     *  if given a negative value
1343 >     * setMaximumPoolSize throws IllegalArgumentException
1344 >     * if given a negative value
1345       */
1346      public void testMaximumPoolSizeIllegalArgumentException2() {
1347 <        ThreadPoolExecutor tpe =
1347 >        ThreadPoolExecutor p =
1348              new ThreadPoolExecutor(2, 3,
1349                                     LONG_DELAY_MS, MILLISECONDS,
1350                                     new ArrayBlockingQueue<Runnable>(10));
1351          try {
1352 <            tpe.setMaximumPoolSize(-1);
1352 >            p.setMaximumPoolSize(-1);
1353              shouldThrow();
1354          } catch (IllegalArgumentException success) {
1355          } finally {
1356 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1356 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1357          }
1358 <        joinPool(tpe);
1358 >        joinPool(p);
1359      }
1360  
1361 +    /**
1362 +     * Configuration changes that allow core pool size greater than
1363 +     * max pool size result in IllegalArgumentException.
1364 +     */
1365 +    public void testPoolSizeInvariants() {
1366 +        ThreadPoolExecutor p =
1367 +            new ThreadPoolExecutor(1, 1,
1368 +                                   LONG_DELAY_MS, MILLISECONDS,
1369 +                                   new ArrayBlockingQueue<Runnable>(10));
1370 +        for (int s = 1; s < 5; s++) {
1371 +            p.setMaximumPoolSize(s);
1372 +            p.setCorePoolSize(s);
1373 +            try {
1374 +                p.setMaximumPoolSize(s - 1);
1375 +                shouldThrow();
1376 +            } catch (IllegalArgumentException success) {}
1377 +            assertEquals(s, p.getCorePoolSize());
1378 +            assertEquals(s, p.getMaximumPoolSize());
1379 +            try {
1380 +                p.setCorePoolSize(s + 1);
1381 +                shouldThrow();
1382 +            } catch (IllegalArgumentException success) {}
1383 +            assertEquals(s, p.getCorePoolSize());
1384 +            assertEquals(s, p.getMaximumPoolSize());
1385 +        }
1386 +        joinPool(p);
1387 +    }
1388  
1389      /**
1390 <     *  setKeepAliveTime  throws IllegalArgumentException
1391 <     *  when given a negative value
1390 >     * setKeepAliveTime throws IllegalArgumentException
1391 >     * when given a negative value
1392       */
1393      public void testKeepAliveTimeIllegalArgumentException() {
1394 <        ThreadPoolExecutor tpe =
1394 >        ThreadPoolExecutor p =
1395              new ThreadPoolExecutor(2, 3,
1396                                     LONG_DELAY_MS, MILLISECONDS,
1397                                     new ArrayBlockingQueue<Runnable>(10));
1398          try {
1399 <            tpe.setKeepAliveTime(-1,MILLISECONDS);
1399 >            p.setKeepAliveTime(-1,MILLISECONDS);
1400              shouldThrow();
1401          } catch (IllegalArgumentException success) {
1402          } finally {
1403 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1403 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1404          }
1405 <        joinPool(tpe);
1405 >        joinPool(p);
1406      }
1407  
1408      /**
1409       * terminated() is called on termination
1410       */
1411      public void testTerminated() {
1412 <        ExtendedTPE tpe = new ExtendedTPE();
1413 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1414 <        assertTrue(tpe.terminatedCalled);
1415 <        joinPool(tpe);
1412 >        ExtendedTPE p = new ExtendedTPE();
1413 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1414 >        assertTrue(p.terminatedCalled());
1415 >        joinPool(p);
1416      }
1417  
1418      /**
1419       * beforeExecute and afterExecute are called when executing task
1420       */
1421      public void testBeforeAfter() throws InterruptedException {
1422 <        ExtendedTPE tpe = new ExtendedTPE();
1422 >        ExtendedTPE p = new ExtendedTPE();
1423          try {
1424 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1425 <            tpe.execute(r);
1426 <            Thread.sleep(SHORT_DELAY_MS);
1427 <            assertTrue(r.done);
1428 <            assertTrue(tpe.beforeCalled);
1429 <            assertTrue(tpe.afterCalled);
1430 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1424 >            final CountDownLatch done = new CountDownLatch(1);
1425 >            p.execute(new CheckedRunnable() {
1426 >                public void realRun() {
1427 >                    done.countDown();
1428 >                }});
1429 >            await(p.afterCalled);
1430 >            assertEquals(0, done.getCount());
1431 >            assertTrue(p.afterCalled());
1432 >            assertTrue(p.beforeCalled());
1433 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1434          } finally {
1435 <            joinPool(tpe);
1435 >            joinPool(p);
1436          }
1437      }
1438  
# Line 966 | Line 1440 | public class ThreadPoolExecutorTest exte
1440       * completed submit of callable returns result
1441       */
1442      public void testSubmitCallable() throws Exception {
1443 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1443 >        ExecutorService e =
1444 >            new ThreadPoolExecutor(2, 2,
1445 >                                   LONG_DELAY_MS, MILLISECONDS,
1446 >                                   new ArrayBlockingQueue<Runnable>(10));
1447          try {
1448              Future<String> future = e.submit(new StringTask());
1449              String result = future.get();
# Line 980 | Line 1457 | public class ThreadPoolExecutorTest exte
1457       * completed submit of runnable returns successfully
1458       */
1459      public void testSubmitRunnable() throws Exception {
1460 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1460 >        ExecutorService e =
1461 >            new ThreadPoolExecutor(2, 2,
1462 >                                   LONG_DELAY_MS, MILLISECONDS,
1463 >                                   new ArrayBlockingQueue<Runnable>(10));
1464          try {
1465              Future<?> future = e.submit(new NoOpRunnable());
1466              future.get();
# Line 994 | Line 1474 | public class ThreadPoolExecutorTest exte
1474       * completed submit of (runnable, result) returns result
1475       */
1476      public void testSubmitRunnable2() throws Exception {
1477 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1477 >        ExecutorService e =
1478 >            new ThreadPoolExecutor(2, 2,
1479 >                                   LONG_DELAY_MS, MILLISECONDS,
1480 >                                   new ArrayBlockingQueue<Runnable>(10));
1481          try {
1482              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1483              String result = future.get();
# Line 1004 | Line 1487 | public class ThreadPoolExecutorTest exte
1487          }
1488      }
1489  
1007
1490      /**
1491       * invokeAny(null) throws NPE
1492       */
1493      public void testInvokeAny1() throws Exception {
1494 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1494 >        ExecutorService e =
1495 >            new ThreadPoolExecutor(2, 2,
1496 >                                   LONG_DELAY_MS, MILLISECONDS,
1497 >                                   new ArrayBlockingQueue<Runnable>(10));
1498          try {
1499              e.invokeAny(null);
1500              shouldThrow();
# Line 1023 | Line 1508 | public class ThreadPoolExecutorTest exte
1508       * invokeAny(empty collection) throws IAE
1509       */
1510      public void testInvokeAny2() throws Exception {
1511 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1511 >        ExecutorService e =
1512 >            new ThreadPoolExecutor(2, 2,
1513 >                                   LONG_DELAY_MS, MILLISECONDS,
1514 >                                   new ArrayBlockingQueue<Runnable>(10));
1515          try {
1516              e.invokeAny(new ArrayList<Callable<String>>());
1517              shouldThrow();
# Line 1037 | Line 1525 | public class ThreadPoolExecutorTest exte
1525       * invokeAny(c) throws NPE if c has null elements
1526       */
1527      public void testInvokeAny3() throws Exception {
1528 <        CountDownLatch latch = new CountDownLatch(1);
1529 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1528 >        final CountDownLatch latch = new CountDownLatch(1);
1529 >        final ExecutorService e =
1530 >            new ThreadPoolExecutor(2, 2,
1531 >                                   LONG_DELAY_MS, MILLISECONDS,
1532 >                                   new ArrayBlockingQueue<Runnable>(10));
1533          List<Callable<String>> l = new ArrayList<Callable<String>>();
1534          l.add(latchAwaitingStringTask(latch));
1535          l.add(null);
# Line 1056 | Line 1547 | public class ThreadPoolExecutorTest exte
1547       * invokeAny(c) throws ExecutionException if no task completes
1548       */
1549      public void testInvokeAny4() throws Exception {
1550 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1550 >        ExecutorService e =
1551 >            new ThreadPoolExecutor(2, 2,
1552 >                                   LONG_DELAY_MS, MILLISECONDS,
1553 >                                   new ArrayBlockingQueue<Runnable>(10));
1554          List<Callable<String>> l = new ArrayList<Callable<String>>();
1555          l.add(new NPETask());
1556          try {
# Line 1073 | Line 1567 | public class ThreadPoolExecutorTest exte
1567       * invokeAny(c) returns result of some task
1568       */
1569      public void testInvokeAny5() throws Exception {
1570 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1570 >        ExecutorService e =
1571 >            new ThreadPoolExecutor(2, 2,
1572 >                                   LONG_DELAY_MS, MILLISECONDS,
1573 >                                   new ArrayBlockingQueue<Runnable>(10));
1574          try {
1575              List<Callable<String>> l = new ArrayList<Callable<String>>();
1576              l.add(new StringTask());
# Line 1089 | Line 1586 | public class ThreadPoolExecutorTest exte
1586       * invokeAll(null) throws NPE
1587       */
1588      public void testInvokeAll1() throws Exception {
1589 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1589 >        ExecutorService e =
1590 >            new ThreadPoolExecutor(2, 2,
1591 >                                   LONG_DELAY_MS, MILLISECONDS,
1592 >                                   new ArrayBlockingQueue<Runnable>(10));
1593          try {
1594              e.invokeAll(null);
1595              shouldThrow();
# Line 1103 | Line 1603 | public class ThreadPoolExecutorTest exte
1603       * invokeAll(empty collection) returns empty collection
1604       */
1605      public void testInvokeAll2() throws InterruptedException {
1606 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1606 >        ExecutorService e =
1607 >            new ThreadPoolExecutor(2, 2,
1608 >                                   LONG_DELAY_MS, MILLISECONDS,
1609 >                                   new ArrayBlockingQueue<Runnable>(10));
1610          try {
1611              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1612              assertTrue(r.isEmpty());
# Line 1116 | Line 1619 | public class ThreadPoolExecutorTest exte
1619       * invokeAll(c) throws NPE if c has null elements
1620       */
1621      public void testInvokeAll3() throws Exception {
1622 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1622 >        ExecutorService e =
1623 >            new ThreadPoolExecutor(2, 2,
1624 >                                   LONG_DELAY_MS, MILLISECONDS,
1625 >                                   new ArrayBlockingQueue<Runnable>(10));
1626          List<Callable<String>> l = new ArrayList<Callable<String>>();
1627          l.add(new StringTask());
1628          l.add(null);
# Line 1133 | Line 1639 | public class ThreadPoolExecutorTest exte
1639       * get of element of invokeAll(c) throws exception on failed task
1640       */
1641      public void testInvokeAll4() throws Exception {
1642 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1642 >        ExecutorService e =
1643 >            new ThreadPoolExecutor(2, 2,
1644 >                                   LONG_DELAY_MS, MILLISECONDS,
1645 >                                   new ArrayBlockingQueue<Runnable>(10));
1646          try {
1647              List<Callable<String>> l = new ArrayList<Callable<String>>();
1648              l.add(new NPETask());
# Line 1154 | Line 1663 | public class ThreadPoolExecutorTest exte
1663       * invokeAll(c) returns results of all completed tasks
1664       */
1665      public void testInvokeAll5() throws Exception {
1666 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1666 >        ExecutorService e =
1667 >            new ThreadPoolExecutor(2, 2,
1668 >                                   LONG_DELAY_MS, MILLISECONDS,
1669 >                                   new ArrayBlockingQueue<Runnable>(10));
1670          try {
1671              List<Callable<String>> l = new ArrayList<Callable<String>>();
1672              l.add(new StringTask());
# Line 1168 | Line 1680 | public class ThreadPoolExecutorTest exte
1680          }
1681      }
1682  
1171
1172
1683      /**
1684       * timed invokeAny(null) throws NPE
1685       */
1686      public void testTimedInvokeAny1() throws Exception {
1687 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1687 >        ExecutorService e =
1688 >            new ThreadPoolExecutor(2, 2,
1689 >                                   LONG_DELAY_MS, MILLISECONDS,
1690 >                                   new ArrayBlockingQueue<Runnable>(10));
1691          try {
1692              e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1693              shouldThrow();
# Line 1188 | Line 1701 | public class ThreadPoolExecutorTest exte
1701       * timed invokeAny(,,null) throws NPE
1702       */
1703      public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1704 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1704 >        ExecutorService e =
1705 >            new ThreadPoolExecutor(2, 2,
1706 >                                   LONG_DELAY_MS, MILLISECONDS,
1707 >                                   new ArrayBlockingQueue<Runnable>(10));
1708          List<Callable<String>> l = new ArrayList<Callable<String>>();
1709          l.add(new StringTask());
1710          try {
# Line 1204 | Line 1720 | public class ThreadPoolExecutorTest exte
1720       * timed invokeAny(empty collection) throws IAE
1721       */
1722      public void testTimedInvokeAny2() throws Exception {
1723 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1723 >        ExecutorService e =
1724 >            new ThreadPoolExecutor(2, 2,
1725 >                                   LONG_DELAY_MS, MILLISECONDS,
1726 >                                   new ArrayBlockingQueue<Runnable>(10));
1727          try {
1728              e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1729              shouldThrow();
# Line 1218 | Line 1737 | public class ThreadPoolExecutorTest exte
1737       * timed invokeAny(c) throws NPE if c has null elements
1738       */
1739      public void testTimedInvokeAny3() throws Exception {
1740 <        CountDownLatch latch = new CountDownLatch(1);
1741 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1740 >        final CountDownLatch latch = new CountDownLatch(1);
1741 >        final ExecutorService e =
1742 >            new ThreadPoolExecutor(2, 2,
1743 >                                   LONG_DELAY_MS, MILLISECONDS,
1744 >                                   new ArrayBlockingQueue<Runnable>(10));
1745          List<Callable<String>> l = new ArrayList<Callable<String>>();
1746          l.add(latchAwaitingStringTask(latch));
1747          l.add(null);
# Line 1237 | Line 1759 | public class ThreadPoolExecutorTest exte
1759       * timed invokeAny(c) throws ExecutionException if no task completes
1760       */
1761      public void testTimedInvokeAny4() throws Exception {
1762 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1762 >        ExecutorService e =
1763 >            new ThreadPoolExecutor(2, 2,
1764 >                                   LONG_DELAY_MS, MILLISECONDS,
1765 >                                   new ArrayBlockingQueue<Runnable>(10));
1766          List<Callable<String>> l = new ArrayList<Callable<String>>();
1767          l.add(new NPETask());
1768          try {
# Line 1254 | Line 1779 | public class ThreadPoolExecutorTest exte
1779       * timed invokeAny(c) returns result of some task
1780       */
1781      public void testTimedInvokeAny5() throws Exception {
1782 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1782 >        ExecutorService e =
1783 >            new ThreadPoolExecutor(2, 2,
1784 >                                   LONG_DELAY_MS, MILLISECONDS,
1785 >                                   new ArrayBlockingQueue<Runnable>(10));
1786          try {
1787              List<Callable<String>> l = new ArrayList<Callable<String>>();
1788              l.add(new StringTask());
# Line 1270 | Line 1798 | public class ThreadPoolExecutorTest exte
1798       * timed invokeAll(null) throws NPE
1799       */
1800      public void testTimedInvokeAll1() throws Exception {
1801 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1801 >        ExecutorService e =
1802 >            new ThreadPoolExecutor(2, 2,
1803 >                                   LONG_DELAY_MS, MILLISECONDS,
1804 >                                   new ArrayBlockingQueue<Runnable>(10));
1805          try {
1806              e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1807              shouldThrow();
# Line 1284 | Line 1815 | public class ThreadPoolExecutorTest exte
1815       * timed invokeAll(,,null) throws NPE
1816       */
1817      public void testTimedInvokeAllNullTimeUnit() throws Exception {
1818 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1818 >        ExecutorService e =
1819 >            new ThreadPoolExecutor(2, 2,
1820 >                                   LONG_DELAY_MS, MILLISECONDS,
1821 >                                   new ArrayBlockingQueue<Runnable>(10));
1822          List<Callable<String>> l = new ArrayList<Callable<String>>();
1823          l.add(new StringTask());
1824          try {
# Line 1300 | Line 1834 | public class ThreadPoolExecutorTest exte
1834       * timed invokeAll(empty collection) returns empty collection
1835       */
1836      public void testTimedInvokeAll2() throws InterruptedException {
1837 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1837 >        ExecutorService e =
1838 >            new ThreadPoolExecutor(2, 2,
1839 >                                   LONG_DELAY_MS, MILLISECONDS,
1840 >                                   new ArrayBlockingQueue<Runnable>(10));
1841          try {
1842              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1843              assertTrue(r.isEmpty());
# Line 1313 | Line 1850 | public class ThreadPoolExecutorTest exte
1850       * timed invokeAll(c) throws NPE if c has null elements
1851       */
1852      public void testTimedInvokeAll3() throws Exception {
1853 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1853 >        ExecutorService e =
1854 >            new ThreadPoolExecutor(2, 2,
1855 >                                   LONG_DELAY_MS, MILLISECONDS,
1856 >                                   new ArrayBlockingQueue<Runnable>(10));
1857          List<Callable<String>> l = new ArrayList<Callable<String>>();
1858          l.add(new StringTask());
1859          l.add(null);
# Line 1330 | Line 1870 | public class ThreadPoolExecutorTest exte
1870       * get of element of invokeAll(c) throws exception on failed task
1871       */
1872      public void testTimedInvokeAll4() throws Exception {
1873 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1873 >        ExecutorService e =
1874 >            new ThreadPoolExecutor(2, 2,
1875 >                                   LONG_DELAY_MS, MILLISECONDS,
1876 >                                   new ArrayBlockingQueue<Runnable>(10));
1877          List<Callable<String>> l = new ArrayList<Callable<String>>();
1878          l.add(new NPETask());
1879          List<Future<String>> futures =
# Line 1350 | Line 1893 | public class ThreadPoolExecutorTest exte
1893       * timed invokeAll(c) returns results of all completed tasks
1894       */
1895      public void testTimedInvokeAll5() throws Exception {
1896 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1896 >        ExecutorService e =
1897 >            new ThreadPoolExecutor(2, 2,
1898 >                                   LONG_DELAY_MS, MILLISECONDS,
1899 >                                   new ArrayBlockingQueue<Runnable>(10));
1900          try {
1901              List<Callable<String>> l = new ArrayList<Callable<String>>();
1902              l.add(new StringTask());
1903              l.add(new StringTask());
1904              List<Future<String>> futures =
1905 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1905 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1906              assertEquals(2, futures.size());
1907              for (Future<String> future : futures)
1908                  assertSame(TEST_STRING, future.get());
# Line 1369 | Line 1915 | public class ThreadPoolExecutorTest exte
1915       * timed invokeAll(c) cancels tasks not completed by timeout
1916       */
1917      public void testTimedInvokeAll6() throws Exception {
1918 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1918 >        ExecutorService e =
1919 >            new ThreadPoolExecutor(2, 2,
1920 >                                   LONG_DELAY_MS, MILLISECONDS,
1921 >                                   new ArrayBlockingQueue<Runnable>(10));
1922          try {
1923 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1924 <            l.add(new StringTask());
1925 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1926 <            l.add(new StringTask());
1927 <            List<Future<String>> futures =
1928 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1929 <            assertEquals(3, futures.size());
1930 <            Iterator<Future<String>> it = futures.iterator();
1931 <            Future<String> f1 = it.next();
1932 <            Future<String> f2 = it.next();
1933 <            Future<String> f3 = it.next();
1934 <            assertTrue(f1.isDone());
1935 <            assertTrue(f2.isDone());
1936 <            assertTrue(f3.isDone());
1937 <            assertFalse(f1.isCancelled());
1938 <            assertTrue(f2.isCancelled());
1923 >            for (long timeout = timeoutMillis();;) {
1924 >                List<Callable<String>> tasks = new ArrayList<>();
1925 >                tasks.add(new StringTask("0"));
1926 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1927 >                tasks.add(new StringTask("2"));
1928 >                long startTime = System.nanoTime();
1929 >                List<Future<String>> futures =
1930 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1931 >                assertEquals(tasks.size(), futures.size());
1932 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1933 >                for (Future future : futures)
1934 >                    assertTrue(future.isDone());
1935 >                assertTrue(futures.get(1).isCancelled());
1936 >                try {
1937 >                    assertEquals("0", futures.get(0).get());
1938 >                    assertEquals("2", futures.get(2).get());
1939 >                    break;
1940 >                } catch (CancellationException retryWithLongerTimeout) {
1941 >                    timeout *= 2;
1942 >                    if (timeout >= LONG_DELAY_MS / 2)
1943 >                        fail("expected exactly one task to be cancelled");
1944 >                }
1945 >            }
1946          } finally {
1947              joinPool(e);
1948          }
# Line 1397 | Line 1953 | public class ThreadPoolExecutorTest exte
1953       * thread factory fails to create more
1954       */
1955      public void testFailingThreadFactory() throws InterruptedException {
1956 <        ExecutorService e = new ThreadPoolExecutor(100, 100, LONG_DELAY_MS, MILLISECONDS, new LinkedBlockingQueue<Runnable>(), new FailingThreadFactory());
1956 >        final ExecutorService e =
1957 >            new ThreadPoolExecutor(100, 100,
1958 >                                   LONG_DELAY_MS, MILLISECONDS,
1959 >                                   new LinkedBlockingQueue<Runnable>(),
1960 >                                   new FailingThreadFactory());
1961          try {
1962 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1963 <            for (int k = 0; k < 100; ++k) {
1964 <                e.execute(new NoOpRunnable());
1965 <            }
1966 <            Thread.sleep(LONG_DELAY_MS);
1962 >            final int TASKS = 100;
1963 >            final CountDownLatch done = new CountDownLatch(TASKS);
1964 >            for (int k = 0; k < TASKS; ++k)
1965 >                e.execute(new CheckedRunnable() {
1966 >                    public void realRun() {
1967 >                        done.countDown();
1968 >                    }});
1969 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1970          } finally {
1971              joinPool(e);
1972          }
# Line 1413 | Line 1976 | public class ThreadPoolExecutorTest exte
1976       * allowsCoreThreadTimeOut is by default false.
1977       */
1978      public void testAllowsCoreThreadTimeOut() {
1979 <        ThreadPoolExecutor tpe = new ThreadPoolExecutor(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1980 <        assertFalse(tpe.allowsCoreThreadTimeOut());
1981 <        joinPool(tpe);
1979 >        final ThreadPoolExecutor p =
1980 >            new ThreadPoolExecutor(2, 2,
1981 >                                   1000, MILLISECONDS,
1982 >                                   new ArrayBlockingQueue<Runnable>(10));
1983 >        assertFalse(p.allowsCoreThreadTimeOut());
1984 >        joinPool(p);
1985      }
1986  
1987      /**
1988       * allowCoreThreadTimeOut(true) causes idle threads to time out
1989       */
1990 <    public void testAllowCoreThreadTimeOut_true() throws InterruptedException {
1991 <        ThreadPoolExecutor tpe = new ThreadPoolExecutor(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1992 <        tpe.allowCoreThreadTimeOut(true);
1993 <        tpe.execute(new NoOpRunnable());
1990 >    public void testAllowCoreThreadTimeOut_true() throws Exception {
1991 >        long keepAliveTime = timeoutMillis();
1992 >        final ThreadPoolExecutor p =
1993 >            new ThreadPoolExecutor(2, 10,
1994 >                                   keepAliveTime, MILLISECONDS,
1995 >                                   new ArrayBlockingQueue<Runnable>(10));
1996 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1997          try {
1998 <            Thread.sleep(MEDIUM_DELAY_MS);
1999 <            assertEquals(0, tpe.getPoolSize());
1998 >            p.allowCoreThreadTimeOut(true);
1999 >            p.execute(new CheckedRunnable() {
2000 >                public void realRun() {
2001 >                    threadStarted.countDown();
2002 >                    assertEquals(1, p.getPoolSize());
2003 >                }});
2004 >            await(threadStarted);
2005 >            delay(keepAliveTime);
2006 >            long startTime = System.nanoTime();
2007 >            while (p.getPoolSize() > 0
2008 >                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
2009 >                Thread.yield();
2010 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
2011 >            assertEquals(0, p.getPoolSize());
2012          } finally {
2013 <            joinPool(tpe);
2013 >            joinPool(p);
2014          }
2015      }
2016  
2017      /**
2018       * allowCoreThreadTimeOut(false) causes idle threads not to time out
2019       */
2020 <    public void testAllowCoreThreadTimeOut_false() throws InterruptedException {
2021 <        ThreadPoolExecutor tpe = new ThreadPoolExecutor(2, 10, 10, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
2022 <        tpe.allowCoreThreadTimeOut(false);
2023 <        tpe.execute(new NoOpRunnable());
2020 >    public void testAllowCoreThreadTimeOut_false() throws Exception {
2021 >        long keepAliveTime = timeoutMillis();
2022 >        final ThreadPoolExecutor p =
2023 >            new ThreadPoolExecutor(2, 10,
2024 >                                   keepAliveTime, MILLISECONDS,
2025 >                                   new ArrayBlockingQueue<Runnable>(10));
2026 >        final CountDownLatch threadStarted = new CountDownLatch(1);
2027          try {
2028 <            Thread.sleep(MEDIUM_DELAY_MS);
2029 <            assertTrue(tpe.getPoolSize() >= 1);
2028 >            p.allowCoreThreadTimeOut(false);
2029 >            p.execute(new CheckedRunnable() {
2030 >                public void realRun() throws InterruptedException {
2031 >                    threadStarted.countDown();
2032 >                    assertTrue(p.getPoolSize() >= 1);
2033 >                }});
2034 >            delay(2 * keepAliveTime);
2035 >            assertTrue(p.getPoolSize() >= 1);
2036          } finally {
2037 <            joinPool(tpe);
2037 >            joinPool(p);
2038          }
2039      }
2040  
# Line 1454 | Line 2044 | public class ThreadPoolExecutorTest exte
2044       */
2045      public void testRejectedRecycledTask() throws InterruptedException {
2046          final int nTasks = 1000;
2047 <        final AtomicInteger nRun = new AtomicInteger(0);
2047 >        final CountDownLatch done = new CountDownLatch(nTasks);
2048          final Runnable recycledTask = new Runnable() {
2049 <                public void run() {
2050 <                    nRun.getAndIncrement();
2051 <                } };
2049 >            public void run() {
2050 >                done.countDown();
2051 >            }};
2052          final ThreadPoolExecutor p =
2053 <            new ThreadPoolExecutor(1, 30, 60, TimeUnit.SECONDS,
2053 >            new ThreadPoolExecutor(1, 30,
2054 >                                   60, SECONDS,
2055                                     new ArrayBlockingQueue(30));
2056          try {
2057              for (int i = 0; i < nTasks; ++i) {
# Line 1469 | Line 2060 | public class ThreadPoolExecutorTest exte
2060                          p.execute(recycledTask);
2061                          break;
2062                      }
2063 <                    catch (RejectedExecutionException ignore) {
1473 <                    }
2063 >                    catch (RejectedExecutionException ignore) {}
2064                  }
2065              }
2066 <            Thread.sleep(5000); // enough time to run all tasks
2067 <            assertEquals(nRun.get(), nTasks);
2066 >            // enough time to run all tasks
2067 >            assertTrue(done.await(nTasks * SHORT_DELAY_MS, MILLISECONDS));
2068 >        } finally {
2069 >            joinPool(p);
2070 >        }
2071 >    }
2072 >
2073 >    /**
2074 >     * get(cancelled task) throws CancellationException
2075 >     */
2076 >    public void testGet_cancelled() throws Exception {
2077 >        final ExecutorService e =
2078 >            new ThreadPoolExecutor(1, 1,
2079 >                                   LONG_DELAY_MS, MILLISECONDS,
2080 >                                   new LinkedBlockingQueue<Runnable>());
2081 >        try {
2082 >            final CountDownLatch blockerStarted = new CountDownLatch(1);
2083 >            final CountDownLatch done = new CountDownLatch(1);
2084 >            final List<Future<?>> futures = new ArrayList<>();
2085 >            for (int i = 0; i < 2; i++) {
2086 >                Runnable r = new CheckedRunnable() { public void realRun()
2087 >                                                         throws Throwable {
2088 >                    blockerStarted.countDown();
2089 >                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
2090 >                }};
2091 >                futures.add(e.submit(r));
2092 >            }
2093 >            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2094 >            for (Future<?> future : futures) future.cancel(false);
2095 >            for (Future<?> future : futures) {
2096 >                try {
2097 >                    future.get();
2098 >                    shouldThrow();
2099 >                } catch (CancellationException success) {}
2100 >                try {
2101 >                    future.get(LONG_DELAY_MS, MILLISECONDS);
2102 >                    shouldThrow();
2103 >                } catch (CancellationException success) {}
2104 >                assertTrue(future.isCancelled());
2105 >                assertTrue(future.isDone());
2106 >            }
2107 >            done.countDown();
2108          } finally {
2109 <            p.shutdown();
2109 >            joinPool(e);
2110          }
2111      }
2112  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines