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.14 by dl, Thu Dec 25 19:48:57 2003 UTC vs.
Revision 1.93 by jsr166, Sun Oct 4 03:51:35 2015 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
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/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 junit.framework.*;
11 < 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 <    
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 {
75 >        int calls = 0;
76 >        public Thread newThread(Runnable r) {
77 >            if (++calls > 1) return null;
78 >            return new Thread(r);
79          }
80      }
81  
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 <                    }
96 <                });
53 <            Thread.sleep(SMALL_DELAY_MS);
54 <        } catch(InterruptedException e){
55 <            unexpectedException();
56 <        }
57 <        joinPool(p1);
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 >        }
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          }
73        assertEquals(1, p2.getActiveCount());
74        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);
161 <    }
162 <    
163 <    /**
164 <     *   getCompletedTaskCount increases, but doesn't overestimate,
165 <     *   when tasks complete
166 <     */
167 <    public void testGetCompletedTaskCount() {
168 <        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
169 <        assertEquals(0, p2.getCompletedTaskCount());
112 <        p2.execute(new ShortRunnable());
113 <        try {
114 <            Thread.sleep(SMALL_DELAY_MS);
115 <        } catch(Exception e){
116 <            unexpectedException();
117 <        }
118 <        assertEquals(1, p2.getCompletedTaskCount());
119 <        p2.shutdown();
120 <        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 <    
171 >
172      /**
173 <     *   getCorePoolSize returns size given in constructor if not otherwise set
173 >     * getCompletedTaskCount increases, but doesn't overestimate,
174 >     * when tasks complete
175 >     */
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 >        }
204 >    }
205 >
206 >    /**
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 <    
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  
232 <
142 <    /**
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 <        p.shutdown();
240 <        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 <    /**
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 <        p.shutdown();
257 <        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  
263 <
166 <    /**
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  
279 <    /**
279 >    /**
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 <        p.shutdown();
287 <        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 <    /**
294 >    /**
295       * setRejectedExecutionHandler sets the handler returned by
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 <        p.shutdown();
304 <        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  
310 <
205 <    /**
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  
219    
220    /**
221     *   getLargestPoolSize increases, but doesn't overestimate, when
222     *   multiple threads active
223     */
224    public void testGetLargestPoolSize() {
225        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
226        try {
227            assertEquals(0, p2.getLargestPoolSize());
228            p2.execute(new MediumRunnable());
229            p2.execute(new MediumRunnable());
230            Thread.sleep(SHORT_DELAY_MS);
231            assertEquals(2, p2.getLargestPoolSize());
232        } catch(Exception e){
233            unexpectedException();
234        }
235        joinPool(p2);
236    }
237    
238    /**
239     *   getMaximumPoolSize returns value given in constructor if not
240     *   otherwise set
241     */
242    public void testGetMaximumPoolSize() {
243        ThreadPoolExecutor p2 = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
244        assertEquals(2, p2.getMaximumPoolSize());
245        joinPool(p2);
246    }
247    
248    /**
249     *   getPoolSize increases, but doesn't overestimate, when threads
250     *   become active
251     */
252    public void testGetPoolSize() {
253        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
254        assertEquals(0, p1.getPoolSize());
255        p1.execute(new MediumRunnable());
256        assertEquals(1, p1.getPoolSize());
257        joinPool(p1);
258    }
259    
260    /**
261     *  getTaskCount increases, but doesn't overestimate, when tasks submitted
262     */
263    public void testGetTaskCount() {
264        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
265        try {
266            assertEquals(0, p1.getTaskCount());
267            p1.execute(new MediumRunnable());
268            Thread.sleep(SHORT_DELAY_MS);
269            assertEquals(1, p1.getTaskCount());
270        } catch(Exception e){
271            unexpectedException();
272        }
273        joinPool(p1);
274    }
275    
326      /**
327 <     *   isShutDown is false before shutdown, true after
328 <     */
329 <    public void testIsShutdown() {
330 <        
331 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
332 <        assertFalse(p1.isShutdown());
333 <        p1.shutdown();
334 <        assertTrue(p1.isShutdown());
335 <        joinPool(p1);
327 >     * getLargestPoolSize increases, but doesn't overestimate, when
328 >     * multiple threads active
329 >     */
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 >        assertEquals(THREADS, p.getLargestPoolSize());
352      }
353  
288        
354      /**
355 <     *  isTerminated is false before termination, true after
355 >     * getMaximumPoolSize returns value given in constructor if not
356 >     * otherwise set
357       */
358 <    public void testIsTerminated() {
359 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
360 <        assertFalse(p1.isTerminated());
361 <        try {
362 <            p1.execute(new MediumRunnable());
363 <        } finally {
364 <            p1.shutdown();
358 >    public void testGetMaximumPoolSize() {
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
375 >     */
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
399 >     */
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          }
300        try {
301            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
302            assertTrue(p1.isTerminated());
303        } catch(Exception e){
304            unexpectedException();
305        }      
419      }
420  
421      /**
422 <     *  isTerminating is not true when running or when terminated
422 >     * isShutdown is false before shutdown, true after
423       */
424 <    public void testIsTerminating() {
425 <        ThreadPoolExecutor p1 = new ThreadPoolExecutor(1, 1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
426 <        assertFalse(p1.isTerminating());
427 <        try {
428 <            p1.execute(new SmallRunnable());
429 <            assertFalse(p1.isTerminating());
430 <        } finally {
431 <            p1.shutdown();
424 >    public void testIsShutdown() {
425 >        final ThreadPoolExecutor p =
426 >            new ThreadPoolExecutor(1, 1,
427 >                                   LONG_DELAY_MS, MILLISECONDS,
428 >                                   new ArrayBlockingQueue<Runnable>(10));
429 >        try (PoolCleaner cleaner = cleaner(p)) {
430 >            assertFalse(p.isShutdown());
431 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
432 >            assertTrue(p.isShutdown());
433 >        }
434 >    }
435 >
436 >    /**
437 >     * awaitTermination on a non-shutdown pool times out
438 >     */
439 >    public void testAwaitTermination_timesOut() throws InterruptedException {
440 >        final ThreadPoolExecutor p =
441 >            new ThreadPoolExecutor(1, 1,
442 >                                   LONG_DELAY_MS, MILLISECONDS,
443 >                                   new ArrayBlockingQueue<Runnable>(10));
444 >        try (PoolCleaner cleaner = cleaner(p)) {
445 >            assertFalse(p.isTerminated());
446 >            assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
447 >            assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
448 >            assertFalse(p.awaitTermination(-1L, NANOSECONDS));
449 >            assertFalse(p.awaitTermination(-1L, MILLISECONDS));
450 >            assertFalse(p.awaitTermination(0L, NANOSECONDS));
451 >            assertFalse(p.awaitTermination(0L, MILLISECONDS));
452 >            long timeoutNanos = 999999L;
453 >            long startTime = System.nanoTime();
454 >            assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
455 >            assertTrue(System.nanoTime() - startTime >= timeoutNanos);
456 >            assertFalse(p.isTerminated());
457 >            startTime = System.nanoTime();
458 >            long timeoutMillis = timeoutMillis();
459 >            assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
460 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
461 >            assertFalse(p.isTerminated());
462 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
463 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
464 >            assertTrue(p.isTerminated());
465 >        }
466 >    }
467 >
468 >    /**
469 >     * isTerminated is false before termination, true after
470 >     */
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 >    }
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          }
320        try {
321            assertTrue(p1.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
322            assertTrue(p1.isTerminated());
323            assertFalse(p1.isTerminating());
324        } catch(Exception e){
325            unexpectedException();
326        }      
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 <            p1.shutdownNow();
542 <        } catch(Exception e) {
543 <            unexpectedException();
544 <        } finally {
545 <            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 <            p1.shutdownNow();
377 <        } catch(Exception e) {
378 <            unexpectedException();
379 <        } finally {
380 <            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          }
394        tasks[4].cancel(true);
395        tasks[3].cancel(true);
396        p1.purge();
397        long count = p1.getTaskCount();
398        assertTrue(count >= 2 && count < 5);
399        p1.shutdownNow();
400        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 {
643 <            l = p1.shutdownNow();
644 <        }
645 <        assertTrue(p1.isShutdown());
646 <        assertTrue(l.size() <= 4);
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 >                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
421    
673  
674 <    /**
675 <     * Constructor throws if corePoolSize argument is less than zero
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 <        }
431 <        catch (IllegalArgumentException success){}
682 >        } catch (IllegalArgumentException success) {}
683      }
684 <    
685 <    /**
686 <     * Constructor throws if maximumPoolSize is less than zero
684 >
685 >    /**
686 >     * Constructor throws if maximumPoolSize is less than zero
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 <        }
442 <        catch (IllegalArgumentException success){}
693 >        } catch (IllegalArgumentException success) {}
694      }
695 <    
696 <    /**
697 <     * Constructor throws if maximumPoolSize is equal to zero
695 >
696 >    /**
697 >     * Constructor throws if maximumPoolSize is equal to zero
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 <        }
453 <        catch (IllegalArgumentException success){}
704 >        } catch (IllegalArgumentException success) {}
705      }
706  
707 <    /**
708 <     * Constructor throws if keepAliveTime is less than zero
707 >    /**
708 >     * Constructor throws if keepAliveTime is less than zero
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 <        }
464 <        catch (IllegalArgumentException success){}
715 >        } catch (IllegalArgumentException success) {}
716      }
717  
718 <    /**
719 <     * Constructor throws if corePoolSize is greater than the maximumPoolSize
718 >    /**
719 >     * Constructor throws if corePoolSize is greater than the maximumPoolSize
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 <        }
475 <        catch (IllegalArgumentException success){}
726 >        } catch (IllegalArgumentException success) {}
727      }
728 <        
729 <    /**
730 <     * Constructor throws if workQueue is set to null
728 >
729 >    /**
730 >     * Constructor throws if workQueue is set to null
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 <        }
486 <        catch (NullPointerException success){}  
737 >        } catch (NullPointerException success) {}
738      }
488    
739  
740 <    
741 <    /**
492 <     * Constructor throws if corePoolSize argument is less than zero
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 <    /**
753 <     * Constructor throws if maximumPoolSize is less than zero
751 >
752 >    /**
753 >     * Constructor throws if maximumPoolSize is less than zero
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 <        }
509 <        catch (IllegalArgumentException success){}
761 >        } catch (IllegalArgumentException success) {}
762      }
763  
764 <    /**
765 <     * Constructor throws if maximumPoolSize is equal to zero
764 >    /**
765 >     * Constructor throws if maximumPoolSize is equal to zero
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 <        }
520 <        catch (IllegalArgumentException success){}
773 >        } catch (IllegalArgumentException success) {}
774      }
775  
776 <    /**
777 <     * Constructor throws if keepAliveTime is less than zero
776 >    /**
777 >     * Constructor throws if keepAliveTime is less than zero
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 <        }
531 <        catch (IllegalArgumentException success){}
785 >        } catch (IllegalArgumentException success) {}
786      }
787  
788 <    /**
789 <     * Constructor throws if corePoolSize is greater than the maximumPoolSize
788 >    /**
789 >     * Constructor throws if corePoolSize is greater than the maximumPoolSize
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 <        }
542 <        catch (IllegalArgumentException success){}
797 >        } catch (IllegalArgumentException success) {}
798      }
799  
800 <    /**
801 <     * Constructor throws if workQueue is set to null
800 >    /**
801 >     * Constructor throws if workQueue is set to null
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 <        }
553 <        catch (NullPointerException success){}  
809 >        } catch (NullPointerException success) {}
810      }
811  
812 <    /**
813 <     * Constructor throws if threadFactory is set to null
812 >    /**
813 >     * Constructor throws if threadFactory is set to null
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 <        }
565 <        catch (NullPointerException success){}  
821 >        } catch (NullPointerException success) {}
822      }
823 <
824 <    
825 <    /**
570 <     * Constructor throws if corePoolSize argument is less than zero
823 >
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 <        }
577 <        catch (IllegalArgumentException success){}
833 >        } catch (IllegalArgumentException success) {}
834      }
835  
836 <    /**
837 <     * Constructor throws if maximumPoolSize is less than zero
836 >    /**
837 >     * Constructor throws if maximumPoolSize is less than zero
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 <        }
588 <        catch (IllegalArgumentException success){}
845 >        } catch (IllegalArgumentException success) {}
846      }
847  
848 <    /**
849 <     * Constructor throws if maximumPoolSize is equal to zero
848 >    /**
849 >     * Constructor throws if maximumPoolSize is equal to zero
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 <        }
599 <        catch (IllegalArgumentException success){}
857 >        } catch (IllegalArgumentException success) {}
858      }
859  
860 <    /**
861 <     * Constructor throws if keepAliveTime is less than zero
860 >    /**
861 >     * Constructor throws if keepAliveTime is less than zero
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 <        }
610 <        catch (IllegalArgumentException success){}
869 >        } catch (IllegalArgumentException success) {}
870      }
871  
872 <    /**
873 <     * Constructor throws if corePoolSize is greater than the maximumPoolSize
872 >    /**
873 >     * Constructor throws if corePoolSize is greater than the maximumPoolSize
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 <        }
621 <        catch (IllegalArgumentException success){}
881 >        } catch (IllegalArgumentException success) {}
882      }
883  
884 <    /**
885 <     * Constructor throws if workQueue is set to null
884 >    /**
885 >     * Constructor throws if workQueue is set to null
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 <        }
632 <        catch (NullPointerException success){}  
893 >        } catch (NullPointerException success) {}
894      }
895  
896 <    /**
897 <     * Constructor throws if handler is set to null
896 >    /**
897 >     * Constructor throws if handler is set to null
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 <        }
644 <        catch (NullPointerException success){}  
905 >        } catch (NullPointerException success) {}
906      }
907  
908 <    
909 <    /**
649 <     * Constructor throws if corePoolSize argument is less than zero
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 <        }
656 <        catch (IllegalArgumentException success){}
918 >        } catch (IllegalArgumentException success) {}
919      }
920  
921 <    /**
922 <     * Constructor throws if maximumPoolSize is less than zero
921 >    /**
922 >     * Constructor throws if maximumPoolSize is less than zero
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 <        }
667 <        catch (IllegalArgumentException success){}
931 >        } catch (IllegalArgumentException success) {}
932      }
933  
934 <    /**
935 <     * Constructor throws if maximumPoolSize is equal to zero
934 >    /**
935 >     * Constructor throws if maximumPoolSize is equal to zero
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 <        }
678 <        catch (IllegalArgumentException success){}
944 >        } catch (IllegalArgumentException success) {}
945      }
946  
947 <    /**
948 <     * Constructor throws if keepAliveTime is less than zero
947 >    /**
948 >     * Constructor throws if keepAliveTime is less than zero
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 <        }
689 <        catch (IllegalArgumentException success){}
957 >        } catch (IllegalArgumentException success) {}
958      }
959  
960 <    /**
961 <     * Constructor throws if corePoolSize is greater than the maximumPoolSize
960 >    /**
961 >     * Constructor throws if corePoolSize is greater than the maximumPoolSize
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 <        }
700 <        catch (IllegalArgumentException success){}
970 >        } catch (IllegalArgumentException success) {}
971      }
972  
973 <    /**
974 <     * Constructor throws if workQueue is set to null
973 >    /**
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 <        }
711 <        catch (NullPointerException success){}  
983 >        } catch (NullPointerException success) {}
984      }
985  
986 <    /**
987 <     * Constructor throws if handler is set to null
986 >    /**
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 <        }
723 <        catch (NullPointerException success){}  
996 >        } catch (NullPointerException success) {}
997      }
998  
999 <    /**
1000 <     * Constructor throws if ThreadFactory is set top null
999 >    /**
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 +        } 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          }
735        catch (NullPointerException successdn8){}  
1040      }
737    
1041  
1042      /**
1043 <     *  execute throws RejectedExecutionException
741 <     *  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 {
1048 <            
1049 <            for(int i = 0; i < 5; ++i){
1050 <                p.execute(new MediumRunnable());
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 <            shouldThrow();
1066 <        } catch(RejectedExecutionException success){}
752 <        joinPool(p);
1065 >            done.countDown();
1066 >        }
1067      }
1068  
1069      /**
1070 <     *  executor using CallerRunsPolicy runs task if saturated.
1070 >     * submit(runnable) throws RejectedExecutionException if saturated.
1071       */
1072 <    public void testSaturatedExecute2() {
1073 <        RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1074 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1075 <        try {
1076 <            
1077 <            TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1078 <            for(int i = 0; i < 5; ++i){
1079 <                tasks[i] = new TrackedNoOpRunnable();
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 <            TrackedLongRunnable mr = new TrackedLongRunnable();
1093 <            p.execute(mr);
1094 <            for(int i = 0; i < 5; ++i){
1095 <                p.execute(tasks[i]);
1096 <            }
1097 <            for(int i = 1; i < 5; ++i) {
1098 <                assertTrue(tasks[i].done);
1092 >        } finally {
1093 >            done.countDown();
1094 >            joinPool(p);
1095 >        }
1096 >    }
1097 >
1098 >    /**
1099 >     * submit(callable) throws RejectedExecutionException if saturated.
1100 >     */
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              }
775            p.shutdownNow();
776        } catch(RejectedExecutionException ex){
777            unexpectedException();
1121          } finally {
1122 +            done.countDown();
1123              joinPool(p);
1124          }
1125      }
1126  
1127      /**
1128 <     *  executor using DiscardPolicy drops task if saturated.
1128 >     * executor using CallerRunsPolicy runs task if saturated.
1129       */
1130 <    public void testSaturatedExecute3() {
1131 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1132 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1133 <        try {
1134 <            
1130 >    public void testSaturatedExecute2() {
1131 >        final ThreadPoolExecutor p =
1132 >            new ThreadPoolExecutor(1, 1,
1133 >                                   LONG_DELAY_MS,
1134 >                                   MILLISECONDS,
1135 >                                   new ArrayBlockingQueue<Runnable>(1),
1136 >                                   new ThreadPoolExecutor.CallerRunsPolicy());
1137 >        try (PoolCleaner cleaner = cleaner(p)) {
1138 >            final CountDownLatch done = new CountDownLatch(1);
1139 >            Runnable blocker = new CheckedRunnable() {
1140 >                public void realRun() throws InterruptedException {
1141 >                    done.await();
1142 >                }};
1143 >            p.execute(blocker);
1144              TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1145 <            for(int i = 0; i < 5; ++i){
1145 >            for (int i = 0; i < tasks.length; i++)
1146                  tasks[i] = new TrackedNoOpRunnable();
1147 <            }
795 <            p.execute(new TrackedLongRunnable());
796 <            for(int i = 0; i < 5; ++i){
1147 >            for (int i = 0; i < tasks.length; i++)
1148                  p.execute(tasks[i]);
1149 <            }
1150 <            for(int i = 0; i < 5; ++i){
1149 >            for (int i = 1; i < tasks.length; i++)
1150 >                assertTrue(tasks[i].done);
1151 >            assertFalse(tasks[0].done); // waiting in queue
1152 >            done.countDown();
1153 >        }
1154 >    }
1155 >
1156 >    /**
1157 >     * executor using DiscardPolicy drops task if saturated.
1158 >     */
1159 >    public void testSaturatedExecute3() {
1160 >        final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1161 >        for (int i = 0; i < tasks.length; ++i)
1162 >            tasks[i] = new TrackedNoOpRunnable();
1163 >        final ThreadPoolExecutor p =
1164 >            new ThreadPoolExecutor(1, 1,
1165 >                          LONG_DELAY_MS, MILLISECONDS,
1166 >                          new ArrayBlockingQueue<Runnable>(1),
1167 >                          new ThreadPoolExecutor.DiscardPolicy());
1168 >        try (PoolCleaner cleaner = cleaner(p)) {
1169 >            final CountDownLatch done = new CountDownLatch(1);
1170 >            p.execute(awaiter(done));
1171 >
1172 >            for (TrackedNoOpRunnable task : tasks)
1173 >                p.execute(task);
1174 >            for (int i = 1; i < tasks.length; i++)
1175                  assertFalse(tasks[i].done);
1176 <            }
802 <            p.shutdownNow();
803 <        } catch(RejectedExecutionException ex){
804 <            unexpectedException();
805 <        } finally {
806 <            joinPool(p);
1176 >            done.countDown();
1177          }
1178 +        for (int i = 1; i < tasks.length; i++)
1179 +            assertFalse(tasks[i].done);
1180 +        assertTrue(tasks[0].done); // was waiting in queue
1181      }
1182  
1183      /**
1184 <     *  executor using DiscardOldestPolicy drops oldest task if saturated.
1184 >     * executor using DiscardOldestPolicy drops oldest task if saturated.
1185       */
1186      public void testSaturatedExecute4() {
1187 <        RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1188 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1189 <        try {
1190 <            p.execute(new TrackedLongRunnable());
1191 <            TrackedLongRunnable r2 = new TrackedLongRunnable();
1187 >        final CountDownLatch done = new CountDownLatch(1);
1188 >        LatchAwaiter r1 = awaiter(done);
1189 >        LatchAwaiter r2 = awaiter(done);
1190 >        LatchAwaiter r3 = awaiter(done);
1191 >        final ThreadPoolExecutor p =
1192 >            new ThreadPoolExecutor(1, 1,
1193 >                                   LONG_DELAY_MS, MILLISECONDS,
1194 >                                   new ArrayBlockingQueue<Runnable>(1),
1195 >                                   new ThreadPoolExecutor.DiscardOldestPolicy());
1196 >        try (PoolCleaner cleaner = cleaner(p)) {
1197 >            assertEquals(LatchAwaiter.NEW, r1.state);
1198 >            assertEquals(LatchAwaiter.NEW, r2.state);
1199 >            assertEquals(LatchAwaiter.NEW, r3.state);
1200 >            p.execute(r1);
1201              p.execute(r2);
1202              assertTrue(p.getQueue().contains(r2));
821            TrackedNoOpRunnable r3 = new TrackedNoOpRunnable();
1203              p.execute(r3);
1204              assertFalse(p.getQueue().contains(r2));
1205              assertTrue(p.getQueue().contains(r3));
1206 <            p.shutdownNow();
826 <        } catch(RejectedExecutionException ex){
827 <            unexpectedException();
828 <        } finally {
829 <            joinPool(p);
1206 >            done.countDown();
1207          }
1208 +        assertEquals(LatchAwaiter.DONE, r1.state);
1209 +        assertEquals(LatchAwaiter.NEW, r2.state);
1210 +        assertEquals(LatchAwaiter.DONE, r3.state);
1211      }
1212  
1213      /**
1214 <     *  execute throws RejectedExecutionException if shutdown
1214 >     * execute throws RejectedExecutionException if shutdown
1215       */
1216      public void testRejectedExecutionExceptionOnShutdown() {
1217 <        ThreadPoolExecutor tpe =
1218 <            new ThreadPoolExecutor(1,1,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(1));
1219 <        tpe.shutdown();
1220 <        try {
1221 <            tpe.execute(new NoOpRunnable());
1222 <            shouldThrow();
1223 <        } catch(RejectedExecutionException success){}
1224 <        
1225 <        joinPool(tpe);
1217 >        ThreadPoolExecutor p =
1218 >            new ThreadPoolExecutor(1, 1,
1219 >                                   LONG_DELAY_MS, MILLISECONDS,
1220 >                                   new ArrayBlockingQueue<Runnable>(1));
1221 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1222 >        try (PoolCleaner cleaner = cleaner(p)) {
1223 >            try {
1224 >                p.execute(new NoOpRunnable());
1225 >                shouldThrow();
1226 >            } catch (RejectedExecutionException success) {}
1227 >        }
1228      }
1229  
1230      /**
1231 <     *  execute using CallerRunsPolicy drops task on shutdown
1231 >     * execute using CallerRunsPolicy drops task on shutdown
1232       */
1233      public void testCallerRunsOnShutdown() {
1234          RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1235 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1235 >        final ThreadPoolExecutor p =
1236 >            new ThreadPoolExecutor(1, 1,
1237 >                                   LONG_DELAY_MS, MILLISECONDS,
1238 >                                   new ArrayBlockingQueue<Runnable>(1), h);
1239  
1240 <        p.shutdown();
1241 <        try {
1240 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1241 >        try {
1242              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1243 <            p.execute(r);
1243 >            p.execute(r);
1244              assertFalse(r.done);
860        } catch(RejectedExecutionException success){
861            unexpectedException();
1245          } finally {
1246              joinPool(p);
1247          }
1248      }
1249  
1250      /**
1251 <     *  execute using DiscardPolicy drops task on shutdown
1251 >     * execute using DiscardPolicy drops task on shutdown
1252       */
1253      public void testDiscardOnShutdown() {
1254          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1255 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1255 >        ThreadPoolExecutor p =
1256 >            new ThreadPoolExecutor(1, 1,
1257 >                                   LONG_DELAY_MS, MILLISECONDS,
1258 >                                   new ArrayBlockingQueue<Runnable>(1),
1259 >                                   h);
1260  
1261 <        p.shutdown();
1262 <        try {
1261 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1262 >        try {
1263              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1264 <            p.execute(r);
1264 >            p.execute(r);
1265              assertFalse(r.done);
879        } catch(RejectedExecutionException success){
880            unexpectedException();
1266          } finally {
1267              joinPool(p);
1268          }
1269      }
1270  
886
1271      /**
1272 <     *  execute using DiscardOldestPolicy drops task on shutdown
1272 >     * execute using DiscardOldestPolicy drops task on shutdown
1273       */
1274      public void testDiscardOldestOnShutdown() {
1275          RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1276 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1), h);
1276 >        ThreadPoolExecutor p =
1277 >            new ThreadPoolExecutor(1, 1,
1278 >                                   LONG_DELAY_MS, MILLISECONDS,
1279 >                                   new ArrayBlockingQueue<Runnable>(1),
1280 >                                   h);
1281  
1282 <        p.shutdown();
1283 <        try {
1282 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1283 >        try {
1284              TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1285 <            p.execute(r);
1285 >            p.execute(r);
1286              assertFalse(r.done);
899        } catch(RejectedExecutionException success){
900            unexpectedException();
1287          } finally {
1288              joinPool(p);
1289          }
1290      }
1291  
906
1292      /**
1293 <     *  execute (null) throws NPE
1293 >     * execute(null) throws NPE
1294       */
1295      public void testExecuteNull() {
1296 <        ThreadPoolExecutor tpe = null;
1296 >        ThreadPoolExecutor p =
1297 >            new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1298 >                                   new ArrayBlockingQueue<Runnable>(10));
1299          try {
1300 <            tpe = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
914 <            tpe.execute(null);
1300 >            p.execute(null);
1301              shouldThrow();
1302 <        } catch(NullPointerException success){}
1303 <        
1304 <        joinPool(tpe);
1302 >        } catch (NullPointerException success) {}
1303 >
1304 >        joinPool(p);
1305      }
1306 <    
1306 >
1307      /**
1308 <     *  setCorePoolSize of negative value throws IllegalArgumentException
1308 >     * setCorePoolSize of negative value throws IllegalArgumentException
1309       */
1310      public void testCorePoolSizeIllegalArgumentException() {
1311 <        ThreadPoolExecutor tpe = null;
1312 <        try {
1313 <            tpe = new ThreadPoolExecutor(1,2,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1314 <        } catch(Exception e){}
929 <        try {
930 <            tpe.setCorePoolSize(-1);
931 <            shouldThrow();
932 <        } catch(IllegalArgumentException success){
933 <        } finally {
934 <            tpe.shutdown();
935 <        }
936 <        joinPool(tpe);
937 <    }  
938 <
939 <    /**
940 <     *  setMaximumPoolSize(int) throws IllegalArgumentException if
941 <     *  given a value less the core pool size
942 <     */  
943 <    public void testMaximumPoolSizeIllegalArgumentException() {
944 <        ThreadPoolExecutor tpe = null;
1311 >        ThreadPoolExecutor p =
1312 >            new ThreadPoolExecutor(1, 2,
1313 >                                   LONG_DELAY_MS, MILLISECONDS,
1314 >                                   new ArrayBlockingQueue<Runnable>(10));
1315          try {
1316 <            tpe = new ThreadPoolExecutor(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1317 <        } catch(Exception e){}
1316 >            p.setCorePoolSize(-1);
1317 >            shouldThrow();
1318 >        } catch (IllegalArgumentException success) {
1319 >        } finally {
1320 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1321 >        }
1322 >        joinPool(p);
1323 >    }
1324 >
1325 >    /**
1326 >     * setMaximumPoolSize(int) throws IllegalArgumentException if
1327 >     * given a value less the core pool size
1328 >     */
1329 >    public void testMaximumPoolSizeIllegalArgumentException() {
1330 >        ThreadPoolExecutor p =
1331 >            new ThreadPoolExecutor(2, 3,
1332 >                                   LONG_DELAY_MS, MILLISECONDS,
1333 >                                   new ArrayBlockingQueue<Runnable>(10));
1334          try {
1335 <            tpe.setMaximumPoolSize(1);
1335 >            p.setMaximumPoolSize(1);
1336              shouldThrow();
1337 <        } catch(IllegalArgumentException success){
1337 >        } catch (IllegalArgumentException success) {
1338          } finally {
1339 <            tpe.shutdown();
1339 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1340          }
1341 <        joinPool(tpe);
1341 >        joinPool(p);
1342      }
1343 <    
1343 >
1344      /**
1345 <     *  setMaximumPoolSize throws IllegalArgumentException
1346 <     *  if given a negative value
1345 >     * setMaximumPoolSize throws IllegalArgumentException
1346 >     * if given a negative value
1347       */
1348      public void testMaximumPoolSizeIllegalArgumentException2() {
1349 <        ThreadPoolExecutor tpe = null;
1350 <        try {
1351 <            tpe = new ThreadPoolExecutor(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1352 <        } catch(Exception e){}
1349 >        ThreadPoolExecutor p =
1350 >            new ThreadPoolExecutor(2, 3,
1351 >                                   LONG_DELAY_MS, MILLISECONDS,
1352 >                                   new ArrayBlockingQueue<Runnable>(10));
1353          try {
1354 <            tpe.setMaximumPoolSize(-1);
1354 >            p.setMaximumPoolSize(-1);
1355              shouldThrow();
1356 <        } catch(IllegalArgumentException success){
1356 >        } catch (IllegalArgumentException success) {
1357          } finally {
1358 <            tpe.shutdown();
1358 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1359 >        }
1360 >        joinPool(p);
1361 >    }
1362 >
1363 >    /**
1364 >     * Configuration changes that allow core pool size greater than
1365 >     * max pool size result in IllegalArgumentException.
1366 >     */
1367 >    public void testPoolSizeInvariants() {
1368 >        ThreadPoolExecutor p =
1369 >            new ThreadPoolExecutor(1, 1,
1370 >                                   LONG_DELAY_MS, MILLISECONDS,
1371 >                                   new ArrayBlockingQueue<Runnable>(10));
1372 >        for (int s = 1; s < 5; s++) {
1373 >            p.setMaximumPoolSize(s);
1374 >            p.setCorePoolSize(s);
1375 >            try {
1376 >                p.setMaximumPoolSize(s - 1);
1377 >                shouldThrow();
1378 >            } catch (IllegalArgumentException success) {}
1379 >            assertEquals(s, p.getCorePoolSize());
1380 >            assertEquals(s, p.getMaximumPoolSize());
1381 >            try {
1382 >                p.setCorePoolSize(s + 1);
1383 >                shouldThrow();
1384 >            } catch (IllegalArgumentException success) {}
1385 >            assertEquals(s, p.getCorePoolSize());
1386 >            assertEquals(s, p.getMaximumPoolSize());
1387          }
1388 <        joinPool(tpe);
1388 >        joinPool(p);
1389      }
976    
1390  
1391      /**
1392 <     *  setKeepAliveTime  throws IllegalArgumentException
1393 <     *  when given a negative value
1392 >     * setKeepAliveTime throws IllegalArgumentException
1393 >     * when given a negative value
1394       */
1395      public void testKeepAliveTimeIllegalArgumentException() {
1396 <        ThreadPoolExecutor tpe = null;
1396 >        ThreadPoolExecutor p =
1397 >            new ThreadPoolExecutor(2, 3,
1398 >                                   LONG_DELAY_MS, MILLISECONDS,
1399 >                                   new ArrayBlockingQueue<Runnable>(10));
1400          try {
1401 <            tpe = new ThreadPoolExecutor(2,3,LONG_DELAY_MS, TimeUnit.MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
986 <        } catch(Exception e){}
987 <        
988 <        try {
989 <            tpe.setKeepAliveTime(-1,TimeUnit.MILLISECONDS);
1401 >            p.setKeepAliveTime(-1,MILLISECONDS);
1402              shouldThrow();
1403 <        } catch(IllegalArgumentException success){
1403 >        } catch (IllegalArgumentException success) {
1404          } finally {
1405 <            tpe.shutdown();
1405 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1406          }
1407 <        joinPool(tpe);
1407 >        joinPool(p);
1408      }
1409  
1410      /**
1411       * terminated() is called on termination
1412       */
1413      public void testTerminated() {
1414 <        ExtendedTPE tpe = new ExtendedTPE();
1415 <        tpe.shutdown();
1416 <        assertTrue(tpe.terminatedCalled);
1417 <        joinPool(tpe);
1414 >        ExtendedTPE p = new ExtendedTPE();
1415 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
1416 >        assertTrue(p.terminatedCalled());
1417 >        joinPool(p);
1418      }
1419  
1420      /**
1421       * beforeExecute and afterExecute are called when executing task
1422       */
1423 <    public void testBeforeAfter() {
1424 <        ExtendedTPE tpe = new ExtendedTPE();
1423 >    public void testBeforeAfter() throws InterruptedException {
1424 >        ExtendedTPE p = new ExtendedTPE();
1425          try {
1426 <            TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1427 <            tpe.execute(r);
1428 <            Thread.sleep(SHORT_DELAY_MS);
1429 <            assertTrue(r.done);
1430 <            assertTrue(tpe.beforeCalled);
1431 <            assertTrue(tpe.afterCalled);
1432 <            tpe.shutdown();
1433 <        }
1434 <        catch(Exception ex) {
1435 <            unexpectedException();
1426 >            final CountDownLatch done = new CountDownLatch(1);
1427 >            p.execute(new CheckedRunnable() {
1428 >                public void realRun() {
1429 >                    done.countDown();
1430 >                }});
1431 >            await(p.afterCalled);
1432 >            assertEquals(0, done.getCount());
1433 >            assertTrue(p.afterCalled());
1434 >            assertTrue(p.beforeCalled());
1435 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
1436          } finally {
1437 <            joinPool(tpe);
1437 >            joinPool(p);
1438          }
1439      }
1440  
1441      /**
1442       * completed submit of callable returns result
1443       */
1444 <    public void testSubmitCallable() {
1445 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1444 >    public void testSubmitCallable() throws Exception {
1445 >        ExecutorService e =
1446 >            new ThreadPoolExecutor(2, 2,
1447 >                                   LONG_DELAY_MS, MILLISECONDS,
1448 >                                   new ArrayBlockingQueue<Runnable>(10));
1449          try {
1450              Future<String> future = e.submit(new StringTask());
1451              String result = future.get();
1452              assertSame(TEST_STRING, result);
1038        }
1039        catch (ExecutionException ex) {
1040            unexpectedException();
1041        }
1042        catch (InterruptedException ex) {
1043            unexpectedException();
1453          } finally {
1454              joinPool(e);
1455          }
# Line 1049 | Line 1458 | public class ThreadPoolExecutorTest exte
1458      /**
1459       * completed submit of runnable returns successfully
1460       */
1461 <    public void testSubmitRunnable() {
1462 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1461 >    public void testSubmitRunnable() throws Exception {
1462 >        ExecutorService e =
1463 >            new ThreadPoolExecutor(2, 2,
1464 >                                   LONG_DELAY_MS, MILLISECONDS,
1465 >                                   new ArrayBlockingQueue<Runnable>(10));
1466          try {
1467              Future<?> future = e.submit(new NoOpRunnable());
1468              future.get();
1469              assertTrue(future.isDone());
1058        }
1059        catch (ExecutionException ex) {
1060            unexpectedException();
1061        }
1062        catch (InterruptedException ex) {
1063            unexpectedException();
1470          } finally {
1471              joinPool(e);
1472          }
# Line 1069 | Line 1475 | public class ThreadPoolExecutorTest exte
1475      /**
1476       * completed submit of (runnable, result) returns result
1477       */
1478 <    public void testSubmitRunnable2() {
1479 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1478 >    public void testSubmitRunnable2() throws Exception {
1479 >        ExecutorService e =
1480 >            new ThreadPoolExecutor(2, 2,
1481 >                                   LONG_DELAY_MS, MILLISECONDS,
1482 >                                   new ArrayBlockingQueue<Runnable>(10));
1483          try {
1484              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1485              String result = future.get();
1486              assertSame(TEST_STRING, result);
1078        }
1079        catch (ExecutionException ex) {
1080            unexpectedException();
1081        }
1082        catch (InterruptedException ex) {
1083            unexpectedException();
1487          } finally {
1488              joinPool(e);
1489          }
1490      }
1491  
1089
1090
1091
1092
1492      /**
1493       * invokeAny(null) throws NPE
1494       */
1495 <    public void testInvokeAny1() {
1496 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1495 >    public void testInvokeAny1() throws Exception {
1496 >        ExecutorService e =
1497 >            new ThreadPoolExecutor(2, 2,
1498 >                                   LONG_DELAY_MS, MILLISECONDS,
1499 >                                   new ArrayBlockingQueue<Runnable>(10));
1500          try {
1501              e.invokeAny(null);
1502 +            shouldThrow();
1503          } catch (NullPointerException success) {
1101        } catch(Exception ex) {
1102            unexpectedException();
1504          } finally {
1505              joinPool(e);
1506          }
# Line 1108 | Line 1509 | public class ThreadPoolExecutorTest exte
1509      /**
1510       * invokeAny(empty collection) throws IAE
1511       */
1512 <    public void testInvokeAny2() {
1513 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1512 >    public void testInvokeAny2() throws Exception {
1513 >        ExecutorService e =
1514 >            new ThreadPoolExecutor(2, 2,
1515 >                                   LONG_DELAY_MS, MILLISECONDS,
1516 >                                   new ArrayBlockingQueue<Runnable>(10));
1517          try {
1518              e.invokeAny(new ArrayList<Callable<String>>());
1519 +            shouldThrow();
1520          } catch (IllegalArgumentException success) {
1116        } catch(Exception ex) {
1117            unexpectedException();
1521          } finally {
1522              joinPool(e);
1523          }
# Line 1123 | Line 1526 | public class ThreadPoolExecutorTest exte
1526      /**
1527       * invokeAny(c) throws NPE if c has null elements
1528       */
1529 <    public void testInvokeAny3() {
1530 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1529 >    public void testInvokeAny3() throws Exception {
1530 >        final CountDownLatch latch = new CountDownLatch(1);
1531 >        final ExecutorService e =
1532 >            new ThreadPoolExecutor(2, 2,
1533 >                                   LONG_DELAY_MS, MILLISECONDS,
1534 >                                   new ArrayBlockingQueue<Runnable>(10));
1535 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1536 >        l.add(latchAwaitingStringTask(latch));
1537 >        l.add(null);
1538          try {
1129            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1130            l.add(new StringTask());
1131            l.add(null);
1539              e.invokeAny(l);
1540 +            shouldThrow();
1541          } catch (NullPointerException success) {
1134        } catch(Exception ex) {
1135            unexpectedException();
1542          } finally {
1543 +            latch.countDown();
1544              joinPool(e);
1545          }
1546      }
# Line 1141 | Line 1548 | public class ThreadPoolExecutorTest exte
1548      /**
1549       * invokeAny(c) throws ExecutionException if no task completes
1550       */
1551 <    public void testInvokeAny4() {
1552 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1551 >    public void testInvokeAny4() throws Exception {
1552 >        ExecutorService e =
1553 >            new ThreadPoolExecutor(2, 2,
1554 >                                   LONG_DELAY_MS, MILLISECONDS,
1555 >                                   new ArrayBlockingQueue<Runnable>(10));
1556 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1557 >        l.add(new NPETask());
1558          try {
1147            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1148            l.add(new NPETask());
1559              e.invokeAny(l);
1560 +            shouldThrow();
1561          } catch (ExecutionException success) {
1562 <        } catch(Exception ex) {
1152 <            unexpectedException();
1562 >            assertTrue(success.getCause() instanceof NullPointerException);
1563          } finally {
1564              joinPool(e);
1565          }
# Line 1158 | Line 1568 | public class ThreadPoolExecutorTest exte
1568      /**
1569       * invokeAny(c) returns result of some task
1570       */
1571 <    public void testInvokeAny5() {
1572 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1571 >    public void testInvokeAny5() throws Exception {
1572 >        ExecutorService e =
1573 >            new ThreadPoolExecutor(2, 2,
1574 >                                   LONG_DELAY_MS, MILLISECONDS,
1575 >                                   new ArrayBlockingQueue<Runnable>(10));
1576          try {
1577 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1577 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1578              l.add(new StringTask());
1579              l.add(new StringTask());
1580              String result = e.invokeAny(l);
1581              assertSame(TEST_STRING, result);
1169        } catch (ExecutionException success) {
1170        } catch(Exception ex) {
1171            unexpectedException();
1582          } finally {
1583              joinPool(e);
1584          }
# Line 1177 | Line 1587 | public class ThreadPoolExecutorTest exte
1587      /**
1588       * invokeAll(null) throws NPE
1589       */
1590 <    public void testInvokeAll1() {
1591 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1590 >    public void testInvokeAll1() throws Exception {
1591 >        ExecutorService e =
1592 >            new ThreadPoolExecutor(2, 2,
1593 >                                   LONG_DELAY_MS, MILLISECONDS,
1594 >                                   new ArrayBlockingQueue<Runnable>(10));
1595          try {
1596              e.invokeAll(null);
1597 +            shouldThrow();
1598          } catch (NullPointerException success) {
1185        } catch(Exception ex) {
1186            unexpectedException();
1599          } finally {
1600              joinPool(e);
1601          }
# Line 1192 | Line 1604 | public class ThreadPoolExecutorTest exte
1604      /**
1605       * invokeAll(empty collection) returns empty collection
1606       */
1607 <    public void testInvokeAll2() {
1608 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1607 >    public void testInvokeAll2() throws InterruptedException {
1608 >        ExecutorService e =
1609 >            new ThreadPoolExecutor(2, 2,
1610 >                                   LONG_DELAY_MS, MILLISECONDS,
1611 >                                   new ArrayBlockingQueue<Runnable>(10));
1612          try {
1613              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1614              assertTrue(r.isEmpty());
1200        } catch(Exception ex) {
1201            unexpectedException();
1615          } finally {
1616              joinPool(e);
1617          }
# Line 1207 | Line 1620 | public class ThreadPoolExecutorTest exte
1620      /**
1621       * invokeAll(c) throws NPE if c has null elements
1622       */
1623 <    public void testInvokeAll3() {
1624 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1623 >    public void testInvokeAll3() throws Exception {
1624 >        ExecutorService e =
1625 >            new ThreadPoolExecutor(2, 2,
1626 >                                   LONG_DELAY_MS, MILLISECONDS,
1627 >                                   new ArrayBlockingQueue<Runnable>(10));
1628 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1629 >        l.add(new StringTask());
1630 >        l.add(null);
1631          try {
1213            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1214            l.add(new StringTask());
1215            l.add(null);
1632              e.invokeAll(l);
1633 +            shouldThrow();
1634          } catch (NullPointerException success) {
1218        } catch(Exception ex) {
1219            unexpectedException();
1635          } finally {
1636              joinPool(e);
1637          }
# Line 1225 | Line 1640 | public class ThreadPoolExecutorTest exte
1640      /**
1641       * get of element of invokeAll(c) throws exception on failed task
1642       */
1643 <    public void testInvokeAll4() {
1644 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1643 >    public void testInvokeAll4() throws Exception {
1644 >        ExecutorService e =
1645 >            new ThreadPoolExecutor(2, 2,
1646 >                                   LONG_DELAY_MS, MILLISECONDS,
1647 >                                   new ArrayBlockingQueue<Runnable>(10));
1648          try {
1649 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1649 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1650              l.add(new NPETask());
1651 <            List<Future<String>> result = e.invokeAll(l);
1652 <            assertEquals(1, result.size());
1653 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1654 <                it.next().get();
1655 <        } catch(ExecutionException success) {
1656 <        } catch(Exception ex) {
1657 <            unexpectedException();
1651 >            List<Future<String>> futures = e.invokeAll(l);
1652 >            assertEquals(1, futures.size());
1653 >            try {
1654 >                futures.get(0).get();
1655 >                shouldThrow();
1656 >            } catch (ExecutionException success) {
1657 >                assertTrue(success.getCause() instanceof NullPointerException);
1658 >            }
1659          } finally {
1660              joinPool(e);
1661          }
# Line 1245 | Line 1664 | public class ThreadPoolExecutorTest exte
1664      /**
1665       * invokeAll(c) returns results of all completed tasks
1666       */
1667 <    public void testInvokeAll5() {
1668 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1667 >    public void testInvokeAll5() throws Exception {
1668 >        ExecutorService e =
1669 >            new ThreadPoolExecutor(2, 2,
1670 >                                   LONG_DELAY_MS, MILLISECONDS,
1671 >                                   new ArrayBlockingQueue<Runnable>(10));
1672          try {
1673 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1673 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1674              l.add(new StringTask());
1675              l.add(new StringTask());
1676 <            List<Future<String>> result = e.invokeAll(l);
1677 <            assertEquals(2, result.size());
1678 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1679 <                assertSame(TEST_STRING, it.next().get());
1258 <        } catch (ExecutionException success) {
1259 <        } catch(Exception ex) {
1260 <            unexpectedException();
1676 >            List<Future<String>> futures = e.invokeAll(l);
1677 >            assertEquals(2, futures.size());
1678 >            for (Future<String> future : futures)
1679 >                assertSame(TEST_STRING, future.get());
1680          } finally {
1681              joinPool(e);
1682          }
1683      }
1684  
1266
1267
1685      /**
1686       * timed invokeAny(null) throws NPE
1687       */
1688 <    public void testTimedInvokeAny1() {
1689 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1688 >    public void testTimedInvokeAny1() throws Exception {
1689 >        ExecutorService e =
1690 >            new ThreadPoolExecutor(2, 2,
1691 >                                   LONG_DELAY_MS, MILLISECONDS,
1692 >                                   new ArrayBlockingQueue<Runnable>(10));
1693          try {
1694 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1694 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1695 >            shouldThrow();
1696          } catch (NullPointerException success) {
1276        } catch(Exception ex) {
1277            unexpectedException();
1697          } finally {
1698              joinPool(e);
1699          }
# Line 1283 | Line 1702 | public class ThreadPoolExecutorTest exte
1702      /**
1703       * timed invokeAny(,,null) throws NPE
1704       */
1705 <    public void testTimedInvokeAnyNullTimeUnit() {
1706 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1705 >    public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1706 >        ExecutorService e =
1707 >            new ThreadPoolExecutor(2, 2,
1708 >                                   LONG_DELAY_MS, MILLISECONDS,
1709 >                                   new ArrayBlockingQueue<Runnable>(10));
1710 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1711 >        l.add(new StringTask());
1712          try {
1289            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1290            l.add(new StringTask());
1713              e.invokeAny(l, MEDIUM_DELAY_MS, null);
1714 +            shouldThrow();
1715          } catch (NullPointerException success) {
1293        } catch(Exception ex) {
1294            unexpectedException();
1716          } finally {
1717              joinPool(e);
1718          }
# Line 1300 | Line 1721 | public class ThreadPoolExecutorTest exte
1721      /**
1722       * timed invokeAny(empty collection) throws IAE
1723       */
1724 <    public void testTimedInvokeAny2() {
1725 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1724 >    public void testTimedInvokeAny2() throws Exception {
1725 >        ExecutorService e =
1726 >            new ThreadPoolExecutor(2, 2,
1727 >                                   LONG_DELAY_MS, MILLISECONDS,
1728 >                                   new ArrayBlockingQueue<Runnable>(10));
1729          try {
1730 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1730 >            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1731 >            shouldThrow();
1732          } catch (IllegalArgumentException success) {
1308        } catch(Exception ex) {
1309            unexpectedException();
1733          } finally {
1734              joinPool(e);
1735          }
# Line 1315 | Line 1738 | public class ThreadPoolExecutorTest exte
1738      /**
1739       * timed invokeAny(c) throws NPE if c has null elements
1740       */
1741 <    public void testTimedInvokeAny3() {
1742 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1741 >    public void testTimedInvokeAny3() throws Exception {
1742 >        final CountDownLatch latch = new CountDownLatch(1);
1743 >        final ExecutorService e =
1744 >            new ThreadPoolExecutor(2, 2,
1745 >                                   LONG_DELAY_MS, MILLISECONDS,
1746 >                                   new ArrayBlockingQueue<Runnable>(10));
1747 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1748 >        l.add(latchAwaitingStringTask(latch));
1749 >        l.add(null);
1750          try {
1751 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1752 <            l.add(new StringTask());
1323 <            l.add(null);
1324 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1751 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1752 >            shouldThrow();
1753          } catch (NullPointerException success) {
1326        } catch(Exception ex) {
1327            ex.printStackTrace();
1328            unexpectedException();
1754          } finally {
1755 +            latch.countDown();
1756              joinPool(e);
1757          }
1758      }
# Line 1334 | Line 1760 | public class ThreadPoolExecutorTest exte
1760      /**
1761       * timed invokeAny(c) throws ExecutionException if no task completes
1762       */
1763 <    public void testTimedInvokeAny4() {
1764 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1763 >    public void testTimedInvokeAny4() throws Exception {
1764 >        ExecutorService e =
1765 >            new ThreadPoolExecutor(2, 2,
1766 >                                   LONG_DELAY_MS, MILLISECONDS,
1767 >                                   new ArrayBlockingQueue<Runnable>(10));
1768 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1769 >        l.add(new NPETask());
1770          try {
1771 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1772 <            l.add(new NPETask());
1773 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1774 <        } catch(ExecutionException success) {
1344 <        } catch(Exception ex) {
1345 <            unexpectedException();
1771 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1772 >            shouldThrow();
1773 >        } catch (ExecutionException success) {
1774 >            assertTrue(success.getCause() instanceof NullPointerException);
1775          } finally {
1776              joinPool(e);
1777          }
# Line 1351 | Line 1780 | public class ThreadPoolExecutorTest exte
1780      /**
1781       * timed invokeAny(c) returns result of some task
1782       */
1783 <    public void testTimedInvokeAny5() {
1784 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1783 >    public void testTimedInvokeAny5() throws Exception {
1784 >        ExecutorService e =
1785 >            new ThreadPoolExecutor(2, 2,
1786 >                                   LONG_DELAY_MS, MILLISECONDS,
1787 >                                   new ArrayBlockingQueue<Runnable>(10));
1788          try {
1789 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1789 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1790              l.add(new StringTask());
1791              l.add(new StringTask());
1792 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1792 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1793              assertSame(TEST_STRING, result);
1362        } catch (ExecutionException success) {
1363        } catch(Exception ex) {
1364            unexpectedException();
1794          } finally {
1795              joinPool(e);
1796          }
# Line 1370 | Line 1799 | public class ThreadPoolExecutorTest exte
1799      /**
1800       * timed invokeAll(null) throws NPE
1801       */
1802 <    public void testTimedInvokeAll1() {
1803 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1802 >    public void testTimedInvokeAll1() throws Exception {
1803 >        ExecutorService e =
1804 >            new ThreadPoolExecutor(2, 2,
1805 >                                   LONG_DELAY_MS, MILLISECONDS,
1806 >                                   new ArrayBlockingQueue<Runnable>(10));
1807          try {
1808 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1808 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1809 >            shouldThrow();
1810          } catch (NullPointerException success) {
1378        } catch(Exception ex) {
1379            unexpectedException();
1811          } finally {
1812              joinPool(e);
1813          }
# Line 1385 | Line 1816 | public class ThreadPoolExecutorTest exte
1816      /**
1817       * timed invokeAll(,,null) throws NPE
1818       */
1819 <    public void testTimedInvokeAllNullTimeUnit() {
1820 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1819 >    public void testTimedInvokeAllNullTimeUnit() throws Exception {
1820 >        ExecutorService e =
1821 >            new ThreadPoolExecutor(2, 2,
1822 >                                   LONG_DELAY_MS, MILLISECONDS,
1823 >                                   new ArrayBlockingQueue<Runnable>(10));
1824 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1825 >        l.add(new StringTask());
1826          try {
1391            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1392            l.add(new StringTask());
1827              e.invokeAll(l, MEDIUM_DELAY_MS, null);
1828 +            shouldThrow();
1829          } catch (NullPointerException success) {
1395        } catch(Exception ex) {
1396            unexpectedException();
1830          } finally {
1831              joinPool(e);
1832          }
# Line 1402 | Line 1835 | public class ThreadPoolExecutorTest exte
1835      /**
1836       * timed invokeAll(empty collection) returns empty collection
1837       */
1838 <    public void testTimedInvokeAll2() {
1839 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1838 >    public void testTimedInvokeAll2() throws InterruptedException {
1839 >        ExecutorService e =
1840 >            new ThreadPoolExecutor(2, 2,
1841 >                                   LONG_DELAY_MS, MILLISECONDS,
1842 >                                   new ArrayBlockingQueue<Runnable>(10));
1843          try {
1844 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1844 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1845              assertTrue(r.isEmpty());
1410        } catch(Exception ex) {
1411            unexpectedException();
1846          } finally {
1847              joinPool(e);
1848          }
# Line 1417 | Line 1851 | public class ThreadPoolExecutorTest exte
1851      /**
1852       * timed invokeAll(c) throws NPE if c has null elements
1853       */
1854 <    public void testTimedInvokeAll3() {
1855 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1854 >    public void testTimedInvokeAll3() throws Exception {
1855 >        ExecutorService e =
1856 >            new ThreadPoolExecutor(2, 2,
1857 >                                   LONG_DELAY_MS, MILLISECONDS,
1858 >                                   new ArrayBlockingQueue<Runnable>(10));
1859 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1860 >        l.add(new StringTask());
1861 >        l.add(null);
1862          try {
1863 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1864 <            l.add(new StringTask());
1425 <            l.add(null);
1426 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1863 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1864 >            shouldThrow();
1865          } catch (NullPointerException success) {
1428        } catch(Exception ex) {
1429            unexpectedException();
1866          } finally {
1867              joinPool(e);
1868          }
# Line 1435 | Line 1871 | public class ThreadPoolExecutorTest exte
1871      /**
1872       * get of element of invokeAll(c) throws exception on failed task
1873       */
1874 <    public void testTimedInvokeAll4() {
1875 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1874 >    public void testTimedInvokeAll4() throws Exception {
1875 >        ExecutorService e =
1876 >            new ThreadPoolExecutor(2, 2,
1877 >                                   LONG_DELAY_MS, MILLISECONDS,
1878 >                                   new ArrayBlockingQueue<Runnable>(10));
1879 >        List<Callable<String>> l = new ArrayList<Callable<String>>();
1880 >        l.add(new NPETask());
1881 >        List<Future<String>> futures =
1882 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1883 >        assertEquals(1, futures.size());
1884          try {
1885 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1886 <            l.add(new NPETask());
1887 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1888 <            assertEquals(1, result.size());
1445 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1446 <                it.next().get();
1447 <        } catch(ExecutionException success) {
1448 <        } catch(Exception ex) {
1449 <            unexpectedException();
1885 >            futures.get(0).get();
1886 >            shouldThrow();
1887 >        } catch (ExecutionException success) {
1888 >            assertTrue(success.getCause() instanceof NullPointerException);
1889          } finally {
1890              joinPool(e);
1891          }
# Line 1455 | Line 1894 | public class ThreadPoolExecutorTest exte
1894      /**
1895       * timed invokeAll(c) returns results of all completed tasks
1896       */
1897 <    public void testTimedInvokeAll5() {
1898 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1897 >    public void testTimedInvokeAll5() throws Exception {
1898 >        ExecutorService e =
1899 >            new ThreadPoolExecutor(2, 2,
1900 >                                   LONG_DELAY_MS, MILLISECONDS,
1901 >                                   new ArrayBlockingQueue<Runnable>(10));
1902          try {
1903 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1903 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1904              l.add(new StringTask());
1905              l.add(new StringTask());
1906 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1907 <            assertEquals(2, result.size());
1908 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1909 <                assertSame(TEST_STRING, it.next().get());
1910 <        } catch (ExecutionException success) {
1469 <        } catch(Exception ex) {
1470 <            unexpectedException();
1906 >            List<Future<String>> futures =
1907 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1908 >            assertEquals(2, futures.size());
1909 >            for (Future<String> future : futures)
1910 >                assertSame(TEST_STRING, future.get());
1911          } finally {
1912              joinPool(e);
1913          }
# Line 1476 | Line 1916 | public class ThreadPoolExecutorTest exte
1916      /**
1917       * timed invokeAll(c) cancels tasks not completed by timeout
1918       */
1919 <    public void testTimedInvokeAll6() {
1920 <        ExecutorService e = new ThreadPoolExecutor(2, 2, LONG_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1919 >    public void testTimedInvokeAll6() throws Exception {
1920 >        ExecutorService e =
1921 >            new ThreadPoolExecutor(2, 2,
1922 >                                   LONG_DELAY_MS, MILLISECONDS,
1923 >                                   new ArrayBlockingQueue<Runnable>(10));
1924 >        try {
1925 >            for (long timeout = timeoutMillis();;) {
1926 >                List<Callable<String>> tasks = new ArrayList<>();
1927 >                tasks.add(new StringTask("0"));
1928 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1929 >                tasks.add(new StringTask("2"));
1930 >                long startTime = System.nanoTime();
1931 >                List<Future<String>> futures =
1932 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1933 >                assertEquals(tasks.size(), futures.size());
1934 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1935 >                for (Future future : futures)
1936 >                    assertTrue(future.isDone());
1937 >                assertTrue(futures.get(1).isCancelled());
1938 >                try {
1939 >                    assertEquals("0", futures.get(0).get());
1940 >                    assertEquals("2", futures.get(2).get());
1941 >                    break;
1942 >                } catch (CancellationException retryWithLongerTimeout) {
1943 >                    timeout *= 2;
1944 >                    if (timeout >= LONG_DELAY_MS / 2)
1945 >                        fail("expected exactly one task to be cancelled");
1946 >                }
1947 >            }
1948 >        } finally {
1949 >            joinPool(e);
1950 >        }
1951 >    }
1952 >
1953 >    /**
1954 >     * Execution continues if there is at least one thread even if
1955 >     * thread factory fails to create more
1956 >     */
1957 >    public void testFailingThreadFactory() throws InterruptedException {
1958 >        final ExecutorService e =
1959 >            new ThreadPoolExecutor(100, 100,
1960 >                                   LONG_DELAY_MS, MILLISECONDS,
1961 >                                   new LinkedBlockingQueue<Runnable>(),
1962 >                                   new FailingThreadFactory());
1963          try {
1964 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1965 <            l.add(new StringTask());
1966 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1967 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
1968 <            assertEquals(2, result.size());
1969 <            Iterator<Future<String>> it = result.iterator();
1970 <            Future<String> f1 = it.next();
1971 <            Future<String> f2 = it.next();
1490 <            assertTrue(f1.isDone());
1491 <            assertFalse(f1.isCancelled());
1492 <            assertTrue(f2.isDone());
1493 <            assertTrue(f2.isCancelled());
1494 <        } catch(Exception ex) {
1495 <            unexpectedException();
1964 >            final int TASKS = 100;
1965 >            final CountDownLatch done = new CountDownLatch(TASKS);
1966 >            for (int k = 0; k < TASKS; ++k)
1967 >                e.execute(new CheckedRunnable() {
1968 >                    public void realRun() {
1969 >                        done.countDown();
1970 >                    }});
1971 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1972          } finally {
1973              joinPool(e);
1974          }
1975      }
1976  
1977 +    /**
1978 +     * allowsCoreThreadTimeOut is by default false.
1979 +     */
1980 +    public void testAllowsCoreThreadTimeOut() {
1981 +        final ThreadPoolExecutor p =
1982 +            new ThreadPoolExecutor(2, 2,
1983 +                                   1000, MILLISECONDS,
1984 +                                   new ArrayBlockingQueue<Runnable>(10));
1985 +        assertFalse(p.allowsCoreThreadTimeOut());
1986 +        joinPool(p);
1987 +    }
1988 +
1989 +    /**
1990 +     * allowCoreThreadTimeOut(true) causes idle threads to time out
1991 +     */
1992 +    public void testAllowCoreThreadTimeOut_true() throws Exception {
1993 +        long keepAliveTime = timeoutMillis();
1994 +        final ThreadPoolExecutor p =
1995 +            new ThreadPoolExecutor(2, 10,
1996 +                                   keepAliveTime, MILLISECONDS,
1997 +                                   new ArrayBlockingQueue<Runnable>(10));
1998 +        final CountDownLatch threadStarted = new CountDownLatch(1);
1999 +        try {
2000 +            p.allowCoreThreadTimeOut(true);
2001 +            p.execute(new CheckedRunnable() {
2002 +                public void realRun() {
2003 +                    threadStarted.countDown();
2004 +                    assertEquals(1, p.getPoolSize());
2005 +                }});
2006 +            await(threadStarted);
2007 +            delay(keepAliveTime);
2008 +            long startTime = System.nanoTime();
2009 +            while (p.getPoolSize() > 0
2010 +                   && millisElapsedSince(startTime) < LONG_DELAY_MS)
2011 +                Thread.yield();
2012 +            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
2013 +            assertEquals(0, p.getPoolSize());
2014 +        } finally {
2015 +            joinPool(p);
2016 +        }
2017 +    }
2018 +
2019 +    /**
2020 +     * allowCoreThreadTimeOut(false) causes idle threads not to time out
2021 +     */
2022 +    public void testAllowCoreThreadTimeOut_false() throws Exception {
2023 +        long keepAliveTime = timeoutMillis();
2024 +        final ThreadPoolExecutor p =
2025 +            new ThreadPoolExecutor(2, 10,
2026 +                                   keepAliveTime, MILLISECONDS,
2027 +                                   new ArrayBlockingQueue<Runnable>(10));
2028 +        final CountDownLatch threadStarted = new CountDownLatch(1);
2029 +        try {
2030 +            p.allowCoreThreadTimeOut(false);
2031 +            p.execute(new CheckedRunnable() {
2032 +                public void realRun() throws InterruptedException {
2033 +                    threadStarted.countDown();
2034 +                    assertTrue(p.getPoolSize() >= 1);
2035 +                }});
2036 +            delay(2 * keepAliveTime);
2037 +            assertTrue(p.getPoolSize() >= 1);
2038 +        } finally {
2039 +            joinPool(p);
2040 +        }
2041 +    }
2042 +
2043 +    /**
2044 +     * execute allows the same task to be submitted multiple times, even
2045 +     * if rejected
2046 +     */
2047 +    public void testRejectedRecycledTask() throws InterruptedException {
2048 +        final int nTasks = 1000;
2049 +        final CountDownLatch done = new CountDownLatch(nTasks);
2050 +        final Runnable recycledTask = new Runnable() {
2051 +            public void run() {
2052 +                done.countDown();
2053 +            }};
2054 +        final ThreadPoolExecutor p =
2055 +            new ThreadPoolExecutor(1, 30,
2056 +                                   60, SECONDS,
2057 +                                   new ArrayBlockingQueue(30));
2058 +        try {
2059 +            for (int i = 0; i < nTasks; ++i) {
2060 +                for (;;) {
2061 +                    try {
2062 +                        p.execute(recycledTask);
2063 +                        break;
2064 +                    }
2065 +                    catch (RejectedExecutionException ignore) {}
2066 +                }
2067 +            }
2068 +            // enough time to run all tasks
2069 +            assertTrue(done.await(nTasks * SHORT_DELAY_MS, MILLISECONDS));
2070 +        } finally {
2071 +            joinPool(p);
2072 +        }
2073 +    }
2074 +
2075 +    /**
2076 +     * get(cancelled task) throws CancellationException
2077 +     */
2078 +    public void testGet_cancelled() throws Exception {
2079 +        final ExecutorService e =
2080 +            new ThreadPoolExecutor(1, 1,
2081 +                                   LONG_DELAY_MS, MILLISECONDS,
2082 +                                   new LinkedBlockingQueue<Runnable>());
2083 +        try {
2084 +            final CountDownLatch blockerStarted = new CountDownLatch(1);
2085 +            final CountDownLatch done = new CountDownLatch(1);
2086 +            final List<Future<?>> futures = new ArrayList<>();
2087 +            for (int i = 0; i < 2; i++) {
2088 +                Runnable r = new CheckedRunnable() { public void realRun()
2089 +                                                         throws Throwable {
2090 +                    blockerStarted.countDown();
2091 +                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
2092 +                }};
2093 +                futures.add(e.submit(r));
2094 +            }
2095 +            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2096 +            for (Future<?> future : futures) future.cancel(false);
2097 +            for (Future<?> future : futures) {
2098 +                try {
2099 +                    future.get();
2100 +                    shouldThrow();
2101 +                } catch (CancellationException success) {}
2102 +                try {
2103 +                    future.get(LONG_DELAY_MS, MILLISECONDS);
2104 +                    shouldThrow();
2105 +                } catch (CancellationException success) {}
2106 +                assertTrue(future.isCancelled());
2107 +                assertTrue(future.isDone());
2108 +            }
2109 +            done.countDown();
2110 +        } finally {
2111 +            joinPool(e);
2112 +        }
2113 +    }
2114  
2115   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines