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.25 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.90 by jsr166, Sun Oct 4 03:07:31 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.*;
10 < import java.util.concurrent.atomic.*;
11 < import junit.framework.*;
12 < import java.util.*;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
11 > import static java.util.concurrent.TimeUnit.SECONDS;
12 >
13 > import java.util.ArrayList;
14 > import java.util.List;
15 > import java.util.concurrent.ArrayBlockingQueue;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.Callable;
18 > import java.util.concurrent.CancellationException;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.ExecutionException;
21 > import java.util.concurrent.Executors;
22 > import java.util.concurrent.ExecutorService;
23 > import java.util.concurrent.Future;
24 > import java.util.concurrent.FutureTask;
25 > import java.util.concurrent.LinkedBlockingQueue;
26 > import java.util.concurrent.RejectedExecutionException;
27 > import java.util.concurrent.RejectedExecutionHandler;
28 > import java.util.concurrent.SynchronousQueue;
29 > import java.util.concurrent.ThreadFactory;
30 > import java.util.concurrent.ThreadPoolExecutor;
31 > import java.util.concurrent.TimeUnit;
32 > import java.util.concurrent.atomic.AtomicInteger;
33 >
34 > import junit.framework.Test;
35 > import junit.framework.TestSuite;
36  
37   public class ThreadPoolExecutorTest extends JSR166TestCase {
38      public static void main(String[] args) {
39 <        junit.textui.TestRunner.run (suite());
39 >        main(suite(), args);
40      }
41      public static Test suite() {
42          return new TestSuite(ThreadPoolExecutorTest.class);
43      }
44  
45      static class ExtendedTPE extends ThreadPoolExecutor {
46 <        volatile boolean beforeCalled = false;
47 <        volatile boolean afterCalled = false;
48 <        volatile boolean terminatedCalled = false;
46 >        final CountDownLatch beforeCalled = new CountDownLatch(1);
47 >        final CountDownLatch afterCalled = new CountDownLatch(1);
48 >        final CountDownLatch terminatedCalled = new CountDownLatch(1);
49 >
50          public ExtendedTPE() {
51 <            super(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new SynchronousQueue<Runnable>());
51 >            super(1, 1, LONG_DELAY_MS, MILLISECONDS, new SynchronousQueue<Runnable>());
52          }
53          protected void beforeExecute(Thread t, Runnable r) {
54 <            beforeCalled = true;
54 >            beforeCalled.countDown();
55          }
56          protected void afterExecute(Runnable r, Throwable t) {
57 <            afterCalled = true;
57 >            afterCalled.countDown();
58          }
59          protected void terminated() {
60 <            terminatedCalled = true;
60 >            terminatedCalled.countDown();
61 >        }
62 >
63 >        public boolean beforeCalled() {
64 >            return beforeCalled.getCount() == 0;
65 >        }
66 >        public boolean afterCalled() {
67 >            return afterCalled.getCount() == 0;
68 >        }
69 >        public boolean terminatedCalled() {
70 >            return terminatedCalled.getCount() == 0;
71          }
72      }
73  
74 <    static class FailingThreadFactory implements ThreadFactory{
74 >    static class FailingThreadFactory implements ThreadFactory {
75          int calls = 0;
76 <        public Thread newThread(Runnable r){
76 >        public Thread newThread(Runnable r) {
77              if (++calls > 1) return null;
78              return new Thread(r);
79          }
80      }
81  
48
82      /**
83 <     *  execute successfully executes a runnable
83 >     * execute successfully executes a runnable
84       */
85 <    public void testExecute() {
86 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
87 <        try {
88 <            p1.execute(new Runnable() {
89 <                    public void run() {
90 <                        try {
91 <                            Thread.sleep(SHORT_DELAY_MS);
92 <                        } catch (InterruptedException e){
93 <                            threadUnexpectedException();
94 <                        }
95 <                    }
63 <                });
64 <            Thread.sleep(SMALL_DELAY_MS);
65 <        } catch (InterruptedException e){
66 <            unexpectedException();
85 >    public void testExecute() throws InterruptedException {
86 >        final ThreadPoolExecutor p =
87 >            new ThreadPoolExecutor(1, 1,
88 >                                   LONG_DELAY_MS, MILLISECONDS,
89 >                                   new ArrayBlockingQueue<Runnable>(10));
90 >        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          }
68        joinPool(p1);
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() {
104 <        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
105 <        assertEquals(0, p2.getActiveCount());
106 <        p2.execute(new MediumRunnable());
107 <        try {
108 <            Thread.sleep(SHORT_DELAY_MS);
109 <        } catch (Exception e){
110 <            unexpectedException();
103 >    public void testGetActiveCount() throws InterruptedException {
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          }
84        assertEquals(1, p2.getActiveCount());
85        joinPool(p2);
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, TimeUnit.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, TimeUnit.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() {
177 <        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
178 <        assertEquals(0, p2.getCompletedTaskCount());
179 <        p2.execute(new ShortRunnable());
180 <        try {
181 <            Thread.sleep(SMALL_DELAY_MS);
182 <        } catch (Exception e){
183 <            unexpectedException();
176 >    public void testGetCompletedTaskCount() throws InterruptedException {
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          }
129        assertEquals(1, p2.getCompletedTaskCount());
130        try { p2.shutdown(); } catch (SecurityException ok) { return; }
131        joinPool(p2);
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, TimeUnit.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, TimeUnit.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  
152
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, TimeUnit.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, TimeUnit.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  
174
263      /**
264       * setThreadFactory(null) throws NPE
265       */
266      public void testSetThreadFactoryNull() {
267 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.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 190 | 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, TimeUnit.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 201 | Line 296 | public class ThreadPoolExecutorTest exte
296       * getRejectedExecutionHandler
297       */
298      public void testSetRejectedExecutionHandler() {
299 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.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  
211
310      /**
311       * setRejectedExecutionHandler(null) throws NPE
312       */
313      public void testSetRejectedExecutionHandlerNull() {
314 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.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  
226
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() {
331 <        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
332 <        try {
333 <            assertEquals(0, p2.getLargestPoolSize());
334 <            p2.execute(new MediumRunnable());
335 <            p2.execute(new MediumRunnable());
336 <            Thread.sleep(SHORT_DELAY_MS);
337 <            assertEquals(2, p2.getLargestPoolSize());
338 <        } catch (Exception e){
339 <            unexpectedException();
330 >    public void testGetLargestPoolSize() throws InterruptedException {
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 <        joinPool(p2);
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, TimeUnit.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, TimeUnit.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() {
401 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
402 <        try {
403 <            assertEquals(0, p1.getTaskCount());
404 <            p1.execute(new MediumRunnable());
405 <            Thread.sleep(SHORT_DELAY_MS);
406 <            assertEquals(1, p1.getTaskCount());
407 <        } catch (Exception e){
408 <            unexpectedException();
400 >    public void testGetTaskCount() throws InterruptedException {
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          }
280        joinPool(p1);
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, TimeUnit.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  
295
436      /**
437 <     *  isTerminated is false before termination, true after
437 >     * awaitTermination on a non-shutdown pool times out
438       */
439 <    public void testIsTerminated() {
440 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
441 <        assertFalse(p1.isTerminated());
442 <        try {
443 <            p1.execute(new MediumRunnable());
444 <        } finally {
445 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
446 <        }
447 <        try {
448 <            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
449 <            assertTrue(p1.isTerminated());
450 <        } catch (Exception e){
451 <            unexpectedException();
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 <     *  isTerminating is not true when running or when terminated
469 >     * isTerminated is false before termination, true after
470       */
471 <    public void testIsTerminating() {
472 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
473 <        assertFalse(p1.isTerminating());
474 <        try {
475 <            p1.execute(new SmallRunnable());
476 <            assertFalse(p1.isTerminating());
477 <        } finally {
478 <            try { p1.shutdown(); } catch (SecurityException ok) { return; }
471 >    public void testIsTerminated() throws InterruptedException {
472 >        final ThreadPoolExecutor p =
473 >            new ThreadPoolExecutor(1, 1,
474 >                                   LONG_DELAY_MS, MILLISECONDS,
475 >                                   new ArrayBlockingQueue<Runnable>(10));
476 >        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          }
494 <        try {
495 <            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
496 <            assertTrue(p1.isTerminated());
497 <            assertFalse(p1.isTerminating());
498 <        } catch (Exception e){
499 <            unexpectedException();
494 >    }
495 >
496 >    /**
497 >     * isTerminating is not true when running or when terminated
498 >     */
499 >    public void testIsTerminating() throws InterruptedException {
500 >        final ThreadPoolExecutor p =
501 >            new ThreadPoolExecutor(1, 1,
502 >                                   LONG_DELAY_MS, MILLISECONDS,
503 >                                   new ArrayBlockingQueue<Runnable>(10));
504 >        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          }
522      }
523  
524      /**
525       * getQueue returns the work queue, which contains queued tasks
526       */
527 <    public void testGetQueue() {
528 <        BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
529 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.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 <        } catch (Exception e) {
545 <            unexpectedException();
546 <        } finally {
547 <            joinPool(p1);
527 >    public void testGetQueue() throws InterruptedException {
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  
557      /**
558       * remove(task) removes queued task, and fails to remove active task
559       */
560 <    public void testRemove() {
560 >    public void testRemove() throws InterruptedException {
561          BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
562 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.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 <        } catch (Exception e) {
386 <            unexpectedException();
387 <        } finally {
388 <            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, TimeUnit.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          }
402        tasks[4].cancel(true);
403        tasks[3].cancel(true);
404        p1.purge();
405        long count = p1.getTaskCount();
406        assertTrue(count >= 2 && count < 5);
407        joinPool(p1);
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, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
637 <        List l;
638 <        try {
639 <            for (int i = 0; i < 5; i++)
640 <                p1.execute(new MediumPossiblyInterruptedRunnable());
641 <        }
642 <        finally {
633 >     * shutdownNow returns a list containing tasks that were not run,
634 >     * and those tasks are drained from the queue
635 >     */
636 >    public void testShutdownNow() throws InterruptedException {
637 >        final int poolSize = 2;
638 >        final int count = 5;
639 >        final AtomicInteger ran = new AtomicInteger(0);
640 >        final ThreadPoolExecutor p =
641 >            new ThreadPoolExecutor(poolSize, poolSize,
642 >                                   LONG_DELAY_MS, MILLISECONDS,
643 >                                   new ArrayBlockingQueue<Runnable>(10));
644 >        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
645 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
646 >            threadsStarted.countDown();
647              try {
648 <                l = p1.shutdownNow();
649 <            } catch (SecurityException ok) { return; }
650 <
651 <        }
652 <        assertTrue(p1.isShutdown());
653 <        assertTrue(l.size() <= 4);
648 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
649 >            } catch (InterruptedException success) {}
650 >            ran.getAndIncrement();
651 >        }};
652 >        for (int i = 0; i < count; i++)
653 >            p.execute(waiter);
654 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
655 >        assertEquals(poolSize, p.getActiveCount());
656 >        assertEquals(0, p.getCompletedTaskCount());
657 >        final List<Runnable> queuedTasks;
658 >        try {
659 >            queuedTasks = p.shutdownNow();
660 >        } catch (SecurityException ok) {
661 >            return; // Allowed in case test doesn't have privs
662 >        }
663 >        assertTrue(p.isShutdown());
664 >        assertTrue(p.getQueue().isEmpty());
665 >        assertEquals(count - poolSize, queuedTasks.size());
666 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
667 >        assertTrue(p.isTerminated());
668 >        assertEquals(poolSize, ran.get());
669 >        assertEquals(poolSize, p.getCompletedTaskCount());
670      }
671  
672      // Exception Tests
673  
432
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, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
679 >            new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
680 >                                   new ArrayBlockingQueue<Runnable>(10));
681              shouldThrow();
682 <        }
441 <        catch (IllegalArgumentException success){}
682 >        } catch (IllegalArgumentException success) {}
683      }
684  
685      /**
# Line 446 | Line 687 | public class ThreadPoolExecutorTest exte
687       */
688      public void testConstructor2() {
689          try {
690 <            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
690 >            new ThreadPoolExecutor(1, -1, 1L, SECONDS,
691 >                                   new ArrayBlockingQueue<Runnable>(10));
692              shouldThrow();
693 <        }
452 <        catch (IllegalArgumentException success){}
693 >        } catch (IllegalArgumentException success) {}
694      }
695  
696      /**
# Line 457 | Line 698 | public class ThreadPoolExecutorTest exte
698       */
699      public void testConstructor3() {
700          try {
701 <            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
701 >            new ThreadPoolExecutor(1, 0, 1L, SECONDS,
702 >                                   new ArrayBlockingQueue<Runnable>(10));
703              shouldThrow();
704 <        }
463 <        catch (IllegalArgumentException success){}
704 >        } catch (IllegalArgumentException success) {}
705      }
706  
707      /**
# Line 468 | Line 709 | public class ThreadPoolExecutorTest exte
709       */
710      public void testConstructor4() {
711          try {
712 <            new ThreadPoolExecutor(1,2,-1L,TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
712 >            new ThreadPoolExecutor(1, 2, -1L, SECONDS,
713 >                                   new ArrayBlockingQueue<Runnable>(10));
714              shouldThrow();
715 <        }
474 <        catch (IllegalArgumentException success){}
715 >        } catch (IllegalArgumentException success) {}
716      }
717  
718      /**
# Line 479 | Line 720 | public class ThreadPoolExecutorTest exte
720       */
721      public void testConstructor5() {
722          try {
723 <            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
723 >            new ThreadPoolExecutor(2, 1, 1L, SECONDS,
724 >                                   new ArrayBlockingQueue<Runnable>(10));
725              shouldThrow();
726 <        }
485 <        catch (IllegalArgumentException success){}
726 >        } catch (IllegalArgumentException success) {}
727      }
728  
729      /**
# Line 490 | Line 731 | public class ThreadPoolExecutorTest exte
731       */
732      public void testConstructorNullPointerException() {
733          try {
734 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null);
734 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
735 >                                   (BlockingQueue) null);
736              shouldThrow();
737 <        }
496 <        catch (NullPointerException success){}
737 >        } catch (NullPointerException success) {}
738      }
739  
499
500
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, TimeUnit.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){}
749 >        } catch (IllegalArgumentException success) {}
750      }
751  
752      /**
# Line 513 | Line 754 | public class ThreadPoolExecutorTest exte
754       */
755      public void testConstructor7() {
756          try {
757 <            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, TimeUnit.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 <        }
519 <        catch (IllegalArgumentException success){}
761 >        } catch (IllegalArgumentException success) {}
762      }
763  
764      /**
# Line 524 | Line 766 | public class ThreadPoolExecutorTest exte
766       */
767      public void testConstructor8() {
768          try {
769 <            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, TimeUnit.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 <        }
530 <        catch (IllegalArgumentException success){}
773 >        } catch (IllegalArgumentException success) {}
774      }
775  
776      /**
# Line 535 | Line 778 | public class ThreadPoolExecutorTest exte
778       */
779      public void testConstructor9() {
780          try {
781 <            new ThreadPoolExecutor(1,2,-1L,TimeUnit.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 <        }
541 <        catch (IllegalArgumentException success){}
785 >        } catch (IllegalArgumentException success) {}
786      }
787  
788      /**
# Line 546 | Line 790 | public class ThreadPoolExecutorTest exte
790       */
791      public void testConstructor10() {
792          try {
793 <            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, TimeUnit.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 <        }
552 <        catch (IllegalArgumentException success){}
797 >        } catch (IllegalArgumentException success) {}
798      }
799  
800      /**
# Line 557 | Line 802 | public class ThreadPoolExecutorTest exte
802       */
803      public void testConstructorNullPointerException2() {
804          try {
805 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null,new SimpleThreadFactory());
805 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
806 >                                   (BlockingQueue) null,
807 >                                   new SimpleThreadFactory());
808              shouldThrow();
809 <        }
563 <        catch (NullPointerException success){}
809 >        } catch (NullPointerException success) {}
810      }
811  
812      /**
# Line 568 | 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, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
817 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
818 >                                   new ArrayBlockingQueue<Runnable>(10),
819 >                                   (ThreadFactory) null);
820              shouldThrow();
821 <        }
575 <        catch (NullPointerException success){}
821 >        } catch (NullPointerException success) {}
822      }
823  
578
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, TimeUnit.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 <        }
587 <        catch (IllegalArgumentException success){}
833 >        } catch (IllegalArgumentException success) {}
834      }
835  
836      /**
# Line 592 | Line 838 | public class ThreadPoolExecutorTest exte
838       */
839      public void testConstructor12() {
840          try {
841 <            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, TimeUnit.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 <        }
598 <        catch (IllegalArgumentException success){}
845 >        } catch (IllegalArgumentException success) {}
846      }
847  
848      /**
# Line 603 | Line 850 | public class ThreadPoolExecutorTest exte
850       */
851      public void testConstructor13() {
852          try {
853 <            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, TimeUnit.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 <        }
609 <        catch (IllegalArgumentException success){}
857 >        } catch (IllegalArgumentException success) {}
858      }
859  
860      /**
# Line 614 | Line 862 | public class ThreadPoolExecutorTest exte
862       */
863      public void testConstructor14() {
864          try {
865 <            new ThreadPoolExecutor(1,2,-1L,TimeUnit.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 <        }
620 <        catch (IllegalArgumentException success){}
869 >        } catch (IllegalArgumentException success) {}
870      }
871  
872      /**
# Line 625 | Line 874 | public class ThreadPoolExecutorTest exte
874       */
875      public void testConstructor15() {
876          try {
877 <            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, TimeUnit.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 <        }
631 <        catch (IllegalArgumentException success){}
881 >        } catch (IllegalArgumentException success) {}
882      }
883  
884      /**
# Line 636 | Line 886 | public class ThreadPoolExecutorTest exte
886       */
887      public void testConstructorNullPointerException4() {
888          try {
889 <            new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,null,new NoOpREHandler());
889 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
890 >                                   (BlockingQueue) null,
891 >                                   new NoOpREHandler());
892              shouldThrow();
893 <        }
642 <        catch (NullPointerException success){}
893 >        } catch (NullPointerException success) {}
894      }
895  
896      /**
# Line 647 | 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, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
901 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
902 >                                   new ArrayBlockingQueue<Runnable>(10),
903 >                                   (RejectedExecutionHandler) null);
904              shouldThrow();
905 <        }
654 <        catch (NullPointerException success){}
905 >        } catch (NullPointerException success) {}
906      }
907  
657
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, TimeUnit.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 <        }
666 <        catch (IllegalArgumentException success){}
918 >        } catch (IllegalArgumentException success) {}
919      }
920  
921      /**
# Line 671 | Line 923 | public class ThreadPoolExecutorTest exte
923       */
924      public void testConstructor17() {
925          try {
926 <            new ThreadPoolExecutor(1,-1,LONG_DELAY_MS, TimeUnit.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 <        }
677 <        catch (IllegalArgumentException success){}
931 >        } catch (IllegalArgumentException success) {}
932      }
933  
934      /**
# Line 682 | Line 936 | public class ThreadPoolExecutorTest exte
936       */
937      public void testConstructor18() {
938          try {
939 <            new ThreadPoolExecutor(1,0,LONG_DELAY_MS, TimeUnit.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 <        }
688 <        catch (IllegalArgumentException success){}
944 >        } catch (IllegalArgumentException success) {}
945      }
946  
947      /**
# Line 693 | Line 949 | public class ThreadPoolExecutorTest exte
949       */
950      public void testConstructor19() {
951          try {
952 <            new ThreadPoolExecutor(1,2,-1L,TimeUnit.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 <        }
699 <        catch (IllegalArgumentException success){}
957 >        } catch (IllegalArgumentException success) {}
958      }
959  
960      /**
# Line 704 | Line 962 | public class ThreadPoolExecutorTest exte
962       */
963      public void testConstructor20() {
964          try {
965 <            new ThreadPoolExecutor(2,1,LONG_DELAY_MS, TimeUnit.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 <        }
710 <        catch (IllegalArgumentException success){}
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, TimeUnit.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 <        }
721 <        catch (NullPointerException success){}
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, TimeUnit.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 <        }
733 <        catch (NullPointerException success){}
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, TimeUnit.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 <        }
745 <        catch (NullPointerException successdn8){}
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
751 <     *  if saturated.
1043 >     * execute throws RejectedExecutionException if saturated.
1044       */
1045      public void testSaturatedExecute() {
1046 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
1047 <        try {
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 <            for (int i = 0; i < 5; ++i){
1070 <                p.execute(new MediumRunnable());
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.submit(task);
1085 >            for (int i = 0; i < 2; ++i) {
1086 >                try {
1087 >                    p.execute(task);
1088 >                    shouldThrow();
1089 >                } catch (RejectedExecutionException success) {}
1090 >                assertTrue(p.getTaskCount() <= 2);
1091              }
1092 <            shouldThrow();
1093 <        } catch (RejectedExecutionException success){}
1094 <        joinPool(p);
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, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1104 <        try {
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 >            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 >            }
1121 >        } finally {
1122 >            done.countDown();
1123 >            joinPool(p);
1124 >        }
1125 >    }
1126  
1127 +    /**
1128 +     * executor using CallerRunsPolicy runs task if saturated.
1129 +     */
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 <            }
777 <            TrackedLongRunnable mr = new TrackedLongRunnable();
778 <            p.execute(mr);
779 <            for (int i = 0; i < 5; ++i){
1147 >            for (int i = 0; i < tasks.length; i++)
1148                  p.execute(tasks[i]);
1149 <            }
782 <            for (int i = 1; i < 5; ++i) {
1149 >            for (int i = 1; i < tasks.length; i++)
1150                  assertTrue(tasks[i].done);
1151 <            }
1152 <            try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1153 <        } catch (RejectedExecutionException ex){
787 <            unexpectedException();
788 <        } finally {
789 <            joinPool(p);
1151 >            // tasks[0] is waiting in queue
1152 >            assertFalse(tasks[0].done);
1153 >            done.countDown();
1154          }
1155      }
1156  
1157      /**
1158 <     *  executor using DiscardPolicy drops task if saturated.
1158 >     * executor using DiscardPolicy drops task if saturated.
1159       */
1160      public void testSaturatedExecute3() {
1161          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1162 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1162 >        final ThreadPoolExecutor p =
1163 >            new ThreadPoolExecutor(1, 1,
1164 >                                   LONG_DELAY_MS, MILLISECONDS,
1165 >                                   new ArrayBlockingQueue<Runnable>(1),
1166 >                                   h);
1167          try {
800
1168              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1169 <            for (int i = 0; i < 5; ++i){
1169 >            for (int i = 0; i < tasks.length; ++i)
1170                  tasks[i] = new TrackedNoOpRunnable();
804            }
1171              p.execute(new TrackedLongRunnable());
1172 <            for (int i = 0; i < 5; ++i){
1173 <                p.execute(tasks[i]);
1174 <            }
1175 <            for (int i = 0; i < 5; ++i){
810 <                assertFalse(tasks[i].done);
811 <            }
1172 >            for (TrackedNoOpRunnable task : tasks)
1173 >                p.execute(task);
1174 >            for (TrackedNoOpRunnable task : tasks)
1175 >                assertFalse(task.done);
1176              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
813        } catch (RejectedExecutionException ex){
814            unexpectedException();
1177          } finally {
1178              joinPool(p);
1179          }
1180      }
1181  
1182      /**
1183 <     *  executor using DiscardOldestPolicy drops oldest task if saturated.
1183 >     * executor using DiscardOldestPolicy drops oldest task if saturated.
1184       */
1185      public void testSaturatedExecute4() {
1186          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1187 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1187 >        final ThreadPoolExecutor p =
1188 >            new ThreadPoolExecutor(1, 1,
1189 >                                   LONG_DELAY_MS, MILLISECONDS,
1190 >                                   new ArrayBlockingQueue<Runnable>(1),
1191 >                                   h);
1192          try {
1193              p.execute(new TrackedLongRunnable());
1194              TrackedLongRunnable r2 = new TrackedLongRunnable();
# Line 833 | Line 1199 | public class ThreadPoolExecutorTest exte
1199              assertFalse(p.getQueue().contains(r2));
1200              assertTrue(p.getQueue().contains(r3));
1201              try { p.shutdownNow(); } catch (SecurityException ok) { return; }
836        } catch (RejectedExecutionException ex){
837            unexpectedException();
1202          } finally {
1203              joinPool(p);
1204          }
1205      }
1206  
1207      /**
1208 <     *  execute throws RejectedExecutionException if shutdown
1208 >     * execute throws RejectedExecutionException if shutdown
1209       */
1210      public void testRejectedExecutionExceptionOnShutdown() {
1211 <        ThreadPoolExecutor tpe =
1212 <            new ThreadPoolExecutor(1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1213 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1214 <        try {
1215 <            tpe.execute(new NoOpRunnable());
1216 <            shouldThrow();
1217 <        } catch (RejectedExecutionException success){}
1211 >        ThreadPoolExecutor p =
1212 >            new ThreadPoolExecutor(1, 1,
1213 >                                   LONG_DELAY_MS, MILLISECONDS,
1214 >                                   new ArrayBlockingQueue<Runnable>(1));
1215 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1216 >        try {
1217 >            p.execute(new NoOpRunnable());
1218 >            shouldThrow();
1219 >        } catch (RejectedExecutionException success) {}
1220  
1221 <        joinPool(tpe);
1221 >        joinPool(p);
1222      }
1223  
1224      /**
1225 <     *  execute using CallerRunsPolicy drops task on shutdown
1225 >     * execute using CallerRunsPolicy drops task on shutdown
1226       */
1227      public void testCallerRunsOnShutdown() {
1228          RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1229 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1229 >        final ThreadPoolExecutor p =
1230 >            new ThreadPoolExecutor(1, 1,
1231 >                                   LONG_DELAY_MS, MILLISECONDS,
1232 >                                   new ArrayBlockingQueue<Runnable>(1), h);
1233  
1234          try { p.shutdown(); } catch (SecurityException ok) { return; }
1235 <        try {
1235 >        try {
1236              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1237 <            p.execute(r);
1237 >            p.execute(r);
1238              assertFalse(r.done);
870        } catch (RejectedExecutionException success){
871            unexpectedException();
1239          } finally {
1240              joinPool(p);
1241          }
1242      }
1243  
1244      /**
1245 <     *  execute using DiscardPolicy drops task on shutdown
1245 >     * execute using DiscardPolicy drops task on shutdown
1246       */
1247      public void testDiscardOnShutdown() {
1248          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1249 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1249 >        ThreadPoolExecutor p =
1250 >            new ThreadPoolExecutor(1, 1,
1251 >                                   LONG_DELAY_MS, MILLISECONDS,
1252 >                                   new ArrayBlockingQueue<Runnable>(1),
1253 >                                   h);
1254  
1255          try { p.shutdown(); } catch (SecurityException ok) { return; }
1256 <        try {
1256 >        try {
1257              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1258 <            p.execute(r);
1258 >            p.execute(r);
1259              assertFalse(r.done);
889        } catch (RejectedExecutionException success){
890            unexpectedException();
1260          } finally {
1261              joinPool(p);
1262          }
1263      }
1264  
896
1265      /**
1266 <     *  execute using DiscardOldestPolicy drops task on shutdown
1266 >     * execute using DiscardOldestPolicy drops task on shutdown
1267       */
1268      public void testDiscardOldestOnShutdown() {
1269          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1270 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1270 >        ThreadPoolExecutor p =
1271 >            new ThreadPoolExecutor(1, 1,
1272 >                                   LONG_DELAY_MS, MILLISECONDS,
1273 >                                   new ArrayBlockingQueue<Runnable>(1),
1274 >                                   h);
1275  
1276          try { p.shutdown(); } catch (SecurityException ok) { return; }
1277 <        try {
1277 >        try {
1278              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1279 <            p.execute(r);
1279 >            p.execute(r);
1280              assertFalse(r.done);
909        } catch (RejectedExecutionException success){
910            unexpectedException();
1281          } finally {
1282              joinPool(p);
1283          }
1284      }
1285  
916
1286      /**
1287 <     *  execute (null) throws NPE
1287 >     * execute(null) throws NPE
1288       */
1289      public void testExecuteNull() {
1290 <        ThreadPoolExecutor tpe = null;
1290 >        ThreadPoolExecutor p =
1291 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1292 >                                   new ArrayBlockingQueue<Runnable>(10));
1293          try {
1294 <            tpe = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
924 <            tpe.execute(null);
1294 >            p.execute(null);
1295              shouldThrow();
1296 <        } catch (NullPointerException success){}
1296 >        } catch (NullPointerException success) {}
1297  
1298 <        joinPool(tpe);
1298 >        joinPool(p);
1299      }
1300  
1301      /**
1302 <     *  setCorePoolSize of negative value throws IllegalArgumentException
1302 >     * setCorePoolSize of negative value throws IllegalArgumentException
1303       */
1304      public void testCorePoolSizeIllegalArgumentException() {
1305 <        ThreadPoolExecutor tpe = null;
1306 <        try {
1307 <            tpe = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1308 <        } catch (Exception e){}
1309 <        try {
1310 <            tpe.setCorePoolSize(-1);
1311 <            shouldThrow();
1312 <        } catch (IllegalArgumentException success){
1305 >        ThreadPoolExecutor p =
1306 >            new ThreadPoolExecutor(1, 2,
1307 >                                   LONG_DELAY_MS, MILLISECONDS,
1308 >                                   new ArrayBlockingQueue<Runnable>(10));
1309 >        try {
1310 >            p.setCorePoolSize(-1);
1311 >            shouldThrow();
1312 >        } catch (IllegalArgumentException success) {
1313          } finally {
1314 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1314 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1315          }
1316 <        joinPool(tpe);
1316 >        joinPool(p);
1317      }
1318  
1319      /**
1320 <     *  setMaximumPoolSize(int) throws IllegalArgumentException if
1321 <     *  given a value less the core pool size
1320 >     * setMaximumPoolSize(int) throws IllegalArgumentException if
1321 >     * given a value less the core pool size
1322       */
1323      public void testMaximumPoolSizeIllegalArgumentException() {
1324 <        ThreadPoolExecutor tpe = null;
1324 >        ThreadPoolExecutor p =
1325 >            new ThreadPoolExecutor(2, 3,
1326 >                                   LONG_DELAY_MS, MILLISECONDS,
1327 >                                   new ArrayBlockingQueue<Runnable>(10));
1328          try {
1329 <            tpe = new ThreadPoolExecutor(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
957 <        } catch (Exception e){}
958 <        try {
959 <            tpe.setMaximumPoolSize(1);
1329 >            p.setMaximumPoolSize(1);
1330              shouldThrow();
1331 <        } catch (IllegalArgumentException success){
1331 >        } catch (IllegalArgumentException success) {
1332          } finally {
1333 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1333 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1334          }
1335 <        joinPool(tpe);
1335 >        joinPool(p);
1336      }
1337  
1338      /**
1339 <     *  setMaximumPoolSize throws IllegalArgumentException
1340 <     *  if given a negative value
1339 >     * setMaximumPoolSize throws IllegalArgumentException
1340 >     * if given a negative value
1341       */
1342      public void testMaximumPoolSizeIllegalArgumentException2() {
1343 <        ThreadPoolExecutor tpe = null;
1344 <        try {
1345 <            tpe = new ThreadPoolExecutor(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1346 <        } catch (Exception e){}
1343 >        ThreadPoolExecutor p =
1344 >            new ThreadPoolExecutor(2, 3,
1345 >                                   LONG_DELAY_MS, MILLISECONDS,
1346 >                                   new ArrayBlockingQueue<Runnable>(10));
1347          try {
1348 <            tpe.setMaximumPoolSize(-1);
1348 >            p.setMaximumPoolSize(-1);
1349              shouldThrow();
1350 <        } catch (IllegalArgumentException success){
1350 >        } catch (IllegalArgumentException success) {
1351          } finally {
1352 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1352 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1353          }
1354 <        joinPool(tpe);
1354 >        joinPool(p);
1355      }
1356  
1357 +    /**
1358 +     * Configuration changes that allow core pool size greater than
1359 +     * max pool size result in IllegalArgumentException.
1360 +     */
1361 +    public void testPoolSizeInvariants() {
1362 +        ThreadPoolExecutor p =
1363 +            new ThreadPoolExecutor(1, 1,
1364 +                                   LONG_DELAY_MS, MILLISECONDS,
1365 +                                   new ArrayBlockingQueue<Runnable>(10));
1366 +        for (int s = 1; s < 5; s++) {
1367 +            p.setMaximumPoolSize(s);
1368 +            p.setCorePoolSize(s);
1369 +            try {
1370 +                p.setMaximumPoolSize(s - 1);
1371 +                shouldThrow();
1372 +            } catch (IllegalArgumentException success) {}
1373 +            assertEquals(s, p.getCorePoolSize());
1374 +            assertEquals(s, p.getMaximumPoolSize());
1375 +            try {
1376 +                p.setCorePoolSize(s + 1);
1377 +                shouldThrow();
1378 +            } catch (IllegalArgumentException success) {}
1379 +            assertEquals(s, p.getCorePoolSize());
1380 +            assertEquals(s, p.getMaximumPoolSize());
1381 +        }
1382 +        joinPool(p);
1383 +    }
1384  
1385      /**
1386 <     *  setKeepAliveTime  throws IllegalArgumentException
1387 <     *  when given a negative value
1386 >     * setKeepAliveTime throws IllegalArgumentException
1387 >     * when given a negative value
1388       */
1389      public void testKeepAliveTimeIllegalArgumentException() {
1390 <        ThreadPoolExecutor tpe = null;
1390 >        ThreadPoolExecutor p =
1391 >            new ThreadPoolExecutor(2, 3,
1392 >                                   LONG_DELAY_MS, MILLISECONDS,
1393 >                                   new ArrayBlockingQueue<Runnable>(10));
1394          try {
1395 <            tpe = new ThreadPoolExecutor(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
996 <        } catch (Exception e){}
997 <
998 <        try {
999 <            tpe.setKeepAliveTime(-1,TimeUnit.MILLISECONDS);
1395 >            p.setKeepAliveTime(-1,MILLISECONDS);
1396              shouldThrow();
1397 <        } catch (IllegalArgumentException success){
1397 >        } catch (IllegalArgumentException success) {
1398          } finally {
1399 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1399 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1400          }
1401 <        joinPool(tpe);
1401 >        joinPool(p);
1402      }
1403  
1404      /**
1405       * terminated() is called on termination
1406       */
1407      public void testTerminated() {
1408 <        ExtendedTPE tpe = new ExtendedTPE();
1409 <        try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1410 <        assertTrue(tpe.terminatedCalled);
1411 <        joinPool(tpe);
1408 >        ExtendedTPE p = new ExtendedTPE();
1409 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1410 >        assertTrue(p.terminatedCalled());
1411 >        joinPool(p);
1412      }
1413  
1414      /**
1415       * beforeExecute and afterExecute are called when executing task
1416       */
1417 <    public void testBeforeAfter() {
1418 <        ExtendedTPE tpe = new ExtendedTPE();
1417 >    public void testBeforeAfter() throws InterruptedException {
1418 >        ExtendedTPE p = new ExtendedTPE();
1419          try {
1420 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1421 <            tpe.execute(r);
1422 <            Thread.sleep(SHORT_DELAY_MS);
1423 <            assertTrue(r.done);
1424 <            assertTrue(tpe.beforeCalled);
1425 <            assertTrue(tpe.afterCalled);
1426 <            try { tpe.shutdown(); } catch (SecurityException ok) { return; }
1427 <        }
1428 <        catch (Exception ex) {
1429 <            unexpectedException();
1420 >            final CountDownLatch done = new CountDownLatch(1);
1421 >            p.execute(new CheckedRunnable() {
1422 >                public void realRun() {
1423 >                    done.countDown();
1424 >                }});
1425 >            await(p.afterCalled);
1426 >            assertEquals(0, done.getCount());
1427 >            assertTrue(p.afterCalled());
1428 >            assertTrue(p.beforeCalled());
1429 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1430          } finally {
1431 <            joinPool(tpe);
1431 >            joinPool(p);
1432          }
1433      }
1434  
1435      /**
1436       * completed submit of callable returns result
1437       */
1438 <    public void testSubmitCallable() {
1439 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1438 >    public void testSubmitCallable() throws Exception {
1439 >        ExecutorService e =
1440 >            new ThreadPoolExecutor(2, 2,
1441 >                                   LONG_DELAY_MS, MILLISECONDS,
1442 >                                   new ArrayBlockingQueue<Runnable>(10));
1443          try {
1444              Future<String> future = e.submit(new StringTask());
1445              String result = future.get();
1446              assertSame(TEST_STRING, result);
1048        }
1049        catch (ExecutionException ex) {
1050            unexpectedException();
1051        }
1052        catch (InterruptedException ex) {
1053            unexpectedException();
1447          } finally {
1448              joinPool(e);
1449          }
# Line 1059 | Line 1452 | public class ThreadPoolExecutorTest exte
1452      /**
1453       * completed submit of runnable returns successfully
1454       */
1455 <    public void testSubmitRunnable() {
1456 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1455 >    public void testSubmitRunnable() throws Exception {
1456 >        ExecutorService e =
1457 >            new ThreadPoolExecutor(2, 2,
1458 >                                   LONG_DELAY_MS, MILLISECONDS,
1459 >                                   new ArrayBlockingQueue<Runnable>(10));
1460          try {
1461              Future<?> future = e.submit(new NoOpRunnable());
1462              future.get();
1463              assertTrue(future.isDone());
1068        }
1069        catch (ExecutionException ex) {
1070            unexpectedException();
1071        }
1072        catch (InterruptedException ex) {
1073            unexpectedException();
1464          } finally {
1465              joinPool(e);
1466          }
# Line 1079 | Line 1469 | public class ThreadPoolExecutorTest exte
1469      /**
1470       * completed submit of (runnable, result) returns result
1471       */
1472 <    public void testSubmitRunnable2() {
1473 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1472 >    public void testSubmitRunnable2() throws Exception {
1473 >        ExecutorService e =
1474 >            new ThreadPoolExecutor(2, 2,
1475 >                                   LONG_DELAY_MS, MILLISECONDS,
1476 >                                   new ArrayBlockingQueue<Runnable>(10));
1477          try {
1478              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1479              String result = future.get();
1480              assertSame(TEST_STRING, result);
1088        }
1089        catch (ExecutionException ex) {
1090            unexpectedException();
1091        }
1092        catch (InterruptedException ex) {
1093            unexpectedException();
1481          } finally {
1482              joinPool(e);
1483          }
1484      }
1485  
1099
1100
1101
1102
1486      /**
1487       * invokeAny(null) throws NPE
1488       */
1489 <    public void testInvokeAny1() {
1490 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1489 >    public void testInvokeAny1() throws Exception {
1490 >        ExecutorService e =
1491 >            new ThreadPoolExecutor(2, 2,
1492 >                                   LONG_DELAY_MS, MILLISECONDS,
1493 >                                   new ArrayBlockingQueue<Runnable>(10));
1494          try {
1495              e.invokeAny(null);
1496 +            shouldThrow();
1497          } catch (NullPointerException success) {
1111        } catch (Exception ex) {
1112            unexpectedException();
1498          } finally {
1499              joinPool(e);
1500          }
# Line 1118 | Line 1503 | public class ThreadPoolExecutorTest exte
1503      /**
1504       * invokeAny(empty collection) throws IAE
1505       */
1506 <    public void testInvokeAny2() {
1507 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1506 >    public void testInvokeAny2() throws Exception {
1507 >        ExecutorService e =
1508 >            new ThreadPoolExecutor(2, 2,
1509 >                                   LONG_DELAY_MS, MILLISECONDS,
1510 >                                   new ArrayBlockingQueue<Runnable>(10));
1511          try {
1512              e.invokeAny(new ArrayList<Callable<String>>());
1513 +            shouldThrow();
1514          } catch (IllegalArgumentException success) {
1126        } catch (Exception ex) {
1127            unexpectedException();
1515          } finally {
1516              joinPool(e);
1517          }
# Line 1133 | Line 1520 | public class ThreadPoolExecutorTest exte
1520      /**
1521       * invokeAny(c) throws NPE if c has null elements
1522       */
1523 <    public void testInvokeAny3() {
1524 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1523 >    public void testInvokeAny3() throws Exception {
1524 >        final CountDownLatch latch = new CountDownLatch(1);
1525 >        final ExecutorService e =
1526 >            new ThreadPoolExecutor(2, 2,
1527 >                                   LONG_DELAY_MS, MILLISECONDS,
1528 >                                   new ArrayBlockingQueue<Runnable>(10));
1529 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1530 >        l.add(latchAwaitingStringTask(latch));
1531 >        l.add(null);
1532          try {
1139            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1140            l.add(new StringTask());
1141            l.add(null);
1533              e.invokeAny(l);
1534 +            shouldThrow();
1535          } catch (NullPointerException success) {
1144        } catch (Exception ex) {
1145            unexpectedException();
1536          } finally {
1537 +            latch.countDown();
1538              joinPool(e);
1539          }
1540      }
# Line 1151 | Line 1542 | public class ThreadPoolExecutorTest exte
1542      /**
1543       * invokeAny(c) throws ExecutionException if no task completes
1544       */
1545 <    public void testInvokeAny4() {
1546 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1545 >    public void testInvokeAny4() throws Exception {
1546 >        ExecutorService e =
1547 >            new ThreadPoolExecutor(2, 2,
1548 >                                   LONG_DELAY_MS, MILLISECONDS,
1549 >                                   new ArrayBlockingQueue<Runnable>(10));
1550 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1551 >        l.add(new NPETask());
1552          try {
1157            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1158            l.add(new NPETask());
1553              e.invokeAny(l);
1554 +            shouldThrow();
1555          } catch (ExecutionException success) {
1556 <        } catch (Exception ex) {
1162 <            unexpectedException();
1556 >            assertTrue(success.getCause() instanceof NullPointerException);
1557          } finally {
1558              joinPool(e);
1559          }
# Line 1168 | Line 1562 | public class ThreadPoolExecutorTest exte
1562      /**
1563       * invokeAny(c) returns result of some task
1564       */
1565 <    public void testInvokeAny5() {
1566 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1565 >    public void testInvokeAny5() throws Exception {
1566 >        ExecutorService e =
1567 >            new ThreadPoolExecutor(2, 2,
1568 >                                   LONG_DELAY_MS, MILLISECONDS,
1569 >                                   new ArrayBlockingQueue<Runnable>(10));
1570          try {
1571 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1571 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1572              l.add(new StringTask());
1573              l.add(new StringTask());
1574              String result = e.invokeAny(l);
1575              assertSame(TEST_STRING, result);
1179        } catch (ExecutionException success) {
1180        } catch (Exception ex) {
1181            unexpectedException();
1576          } finally {
1577              joinPool(e);
1578          }
# Line 1187 | Line 1581 | public class ThreadPoolExecutorTest exte
1581      /**
1582       * invokeAll(null) throws NPE
1583       */
1584 <    public void testInvokeAll1() {
1585 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1584 >    public void testInvokeAll1() throws Exception {
1585 >        ExecutorService e =
1586 >            new ThreadPoolExecutor(2, 2,
1587 >                                   LONG_DELAY_MS, MILLISECONDS,
1588 >                                   new ArrayBlockingQueue<Runnable>(10));
1589          try {
1590              e.invokeAll(null);
1591 +            shouldThrow();
1592          } catch (NullPointerException success) {
1195        } catch (Exception ex) {
1196            unexpectedException();
1593          } finally {
1594              joinPool(e);
1595          }
# Line 1202 | Line 1598 | public class ThreadPoolExecutorTest exte
1598      /**
1599       * invokeAll(empty collection) returns empty collection
1600       */
1601 <    public void testInvokeAll2() {
1602 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1601 >    public void testInvokeAll2() throws InterruptedException {
1602 >        ExecutorService e =
1603 >            new ThreadPoolExecutor(2, 2,
1604 >                                   LONG_DELAY_MS, MILLISECONDS,
1605 >                                   new ArrayBlockingQueue<Runnable>(10));
1606          try {
1607              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1608              assertTrue(r.isEmpty());
1210        } catch (Exception ex) {
1211            unexpectedException();
1609          } finally {
1610              joinPool(e);
1611          }
# Line 1217 | Line 1614 | public class ThreadPoolExecutorTest exte
1614      /**
1615       * invokeAll(c) throws NPE if c has null elements
1616       */
1617 <    public void testInvokeAll3() {
1618 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1617 >    public void testInvokeAll3() throws Exception {
1618 >        ExecutorService e =
1619 >            new ThreadPoolExecutor(2, 2,
1620 >                                   LONG_DELAY_MS, MILLISECONDS,
1621 >                                   new ArrayBlockingQueue<Runnable>(10));
1622 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1623 >        l.add(new StringTask());
1624 >        l.add(null);
1625          try {
1223            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1224            l.add(new StringTask());
1225            l.add(null);
1626              e.invokeAll(l);
1627 +            shouldThrow();
1628          } catch (NullPointerException success) {
1228        } catch (Exception ex) {
1229            unexpectedException();
1629          } finally {
1630              joinPool(e);
1631          }
# Line 1235 | Line 1634 | public class ThreadPoolExecutorTest exte
1634      /**
1635       * get of element of invokeAll(c) throws exception on failed task
1636       */
1637 <    public void testInvokeAll4() {
1638 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1637 >    public void testInvokeAll4() throws Exception {
1638 >        ExecutorService e =
1639 >            new ThreadPoolExecutor(2, 2,
1640 >                                   LONG_DELAY_MS, MILLISECONDS,
1641 >                                   new ArrayBlockingQueue<Runnable>(10));
1642          try {
1643 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1643 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1644              l.add(new NPETask());
1645 <            List<Future<String>> result = e.invokeAll(l);
1646 <            assertEquals(1, result.size());
1647 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1648 <                it.next().get();
1649 <        } catch (ExecutionException success) {
1650 <        } catch (Exception ex) {
1651 <            unexpectedException();
1645 >            List<Future<String>> futures = e.invokeAll(l);
1646 >            assertEquals(1, futures.size());
1647 >            try {
1648 >                futures.get(0).get();
1649 >                shouldThrow();
1650 >            } catch (ExecutionException success) {
1651 >                assertTrue(success.getCause() instanceof NullPointerException);
1652 >            }
1653          } finally {
1654              joinPool(e);
1655          }
# Line 1255 | Line 1658 | public class ThreadPoolExecutorTest exte
1658      /**
1659       * invokeAll(c) returns results of all completed tasks
1660       */
1661 <    public void testInvokeAll5() {
1662 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1661 >    public void testInvokeAll5() throws Exception {
1662 >        ExecutorService e =
1663 >            new ThreadPoolExecutor(2, 2,
1664 >                                   LONG_DELAY_MS, MILLISECONDS,
1665 >                                   new ArrayBlockingQueue<Runnable>(10));
1666          try {
1667 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1667 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1668              l.add(new StringTask());
1669              l.add(new StringTask());
1670 <            List<Future<String>> result = e.invokeAll(l);
1671 <            assertEquals(2, result.size());
1672 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1673 <                assertSame(TEST_STRING, it.next().get());
1268 <        } catch (ExecutionException success) {
1269 <        } catch (Exception ex) {
1270 <            unexpectedException();
1670 >            List<Future<String>> futures = e.invokeAll(l);
1671 >            assertEquals(2, futures.size());
1672 >            for (Future<String> future : futures)
1673 >                assertSame(TEST_STRING, future.get());
1674          } finally {
1675              joinPool(e);
1676          }
1677      }
1678  
1276
1277
1679      /**
1680       * timed invokeAny(null) throws NPE
1681       */
1682 <    public void testTimedInvokeAny1() {
1683 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1682 >    public void testTimedInvokeAny1() throws Exception {
1683 >        ExecutorService e =
1684 >            new ThreadPoolExecutor(2, 2,
1685 >                                   LONG_DELAY_MS, MILLISECONDS,
1686 >                                   new ArrayBlockingQueue<Runnable>(10));
1687          try {
1688 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1688 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1689 >            shouldThrow();
1690          } catch (NullPointerException success) {
1286        } catch (Exception ex) {
1287            unexpectedException();
1691          } finally {
1692              joinPool(e);
1693          }
# Line 1293 | Line 1696 | public class ThreadPoolExecutorTest exte
1696      /**
1697       * timed invokeAny(,,null) throws NPE
1698       */
1699 <    public void testTimedInvokeAnyNullTimeUnit() {
1700 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1699 >    public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1700 >        ExecutorService e =
1701 >            new ThreadPoolExecutor(2, 2,
1702 >                                   LONG_DELAY_MS, MILLISECONDS,
1703 >                                   new ArrayBlockingQueue<Runnable>(10));
1704 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1705 >        l.add(new StringTask());
1706          try {
1299            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1300            l.add(new StringTask());
1707              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1708 +            shouldThrow();
1709          } catch (NullPointerException success) {
1303        } catch (Exception ex) {
1304            unexpectedException();
1710          } finally {
1711              joinPool(e);
1712          }
# Line 1310 | Line 1715 | public class ThreadPoolExecutorTest exte
1715      /**
1716       * timed invokeAny(empty collection) throws IAE
1717       */
1718 <    public void testTimedInvokeAny2() {
1719 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1718 >    public void testTimedInvokeAny2() throws Exception {
1719 >        ExecutorService e =
1720 >            new ThreadPoolExecutor(2, 2,
1721 >                                   LONG_DELAY_MS, MILLISECONDS,
1722 >                                   new ArrayBlockingQueue<Runnable>(10));
1723          try {
1724 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1724 >            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1725 >            shouldThrow();
1726          } catch (IllegalArgumentException success) {
1318        } catch (Exception ex) {
1319            unexpectedException();
1727          } finally {
1728              joinPool(e);
1729          }
# Line 1325 | Line 1732 | public class ThreadPoolExecutorTest exte
1732      /**
1733       * timed invokeAny(c) throws NPE if c has null elements
1734       */
1735 <    public void testTimedInvokeAny3() {
1736 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1735 >    public void testTimedInvokeAny3() throws Exception {
1736 >        final CountDownLatch latch = new CountDownLatch(1);
1737 >        final ExecutorService e =
1738 >            new ThreadPoolExecutor(2, 2,
1739 >                                   LONG_DELAY_MS, MILLISECONDS,
1740 >                                   new ArrayBlockingQueue<Runnable>(10));
1741 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1742 >        l.add(latchAwaitingStringTask(latch));
1743 >        l.add(null);
1744          try {
1745 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1746 <            l.add(new StringTask());
1333 <            l.add(null);
1334 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1745 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1746 >            shouldThrow();
1747          } catch (NullPointerException success) {
1336        } catch (Exception ex) {
1337            ex.printStackTrace();
1338            unexpectedException();
1748          } finally {
1749 +            latch.countDown();
1750              joinPool(e);
1751          }
1752      }
# Line 1344 | Line 1754 | public class ThreadPoolExecutorTest exte
1754      /**
1755       * timed invokeAny(c) throws ExecutionException if no task completes
1756       */
1757 <    public void testTimedInvokeAny4() {
1758 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1757 >    public void testTimedInvokeAny4() throws Exception {
1758 >        ExecutorService e =
1759 >            new ThreadPoolExecutor(2, 2,
1760 >                                   LONG_DELAY_MS, MILLISECONDS,
1761 >                                   new ArrayBlockingQueue<Runnable>(10));
1762 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1763 >        l.add(new NPETask());
1764          try {
1765 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1766 <            l.add(new NPETask());
1352 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1765 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1766 >            shouldThrow();
1767          } catch (ExecutionException success) {
1768 <        } catch (Exception ex) {
1355 <            unexpectedException();
1768 >            assertTrue(success.getCause() instanceof NullPointerException);
1769          } finally {
1770              joinPool(e);
1771          }
# Line 1361 | Line 1774 | public class ThreadPoolExecutorTest exte
1774      /**
1775       * timed invokeAny(c) returns result of some task
1776       */
1777 <    public void testTimedInvokeAny5() {
1778 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1777 >    public void testTimedInvokeAny5() throws Exception {
1778 >        ExecutorService e =
1779 >            new ThreadPoolExecutor(2, 2,
1780 >                                   LONG_DELAY_MS, MILLISECONDS,
1781 >                                   new ArrayBlockingQueue<Runnable>(10));
1782          try {
1783 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1783 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1784              l.add(new StringTask());
1785              l.add(new StringTask());
1786 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1786 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1787              assertSame(TEST_STRING, result);
1372        } catch (ExecutionException success) {
1373        } catch (Exception ex) {
1374            unexpectedException();
1788          } finally {
1789              joinPool(e);
1790          }
# Line 1380 | Line 1793 | public class ThreadPoolExecutorTest exte
1793      /**
1794       * timed invokeAll(null) throws NPE
1795       */
1796 <    public void testTimedInvokeAll1() {
1797 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1796 >    public void testTimedInvokeAll1() throws Exception {
1797 >        ExecutorService e =
1798 >            new ThreadPoolExecutor(2, 2,
1799 >                                   LONG_DELAY_MS, MILLISECONDS,
1800 >                                   new ArrayBlockingQueue<Runnable>(10));
1801          try {
1802 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1802 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1803 >            shouldThrow();
1804          } catch (NullPointerException success) {
1388        } catch (Exception ex) {
1389            unexpectedException();
1805          } finally {
1806              joinPool(e);
1807          }
# Line 1395 | Line 1810 | public class ThreadPoolExecutorTest exte
1810      /**
1811       * timed invokeAll(,,null) throws NPE
1812       */
1813 <    public void testTimedInvokeAllNullTimeUnit() {
1814 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1813 >    public void testTimedInvokeAllNullTimeUnit() throws Exception {
1814 >        ExecutorService e =
1815 >            new ThreadPoolExecutor(2, 2,
1816 >                                   LONG_DELAY_MS, MILLISECONDS,
1817 >                                   new ArrayBlockingQueue<Runnable>(10));
1818 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1819 >        l.add(new StringTask());
1820          try {
1401            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1402            l.add(new StringTask());
1821              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1822 +            shouldThrow();
1823          } catch (NullPointerException success) {
1405        } catch (Exception ex) {
1406            unexpectedException();
1824          } finally {
1825              joinPool(e);
1826          }
# Line 1412 | Line 1829 | public class ThreadPoolExecutorTest exte
1829      /**
1830       * timed invokeAll(empty collection) returns empty collection
1831       */
1832 <    public void testTimedInvokeAll2() {
1833 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1832 >    public void testTimedInvokeAll2() throws InterruptedException {
1833 >        ExecutorService e =
1834 >            new ThreadPoolExecutor(2, 2,
1835 >                                   LONG_DELAY_MS, MILLISECONDS,
1836 >                                   new ArrayBlockingQueue<Runnable>(10));
1837          try {
1838 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1838 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1839              assertTrue(r.isEmpty());
1420        } catch (Exception ex) {
1421            unexpectedException();
1840          } finally {
1841              joinPool(e);
1842          }
# Line 1427 | Line 1845 | public class ThreadPoolExecutorTest exte
1845      /**
1846       * timed invokeAll(c) throws NPE if c has null elements
1847       */
1848 <    public void testTimedInvokeAll3() {
1849 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1848 >    public void testTimedInvokeAll3() throws Exception {
1849 >        ExecutorService e =
1850 >            new ThreadPoolExecutor(2, 2,
1851 >                                   LONG_DELAY_MS, MILLISECONDS,
1852 >                                   new ArrayBlockingQueue<Runnable>(10));
1853 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1854 >        l.add(new StringTask());
1855 >        l.add(null);
1856          try {
1857 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1858 <            l.add(new StringTask());
1435 <            l.add(null);
1436 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1857 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1858 >            shouldThrow();
1859          } catch (NullPointerException success) {
1438        } catch (Exception ex) {
1439            unexpectedException();
1860          } finally {
1861              joinPool(e);
1862          }
# Line 1445 | Line 1865 | public class ThreadPoolExecutorTest exte
1865      /**
1866       * get of element of invokeAll(c) throws exception on failed task
1867       */
1868 <    public void testTimedInvokeAll4() {
1869 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1868 >    public void testTimedInvokeAll4() throws Exception {
1869 >        ExecutorService e =
1870 >            new ThreadPoolExecutor(2, 2,
1871 >                                   LONG_DELAY_MS, MILLISECONDS,
1872 >                                   new ArrayBlockingQueue<Runnable>(10));
1873 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1874 >        l.add(new NPETask());
1875 >        List<Future<String>> futures =
1876 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1877 >        assertEquals(1, futures.size());
1878          try {
1879 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1880 <            l.add(new NPETask());
1453 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1454 <            assertEquals(1, result.size());
1455 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1456 <                it.next().get();
1879 >            futures.get(0).get();
1880 >            shouldThrow();
1881          } catch (ExecutionException success) {
1882 <        } catch (Exception ex) {
1459 <            unexpectedException();
1882 >            assertTrue(success.getCause() instanceof NullPointerException);
1883          } finally {
1884              joinPool(e);
1885          }
# Line 1465 | Line 1888 | public class ThreadPoolExecutorTest exte
1888      /**
1889       * timed invokeAll(c) returns results of all completed tasks
1890       */
1891 <    public void testTimedInvokeAll5() {
1892 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1891 >    public void testTimedInvokeAll5() throws Exception {
1892 >        ExecutorService e =
1893 >            new ThreadPoolExecutor(2, 2,
1894 >                                   LONG_DELAY_MS, MILLISECONDS,
1895 >                                   new ArrayBlockingQueue<Runnable>(10));
1896          try {
1897 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1897 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1898              l.add(new StringTask());
1899              l.add(new StringTask());
1900 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1901 <            assertEquals(2, result.size());
1902 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1903 <                assertSame(TEST_STRING, it.next().get());
1904 <        } catch (ExecutionException success) {
1479 <        } catch (Exception ex) {
1480 <            unexpectedException();
1900 >            List<Future<String>> futures =
1901 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1902 >            assertEquals(2, futures.size());
1903 >            for (Future<String> future : futures)
1904 >                assertSame(TEST_STRING, future.get());
1905          } finally {
1906              joinPool(e);
1907          }
# Line 1486 | Line 1910 | public class ThreadPoolExecutorTest exte
1910      /**
1911       * timed invokeAll(c) cancels tasks not completed by timeout
1912       */
1913 <    public void testTimedInvokeAll6() {
1914 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1915 <        try {
1916 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1917 <            l.add(new StringTask());
1918 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1919 <            l.add(new StringTask());
1920 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
1921 <            assertEquals(3, result.size());
1922 <            Iterator<Future<String>> it = result.iterator();
1923 <            Future<String> f1 = it.next();
1924 <            Future<String> f2 = it.next();
1925 <            Future<String> f3 = it.next();
1926 <            assertTrue(f1.isDone());
1927 <            assertTrue(f2.isDone());
1928 <            assertTrue(f3.isDone());
1929 <            assertFalse(f1.isCancelled());
1930 <            assertTrue(f2.isCancelled());
1931 <        } catch (Exception ex) {
1932 <            unexpectedException();
1913 >    public void testTimedInvokeAll6() throws Exception {
1914 >        ExecutorService e =
1915 >            new ThreadPoolExecutor(2, 2,
1916 >                                   LONG_DELAY_MS, MILLISECONDS,
1917 >                                   new ArrayBlockingQueue<Runnable>(10));
1918 >        try {
1919 >            for (long timeout = timeoutMillis();;) {
1920 >                List<Callable<String>> tasks = new ArrayList<>();
1921 >                tasks.add(new StringTask("0"));
1922 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1923 >                tasks.add(new StringTask("2"));
1924 >                long startTime = System.nanoTime();
1925 >                List<Future<String>> futures =
1926 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1927 >                assertEquals(tasks.size(), futures.size());
1928 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1929 >                for (Future future : futures)
1930 >                    assertTrue(future.isDone());
1931 >                assertTrue(futures.get(1).isCancelled());
1932 >                try {
1933 >                    assertEquals("0", futures.get(0).get());
1934 >                    assertEquals("2", futures.get(2).get());
1935 >                    break;
1936 >                } catch (CancellationException retryWithLongerTimeout) {
1937 >                    timeout *= 2;
1938 >                    if (timeout >= LONG_DELAY_MS / 2)
1939 >                        fail("expected exactly one task to be cancelled");
1940 >                }
1941 >            }
1942          } finally {
1943              joinPool(e);
1944          }
# Line 1515 | Line 1948 | public class ThreadPoolExecutorTest exte
1948       * Execution continues if there is at least one thread even if
1949       * thread factory fails to create more
1950       */
1951 <    public void testFailingThreadFactory() {
1952 <        ExecutorService e = new ThreadPoolExecutor(100, 100, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(), new FailingThreadFactory());
1953 <        try {
1954 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1955 <            for (int k = 0; k < 100; ++k) {
1956 <                e.execute(new NoOpRunnable());
1957 <            }
1958 <            Thread.sleep(LONG_DELAY_MS);
1959 <        } catch (Exception ex) {
1960 <            unexpectedException();
1951 >    public void testFailingThreadFactory() throws InterruptedException {
1952 >        final ExecutorService e =
1953 >            new ThreadPoolExecutor(100, 100,
1954 >                                   LONG_DELAY_MS, MILLISECONDS,
1955 >                                   new LinkedBlockingQueue<Runnable>(),
1956 >                                   new FailingThreadFactory());
1957 >        try {
1958 >            final int TASKS = 100;
1959 >            final CountDownLatch done = new CountDownLatch(TASKS);
1960 >            for (int k = 0; k < TASKS; ++k)
1961 >                e.execute(new CheckedRunnable() {
1962 >                    public void realRun() {
1963 >                        done.countDown();
1964 >                    }});
1965 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1966          } finally {
1967              joinPool(e);
1968          }
# Line 1534 | Line 1972 | public class ThreadPoolExecutorTest exte
1972       * allowsCoreThreadTimeOut is by default false.
1973       */
1974      public void testAllowsCoreThreadTimeOut() {
1975 <        ThreadPoolExecutor tpe = new ThreadPoolExecutor(2, 2, 1000, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1976 <        assertFalse(tpe.allowsCoreThreadTimeOut());
1977 <        joinPool(tpe);
1975 >        final ThreadPoolExecutor p =
1976 >            new ThreadPoolExecutor(2, 2,
1977 >                                   1000, MILLISECONDS,
1978 >                                   new ArrayBlockingQueue<Runnable>(10));
1979 >        assertFalse(p.allowsCoreThreadTimeOut());
1980 >        joinPool(p);
1981      }
1982  
1983      /**
1984       * allowCoreThreadTimeOut(true) causes idle threads to time out
1985       */
1986 <    public void testAllowCoreThreadTimeOut_true() {
1987 <        ThreadPoolExecutor tpe = new ThreadPoolExecutor(2, 10, 10, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1988 <        tpe.allowCoreThreadTimeOut(true);
1989 <        tpe.execute(new NoOpRunnable());
1990 <        try {
1991 <            Thread.sleep(MEDIUM_DELAY_MS);
1992 <            assertEquals(0, tpe.getPoolSize());
1993 <        } catch (InterruptedException e){
1994 <            unexpectedException();
1986 >    public void testAllowCoreThreadTimeOut_true() throws Exception {
1987 >        long keepAliveTime = timeoutMillis();
1988 >        final ThreadPoolExecutor p =
1989 >            new ThreadPoolExecutor(2, 10,
1990 >                                   keepAliveTime, MILLISECONDS,
1991 >                                   new ArrayBlockingQueue<Runnable>(10));
1992 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1993 >        try {
1994 >            p.allowCoreThreadTimeOut(true);
1995 >            p.execute(new CheckedRunnable() {
1996 >                public void realRun() {
1997 >                    threadStarted.countDown();
1998 >                    assertEquals(1, p.getPoolSize());
1999 >                }});
2000 >            await(threadStarted);
2001 >            delay(keepAliveTime);
2002 >            long startTime = System.nanoTime();
2003 >            while (p.getPoolSize() > 0
2004 >                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
2005 >                Thread.yield();
2006 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
2007 >            assertEquals(0, p.getPoolSize());
2008          } finally {
2009 <            joinPool(tpe);
2009 >            joinPool(p);
2010          }
2011      }
2012  
2013      /**
2014       * allowCoreThreadTimeOut(false) causes idle threads not to time out
2015       */
2016 <    public void testAllowCoreThreadTimeOut_false() {
2017 <        ThreadPoolExecutor tpe = new ThreadPoolExecutor(2, 10, 10, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
2018 <        tpe.allowCoreThreadTimeOut(false);
2019 <        tpe.execute(new NoOpRunnable());
2020 <        try {
2021 <            Thread.sleep(MEDIUM_DELAY_MS);
2022 <            assertTrue(tpe.getPoolSize() >= 1);
2023 <        } catch (InterruptedException e){
2024 <            unexpectedException();
2016 >    public void testAllowCoreThreadTimeOut_false() throws Exception {
2017 >        long keepAliveTime = timeoutMillis();
2018 >        final ThreadPoolExecutor p =
2019 >            new ThreadPoolExecutor(2, 10,
2020 >                                   keepAliveTime, MILLISECONDS,
2021 >                                   new ArrayBlockingQueue<Runnable>(10));
2022 >        final CountDownLatch threadStarted = new CountDownLatch(1);
2023 >        try {
2024 >            p.allowCoreThreadTimeOut(false);
2025 >            p.execute(new CheckedRunnable() {
2026 >                public void realRun() throws InterruptedException {
2027 >                    threadStarted.countDown();
2028 >                    assertTrue(p.getPoolSize() >= 1);
2029 >                }});
2030 >            delay(2 * keepAliveTime);
2031 >            assertTrue(p.getPoolSize() >= 1);
2032          } finally {
2033 <            joinPool(tpe);
2033 >            joinPool(p);
2034          }
2035      }
2036  
# Line 1577 | Line 2038 | public class ThreadPoolExecutorTest exte
2038       * execute allows the same task to be submitted multiple times, even
2039       * if rejected
2040       */
2041 <    public void testRejectedRecycledTask() {
2041 >    public void testRejectedRecycledTask() throws InterruptedException {
2042          final int nTasks = 1000;
2043 <        final AtomicInteger nRun = new AtomicInteger(0);
2043 >        final CountDownLatch done = new CountDownLatch(nTasks);
2044          final Runnable recycledTask = new Runnable() {
2045 <                public void run() {
2046 <                    nRun.getAndIncrement();
2047 <                } };
2045 >            public void run() {
2046 >                done.countDown();
2047 >            }};
2048          final ThreadPoolExecutor p =
2049 <            new ThreadPoolExecutor(1, 30, 60, TimeUnit.SECONDS,
2049 >            new ThreadPoolExecutor(1, 30,
2050 >                                   60, SECONDS,
2051                                     new ArrayBlockingQueue(30));
2052          try {
2053              for (int i = 0; i < nTasks; ++i) {
# Line 1594 | Line 2056 | public class ThreadPoolExecutorTest exte
2056                          p.execute(recycledTask);
2057                          break;
2058                      }
2059 <                    catch (RejectedExecutionException ignore) {
1598 <                    }
2059 >                    catch (RejectedExecutionException ignore) {}
2060                  }
2061              }
2062 <            Thread.sleep(5000); // enough time to run all tasks
2063 <            assertEquals(nRun.get(), nTasks);
1603 <        } catch (Exception ex) {
1604 <            ex.printStackTrace();
1605 <            unexpectedException();
2062 >            // enough time to run all tasks
2063 >            assertTrue(done.await(nTasks * SHORT_DELAY_MS, MILLISECONDS));
2064          } finally {
2065 <            p.shutdown();
2065 >            joinPool(p);
2066 >        }
2067 >    }
2068 >
2069 >    /**
2070 >     * get(cancelled task) throws CancellationException
2071 >     */
2072 >    public void testGet_cancelled() throws Exception {
2073 >        final ExecutorService e =
2074 >            new ThreadPoolExecutor(1, 1,
2075 >                                   LONG_DELAY_MS, MILLISECONDS,
2076 >                                   new LinkedBlockingQueue<Runnable>());
2077 >        try {
2078 >            final CountDownLatch blockerStarted = new CountDownLatch(1);
2079 >            final CountDownLatch done = new CountDownLatch(1);
2080 >            final List<Future<?>> futures = new ArrayList<>();
2081 >            for (int i = 0; i < 2; i++) {
2082 >                Runnable r = new CheckedRunnable() { public void realRun()
2083 >                                                         throws Throwable {
2084 >                    blockerStarted.countDown();
2085 >                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
2086 >                }};
2087 >                futures.add(e.submit(r));
2088 >            }
2089 >            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2090 >            for (Future<?> future : futures) future.cancel(false);
2091 >            for (Future<?> future : futures) {
2092 >                try {
2093 >                    future.get();
2094 >                    shouldThrow();
2095 >                } catch (CancellationException success) {}
2096 >                try {
2097 >                    future.get(LONG_DELAY_MS, MILLISECONDS);
2098 >                    shouldThrow();
2099 >                } catch (CancellationException success) {}
2100 >                assertTrue(future.isCancelled());
2101 >                assertTrue(future.isDone());
2102 >            }
2103 >            done.countDown();
2104 >        } finally {
2105 >            joinPool(e);
2106          }
2107      }
2108  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines