ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ForkJoinPoolTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ForkJoinPoolTest.java (file contents):
Revision 1.3 by jsr166, Fri Jul 31 23:38:15 2009 UTC vs.
Revision 1.31 by jsr166, Sat Oct 9 19:46:42 2010 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/licenses/publicdomain
5   */
6  
7
7   import junit.framework.*;
8 < import java.util.*;
9 < import java.util.concurrent.*;
10 < import java.util.concurrent.locks.*;
11 < import java.security.*;
8 > import java.util.ArrayList;
9 > import java.util.Collection;
10 > import java.util.List;
11 > import java.util.concurrent.Executors;
12 > import java.util.concurrent.ExecutorService;
13 > import java.util.concurrent.AbstractExecutorService;
14 > import java.util.concurrent.CountDownLatch;
15 > import java.util.concurrent.Callable;
16 > import java.util.concurrent.Future;
17 > import java.util.concurrent.ExecutionException;
18 > import java.util.concurrent.CancellationException;
19 > import java.util.concurrent.RejectedExecutionException;
20 > import java.util.concurrent.ForkJoinPool;
21 > import java.util.concurrent.ForkJoinTask;
22 > import java.util.concurrent.ForkJoinWorkerThread;
23 > import java.util.concurrent.RecursiveTask;
24 > import java.util.concurrent.TimeUnit;
25 > import java.util.concurrent.locks.ReentrantLock;
26 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
27 > import java.security.AccessControlException;
28 > import java.security.Policy;
29 > import java.security.PrivilegedAction;
30 > import java.security.PrivilegedExceptionAction;
31  
32   public class ForkJoinPoolTest extends JSR166TestCase {
33      public static void main(String[] args) {
34 <        junit.textui.TestRunner.run (suite());
34 >        junit.textui.TestRunner.run(suite());
35      }
36 +
37      public static Test suite() {
38          return new TestSuite(ForkJoinPoolTest.class);
39      }
# Line 38 | Line 57 | public class ForkJoinPoolTest extends JS
57      // Some classes to test extension and factory methods
58  
59      static class MyHandler implements Thread.UncaughtExceptionHandler {
60 <        int catches = 0;
60 >        volatile int catches = 0;
61          public void uncaughtException(Thread t, Throwable e) {
62              ++catches;
63          }
# Line 47 | Line 66 | public class ForkJoinPoolTest extends JS
66      // to test handlers
67      static class FailingFJWSubclass extends ForkJoinWorkerThread {
68          public FailingFJWSubclass(ForkJoinPool p) { super(p) ; }
69 <        protected void onStart() { throw new Error(); }
69 >        protected void onStart() { super.onStart(); throw new Error(); }
70      }
71  
72 <    static class FailingThreadFactory implements ForkJoinPool.ForkJoinWorkerThreadFactory {
73 <        int calls = 0;
72 >    static class FailingThreadFactory
73 >            implements ForkJoinPool.ForkJoinWorkerThreadFactory {
74 >        volatile int calls = 0;
75          public ForkJoinWorkerThread newThread(ForkJoinPool p) {
76              if (++calls > 1) return null;
77              return new FailingFJWSubclass(p);
# Line 135 | Line 155 | public class ForkJoinPoolTest extends JS
155      }
156  
157      /**
158 <     * Succesfully constructed pool reports default factory,
158 >     * Successfully constructed pool reports default factory,
159       * parallelism and async mode policies, no active threads or
160       * tasks, and quiescent running state.
161       */
162      public void testDefaultInitialState() {
163 <        ForkJoinPool p = null;
163 >        ForkJoinPool p = new ForkJoinPool(1);
164          try {
165 <            p = new ForkJoinPool(1);
166 <            assertTrue(p.getFactory() == ForkJoinPool.defaultForkJoinWorkerThreadFactory);
165 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
166 >                       p.getFactory());
167              assertTrue(p.isQuiescent());
148            assertTrue(p.getMaintainsParallelism());
168              assertFalse(p.getAsyncMode());
169 <            assertTrue(p.getActiveThreadCount() == 0);
170 <            assertTrue(p.getStealCount() == 0);
171 <            assertTrue(p.getQueuedTaskCount() == 0);
172 <            assertTrue(p.getQueuedSubmissionCount() == 0);
169 >            assertEquals(0, p.getActiveThreadCount());
170 >            assertEquals(0, p.getStealCount());
171 >            assertEquals(0, p.getQueuedTaskCount());
172 >            assertEquals(0, p.getQueuedSubmissionCount());
173              assertFalse(p.hasQueuedSubmissions());
174              assertFalse(p.isShutdown());
175              assertFalse(p.isTerminating());
# Line 167 | Line 186 | public class ForkJoinPoolTest extends JS
186          try {
187              new ForkJoinPool(-1);
188              shouldThrow();
189 <        }
171 <        catch (IllegalArgumentException success) {}
189 >        } catch (IllegalArgumentException success) {}
190      }
191  
192      /**
# Line 176 | Line 194 | public class ForkJoinPoolTest extends JS
194       */
195      public void testConstructor2() {
196          try {
197 <            new ForkJoinPool(1, null);
197 >            new ForkJoinPool(1, null, null, false);
198              shouldThrow();
199 <        }
182 <        catch (NullPointerException success) {}
199 >        } catch (NullPointerException success) {}
200      }
201  
202  
# Line 187 | Line 204 | public class ForkJoinPoolTest extends JS
204       * getParallelism returns size set in constructor
205       */
206      public void testGetParallelism() {
207 <        ForkJoinPool p = null;
191 <        try {
192 <            p = new ForkJoinPool(1);
193 <            assertTrue(p.getParallelism() == 1);
194 <        } finally {
195 <            joinPool(p);
196 <        }
197 <    }
198 <
199 <    /**
200 <     * setParallelism changes reported parallelism level.
201 <     */
202 <    public void testSetParallelism() {
203 <        ForkJoinPool p = null;
204 <        try {
205 <            p = new ForkJoinPool(1);
206 <            assertTrue(p.getParallelism() == 1);
207 <            p.setParallelism(2);
208 <            assertTrue(p.getParallelism() == 2);
209 <        } finally {
210 <            joinPool(p);
211 <        }
212 <    }
213 <
214 <    /**
215 <     * setParallelism with argument <= 0 throws exception
216 <     */
217 <    public void testSetParallelism2() {
218 <        ForkJoinPool p = null;
207 >        ForkJoinPool p = new ForkJoinPool(1);
208          try {
209 <            p = new ForkJoinPool(1);
221 <            assertTrue(p.getParallelism() == 1);
222 <            p.setParallelism(-2);
223 <            shouldThrow();
224 <        } catch (IllegalArgumentException success) {
209 >            assertEquals(1, p.getParallelism());
210          } finally {
211              joinPool(p);
212          }
# Line 231 | Line 216 | public class ForkJoinPoolTest extends JS
216       * getPoolSize returns number of started workers.
217       */
218      public void testGetPoolSize() {
219 <        ForkJoinPool p = null;
219 >        ForkJoinPool p = new ForkJoinPool(1);
220          try {
221 <            p = new ForkJoinPool(1);
237 <            assertTrue(p.getPoolSize() == 0);
221 >            assertEquals(0, p.getActiveThreadCount());
222              Future<String> future = p.submit(new StringTask());
223 <            assertTrue(p.getPoolSize() == 1);
240 <
241 <        } finally {
242 <            joinPool(p);
243 <        }
244 <    }
245 <
246 <    /**
247 <     * setMaximumPoolSize changes size reported by getMaximumPoolSize.
248 <     */
249 <    public void testSetMaximumPoolSize() {
250 <        ForkJoinPool p = null;
251 <        try {
252 <            p = new ForkJoinPool(1);
253 <            p.setMaximumPoolSize(2);
254 <            assertTrue(p.getMaximumPoolSize() == 2);
255 <        } finally {
256 <            joinPool(p);
257 <        }
258 <    }
259 <
260 <    /**
261 <     * setMaximumPoolSize with argument <= 0 throws exception
262 <     */
263 <    public void testSetMaximumPoolSize2() {
264 <        ForkJoinPool p = null;
265 <        try {
266 <            p = new ForkJoinPool(1);
267 <            p.setMaximumPoolSize(-2);
268 <            shouldThrow();
269 <        } catch (IllegalArgumentException success) {
270 <        } finally {
271 <            joinPool(p);
272 <        }
273 <    }
274 <
275 <    /**
276 <     * setMaintainsParallelism changes policy reported by
277 <     * getMaintainsParallelism.
278 <     */
279 <    public void testSetMaintainsParallelism() {
280 <        ForkJoinPool p = null;
281 <        try {
282 <            p = new ForkJoinPool(1);
283 <            p.setMaintainsParallelism(false);
284 <            assertFalse(p.getMaintainsParallelism());
285 <        } finally {
286 <            joinPool(p);
287 <        }
288 <    }
289 <
290 <    /**
291 <     * setAsyncMode changes policy reported by
292 <     * getAsyncMode.
293 <     */
294 <    public void testSetAsyncMode() {
295 <        ForkJoinPool p = null;
296 <        try {
297 <            p = new ForkJoinPool(1);
298 <            p.setAsyncMode(true);
299 <            assertTrue(p.getAsyncMode());
223 >            assertEquals(1, p.getPoolSize());
224          } finally {
225              joinPool(p);
226          }
# Line 308 | Line 232 | public class ForkJoinPoolTest extends JS
232       * Additionally tests: Overriding ForkJoinWorkerThread.onStart
233       * performs its defined action
234       */
235 <    public void testSetUncaughtExceptionHandler() {
236 <        ForkJoinPool p = null;
237 <        try {
238 <            p = new ForkJoinPool(1, new FailingThreadFactory());
239 <            MyHandler eh = new MyHandler();
240 <            p.setUncaughtExceptionHandler(eh);
241 <            assertEquals(eh, p.getUncaughtExceptionHandler());
242 <            p.execute(new FailingTask());
243 <            Thread.sleep(MEDIUM_DELAY_MS);
244 <            assertTrue(eh.catches > 0);
245 <        } catch (InterruptedException e) {
246 <            unexpectedException();
247 <        } finally {
324 <            joinPool(p);
325 <        }
326 <    }
327 <
328 <    /**
329 <     * setUncaughtExceptionHandler of null removes handler
330 <     */
331 <    public void testSetUncaughtExceptionHandler2() {
332 <        ForkJoinPool p = null;
333 <        try {
334 <            p = new ForkJoinPool(1);
335 <            p.setUncaughtExceptionHandler(null);
336 <            assertNull(p.getUncaughtExceptionHandler());
235 >    public void testSetUncaughtExceptionHandler() throws InterruptedException {
236 >        final CountDownLatch uehInvoked = new CountDownLatch(1);
237 >        final Thread.UncaughtExceptionHandler eh =
238 >            new Thread.UncaughtExceptionHandler() {
239 >                public void uncaughtException(Thread t, Throwable e) {
240 >                    uehInvoked.countDown();
241 >                }};
242 >        ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
243 >                                          eh, false);
244 >        try {
245 >            assertSame(eh, p.getUncaughtExceptionHandler());
246 >            p.execute(new FibTask(8));
247 >            assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
248          } finally {
249 +            p.shutdownNow(); // failure might have prevented processing task
250              joinPool(p);
251          }
252      }
253  
342
254      /**
255       * After invoking a single task, isQuiescent is true,
256       * queues are empty, threads are not active, and
257       * construction parameters continue to hold
258       */
259 <    public void testisQuiescent() {
260 <        ForkJoinPool p = null;
259 >    public void testisQuiescent() throws InterruptedException {
260 >        ForkJoinPool p = new ForkJoinPool(2);
261          try {
262 <            p = new ForkJoinPool(2);
262 >            assertTrue(p.isQuiescent());
263              p.invoke(new FibTask(20));
264 <            assertTrue(p.getFactory() == ForkJoinPool.defaultForkJoinWorkerThreadFactory);
265 <            Thread.sleep(MEDIUM_DELAY_MS);
264 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
265 >                       p.getFactory());
266 >            Thread.sleep(SMALL_DELAY_MS);
267              assertTrue(p.isQuiescent());
356            assertTrue(p.getMaintainsParallelism());
268              assertFalse(p.getAsyncMode());
269 <            assertTrue(p.getActiveThreadCount() == 0);
270 <            assertTrue(p.getQueuedTaskCount() == 0);
271 <            assertTrue(p.getQueuedSubmissionCount() == 0);
269 >            assertEquals(0, p.getActiveThreadCount());
270 >            assertEquals(0, p.getQueuedTaskCount());
271 >            assertEquals(0, p.getQueuedSubmissionCount());
272              assertFalse(p.hasQueuedSubmissions());
273              assertFalse(p.isShutdown());
274              assertFalse(p.isTerminating());
275              assertFalse(p.isTerminated());
365        } catch (InterruptedException e) {
366            unexpectedException();
276          } finally {
277              joinPool(p);
278          }
# Line 372 | Line 281 | public class ForkJoinPoolTest extends JS
281      /**
282       * Completed submit(ForkJoinTask) returns result
283       */
284 <    public void testSubmitForkJoinTask() {
285 <        ForkJoinPool p = null;
284 >    public void testSubmitForkJoinTask() throws Throwable {
285 >        ForkJoinPool p = new ForkJoinPool(1);
286          try {
378            p = new ForkJoinPool(1);
287              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
288 <            int r = f.get();
381 <            assertTrue(r == 21);
382 <        } catch (ExecutionException ex) {
383 <            unexpectedException();
384 <        } catch (InterruptedException ex) {
385 <            unexpectedException();
288 >            assertEquals(21, (int) f.get());
289          } finally {
290              joinPool(p);
291          }
# Line 392 | Line 295 | public class ForkJoinPoolTest extends JS
295       * A task submitted after shutdown is rejected
296       */
297      public void testSubmitAfterShutdown() {
298 <        ForkJoinPool p = null;
298 >        ForkJoinPool p = new ForkJoinPool(1);
299          try {
397            p = new ForkJoinPool(1);
300              p.shutdown();
301              assertTrue(p.isShutdown());
302 <            ForkJoinTask<Integer> f = p.submit(new FibTask(8));
303 <            shouldThrow();
304 <        } catch (RejectedExecutionException success) {
302 >            try {
303 >                ForkJoinTask<Integer> f = p.submit(new FibTask(8));
304 >                shouldThrow();
305 >            } catch (RejectedExecutionException success) {}
306          } finally {
307              joinPool(p);
308          }
# Line 408 | Line 311 | public class ForkJoinPoolTest extends JS
311      /**
312       * Pool maintains parallelism when using ManagedBlocker
313       */
314 <    public void testBlockingForkJoinTask() {
315 <        ForkJoinPool p = null;
314 >    public void testBlockingForkJoinTask() throws Throwable {
315 >        ForkJoinPool p = new ForkJoinPool(4);
316          try {
414            p = new ForkJoinPool(4);
317              ReentrantLock lock = new ReentrantLock();
318              ManagedLocker locker = new ManagedLocker(lock);
319              ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
320              p.execute(f);
321 <            assertTrue(p.getPoolSize() >= 4);
420 <            int r = f.get();
421 <            assertTrue(r ==  832040);
422 <        } catch (ExecutionException ex) {
423 <            unexpectedException();
424 <        } catch (InterruptedException ex) {
425 <            unexpectedException();
321 >            assertEquals(832040, (int) f.get());
322          } finally {
323 <            joinPool(p);
323 >            p.shutdownNow(); // don't wait out shutdown
324          }
325      }
326  
# Line 432 | Line 328 | public class ForkJoinPoolTest extends JS
328       * pollSubmission returns unexecuted submitted task, if present
329       */
330      public void testPollSubmission() {
331 <        SubFJP p = null;
331 >        SubFJP p = new SubFJP();
332          try {
437            p = new SubFJP();
333              ForkJoinTask a = p.submit(new MediumRunnable());
334              ForkJoinTask b = p.submit(new MediumRunnable());
335              ForkJoinTask c = p.submit(new MediumRunnable());
# Line 450 | Line 345 | public class ForkJoinPoolTest extends JS
345       * drainTasksTo transfers unexecuted submitted tasks, if present
346       */
347      public void testDrainTasksTo() {
348 <        SubFJP p = null;
348 >        SubFJP p = new SubFJP();
349          try {
455            p = new SubFJP();
350              ForkJoinTask a = p.submit(new MediumRunnable());
351              ForkJoinTask b = p.submit(new MediumRunnable());
352              ForkJoinTask c = p.submit(new MediumRunnable());
# Line 474 | Line 368 | public class ForkJoinPoolTest extends JS
368      /**
369       * execute(runnable) runs it to completion
370       */
371 <    public void testExecuteRunnable() {
371 >    public void testExecuteRunnable() throws Throwable {
372 >        ExecutorService e = new ForkJoinPool(1);
373          try {
479            ExecutorService e = new ForkJoinPool(1);
374              TrackedShortRunnable task = new TrackedShortRunnable();
375              assertFalse(task.done);
376              Future<?> future = e.submit(task);
377              future.get();
378              assertTrue(task.done);
379 <        }
380 <        catch (ExecutionException ex) {
487 <            unexpectedException();
488 <        }
489 <        catch (InterruptedException ex) {
490 <            unexpectedException();
379 >        } finally {
380 >            joinPool(e);
381          }
382      }
383  
# Line 495 | Line 385 | public class ForkJoinPoolTest extends JS
385      /**
386       * Completed submit(callable) returns result
387       */
388 <    public void testSubmitCallable() {
388 >    public void testSubmitCallable() throws Throwable {
389 >        ExecutorService e = new ForkJoinPool(1);
390          try {
500            ExecutorService e = new ForkJoinPool(1);
391              Future<String> future = e.submit(new StringTask());
392              String result = future.get();
393              assertSame(TEST_STRING, result);
394 <        }
395 <        catch (ExecutionException ex) {
506 <            unexpectedException();
507 <        }
508 <        catch (InterruptedException ex) {
509 <            unexpectedException();
394 >        } finally {
395 >            joinPool(e);
396          }
397      }
398  
399      /**
400       * Completed submit(runnable) returns successfully
401       */
402 <    public void testSubmitRunnable() {
402 >    public void testSubmitRunnable() throws Throwable {
403 >        ExecutorService e = new ForkJoinPool(1);
404          try {
518            ExecutorService e = new ForkJoinPool(1);
405              Future<?> future = e.submit(new NoOpRunnable());
406              future.get();
407              assertTrue(future.isDone());
408 <        }
409 <        catch (ExecutionException ex) {
524 <            unexpectedException();
525 <        }
526 <        catch (InterruptedException ex) {
527 <            unexpectedException();
408 >        } finally {
409 >            joinPool(e);
410          }
411      }
412  
413      /**
414       * Completed submit(runnable, result) returns result
415       */
416 <    public void testSubmitRunnable2() {
416 >    public void testSubmitRunnable2() throws Throwable {
417 >        ExecutorService e = new ForkJoinPool(1);
418          try {
536            ExecutorService e = new ForkJoinPool(1);
419              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
420              String result = future.get();
421              assertSame(TEST_STRING, result);
422 <        }
423 <        catch (ExecutionException ex) {
542 <            unexpectedException();
543 <        }
544 <        catch (InterruptedException ex) {
545 <            unexpectedException();
422 >        } finally {
423 >            joinPool(e);
424          }
425      }
426  
# Line 550 | Line 428 | public class ForkJoinPoolTest extends JS
428      /**
429       * A submitted privileged action to completion
430       */
431 <    public void testSubmitPrivilegedAction() {
431 >    public void testSubmitPrivilegedAction() throws Throwable {
432          Policy savedPolicy = null;
433          try {
434              savedPolicy = Policy.getPolicy();
# Line 561 | Line 439 | public class ForkJoinPoolTest extends JS
439          } catch (AccessControlException ok) {
440              return;
441          }
442 +
443          try {
444              ExecutorService e = new ForkJoinPool(1);
445 <            Future future = e.submit(Executors.callable(new PrivilegedAction() {
445 >            try {
446 >                Future future = e.submit(Executors.callable(new PrivilegedAction() {
447                      public Object run() {
448                          return TEST_STRING;
449                      }}));
450  
451 <            Object result = future.get();
452 <            assertSame(TEST_STRING, result);
453 <        }
454 <        catch (ExecutionException ex) {
575 <            unexpectedException();
576 <        }
577 <        catch (InterruptedException ex) {
578 <            unexpectedException();
579 <        }
580 <        finally {
581 <            try {
582 <                Policy.setPolicy(savedPolicy);
583 <            } catch (AccessControlException ok) {
584 <                return;
451 >                Object result = future.get();
452 >                assertSame(TEST_STRING, result);
453 >            } finally {
454 >                joinPool(e);
455              }
456 +        } finally {
457 +            Policy.setPolicy(savedPolicy);
458          }
459      }
460  
461      /**
462       * A submitted a privileged exception action runs to completion
463       */
464 <    public void testSubmitPrivilegedExceptionAction() {
464 >    public void testSubmitPrivilegedExceptionAction() throws Throwable {
465          Policy savedPolicy = null;
466          try {
467              savedPolicy = Policy.getPolicy();
# Line 603 | Line 475 | public class ForkJoinPoolTest extends JS
475  
476          try {
477              ExecutorService e = new ForkJoinPool(1);
478 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
478 >            try {
479 >                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
480                      public Object run() {
481                          return TEST_STRING;
482                      }}));
483  
484 <            Object result = future.get();
485 <            assertSame(TEST_STRING, result);
486 <        }
487 <        catch (ExecutionException ex) {
488 <            unexpectedException();
489 <        }
617 <        catch (InterruptedException ex) {
618 <            unexpectedException();
619 <        }
620 <        finally {
484 >                Object result = future.get();
485 >                assertSame(TEST_STRING, result);
486 >            } finally {
487 >                joinPool(e);
488 >            }
489 >        } finally {
490              Policy.setPolicy(savedPolicy);
491          }
492      }
# Line 625 | Line 494 | public class ForkJoinPoolTest extends JS
494      /**
495       * A submitted failed privileged exception action reports exception
496       */
497 <    public void testSubmitFailedPrivilegedExceptionAction() {
497 >    public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
498          Policy savedPolicy = null;
499          try {
500              savedPolicy = Policy.getPolicy();
# Line 637 | Line 506 | public class ForkJoinPoolTest extends JS
506              return;
507          }
508  
640
509          try {
510              ExecutorService e = new ForkJoinPool(1);
511 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
511 >            try {
512 >                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
513                      public Object run() throws Exception {
514                          throw new IndexOutOfBoundsException();
515                      }}));
516  
517 <            Object result = future.get();
518 <            shouldThrow();
519 <        }
520 <        catch (ExecutionException success) {
521 <        } catch (CancellationException success) {
522 <        } catch (InterruptedException ex) {
523 <            unexpectedException();
524 <        }
656 <        finally {
517 >                Object result = future.get();
518 >                shouldThrow();
519 >            } catch (ExecutionException success) {
520 >                assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
521 >            } finally {
522 >                joinPool(e);
523 >            }
524 >        } finally {
525              Policy.setPolicy(savedPolicy);
526          }
527      }
528  
529      /**
530 <     * execute(null runnable) throws NPE
530 >     * execute(null runnable) throws NullPointerException
531       */
532      public void testExecuteNullRunnable() {
533 +        ExecutorService e = new ForkJoinPool(1);
534          try {
535 <            ExecutorService e = new ForkJoinPool(1);
667 <            TrackedShortRunnable task = null;
668 <            Future<?> future = e.submit(task);
535 >            Future<?> future = e.submit((Runnable) null);
536              shouldThrow();
537 <        }
538 <        catch (NullPointerException success) {
539 <        }
673 <        catch (Exception ex) {
674 <            unexpectedException();
537 >        } catch (NullPointerException success) {
538 >        } finally {
539 >            joinPool(e);
540          }
541      }
542  
543  
544      /**
545 <     * submit(null callable) throws NPE
545 >     * submit(null callable) throws NullPointerException
546       */
547      public void testSubmitNullCallable() {
548 +        ExecutorService e = new ForkJoinPool(1);
549          try {
550 <            ExecutorService e = new ForkJoinPool(1);
685 <            StringTask t = null;
686 <            Future<String> future = e.submit(t);
550 >            Future<String> future = e.submit((Callable) null);
551              shouldThrow();
552 <        }
553 <        catch (NullPointerException success) {
554 <        }
691 <        catch (Exception ex) {
692 <            unexpectedException();
552 >        } catch (NullPointerException success) {
553 >        } finally {
554 >            joinPool(e);
555          }
556      }
557  
558  
559      /**
560 <     *  Blocking on submit(callable) throws InterruptedException if
699 <     *  caller interrupted.
560 >     * submit(callable).get() throws InterruptedException if interrupted
561       */
562 <    public void testInterruptedSubmit() {
563 <        final ForkJoinPool p = new ForkJoinPool(1);
564 <        Thread t = new Thread(new Runnable() {
565 <                public void run() {
566 <                    try {
567 <                        p.submit(new Callable<Object>() {
568 <                                public Object call() {
569 <                                    try {
570 <                                        Thread.sleep(MEDIUM_DELAY_MS);
571 <                                        shouldThrow();
572 <                                    } catch (InterruptedException e) {
573 <                                    }
574 <                                    return null;
575 <                                }
576 <                            }).get();
577 <                    } catch (InterruptedException success) {
717 <                    } catch (Exception e) {
718 <                        unexpectedException();
719 <                    }
720 <
721 <                }
722 <            });
723 <        try {
562 >    public void testInterruptedSubmit() throws InterruptedException {
563 >        final CountDownLatch submitted    = new CountDownLatch(1);
564 >        final CountDownLatch quittingTime = new CountDownLatch(1);
565 >        final ExecutorService p = new ForkJoinPool(1);
566 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
567 >            public Void realCall() throws InterruptedException {
568 >                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
569 >                return null;
570 >            }};
571 >        try {
572 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
573 >                public void realRun() throws Exception {
574 >                    Future<Void> future = p.submit(awaiter);
575 >                    submitted.countDown();
576 >                    future.get();
577 >                }});
578              t.start();
579 <            Thread.sleep(SHORT_DELAY_MS);
579 >            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
580              t.interrupt();
581 <        } catch (Exception e) {
582 <            unexpectedException();
581 >            t.join();
582 >        } finally {
583 >            quittingTime.countDown();
584 >            joinPool(p);
585          }
730        joinPool(p);
586      }
587  
588      /**
589 <     *  get of submit(callable) throws ExecutionException if callable
590 <     *  throws exception
589 >     * get of submit(callable) throws ExecutionException if callable
590 >     * throws exception
591       */
592 <    public void testSubmitEE() {
592 >    public void testSubmitEE() throws Throwable {
593          ForkJoinPool p = new ForkJoinPool(1);
739
594          try {
595 <            Callable c = new Callable() {
596 <                    public Object call() {
597 <                        int i = 5/0;
598 <                        return Boolean.TRUE;
599 <                    }
746 <                };
747 <
748 <            for (int i = 0; i < 5; i++) {
749 <                p.submit(c).get();
750 <            }
751 <
595 >            p.submit(new Callable() {
596 >                public Object call() {
597 >                    int i = 5/0;
598 >                    return Boolean.TRUE;
599 >                }}).get();
600              shouldThrow();
601          } catch (ExecutionException success) {
602 <        } catch (CancellationException success) {
603 <        } catch (Exception e) {
604 <            unexpectedException();
602 >            assertTrue(success.getCause() instanceof ArithmeticException);
603 >        } finally {
604 >            joinPool(p);
605          }
758        joinPool(p);
606      }
607  
608      /**
609 <     * invokeAny(null) throws NPE
609 >     * invokeAny(null) throws NullPointerException
610       */
611 <    public void testInvokeAny1() {
611 >    public void testInvokeAny1() throws Throwable {
612          ExecutorService e = new ForkJoinPool(1);
613          try {
614              e.invokeAny(null);
615 +            shouldThrow();
616          } catch (NullPointerException success) {
769        } catch (Exception ex) {
770            unexpectedException();
617          } finally {
618              joinPool(e);
619          }
620      }
621  
622      /**
623 <     * invokeAny(empty collection) throws IAE
623 >     * invokeAny(empty collection) throws IllegalArgumentException
624       */
625 <    public void testInvokeAny2() {
625 >    public void testInvokeAny2() throws Throwable {
626          ExecutorService e = new ForkJoinPool(1);
627          try {
628              e.invokeAny(new ArrayList<Callable<String>>());
629 +            shouldThrow();
630          } catch (IllegalArgumentException success) {
784        } catch (Exception ex) {
785            unexpectedException();
631          } finally {
632              joinPool(e);
633          }
634      }
635  
636      /**
637 <     * invokeAny(c) throws NPE if c has null elements
637 >     * invokeAny(c) throws NullPointerException if c has a single null element
638       */
639 <    public void testInvokeAny3() {
639 >    public void testInvokeAny3() throws Throwable {
640          ExecutorService e = new ForkJoinPool(1);
641 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
642 +        l.add(null);
643 +        try {
644 +            e.invokeAny(l);
645 +            shouldThrow();
646 +        } catch (NullPointerException success) {
647 +        } finally {
648 +            joinPool(e);
649 +        }
650 +    }
651 +
652 +    /**
653 +     * invokeAny(c) throws NullPointerException if c has null elements
654 +     */
655 +    public void testInvokeAny4() throws Throwable {
656 +        CountDownLatch latch = new CountDownLatch(1);
657 +        ExecutorService e = new ForkJoinPool(1);
658 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
659 +        l.add(latchAwaitingStringTask(latch));
660 +        l.add(null);
661          try {
797            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
798            l.add(new StringTask());
799            l.add(null);
662              e.invokeAny(l);
663 +            shouldThrow();
664          } catch (NullPointerException success) {
802        } catch (Exception ex) {
803            ex.printStackTrace();
804            unexpectedException();
665          } finally {
666 +            latch.countDown();
667              joinPool(e);
668          }
669      }
# Line 810 | Line 671 | public class ForkJoinPoolTest extends JS
671      /**
672       * invokeAny(c) throws ExecutionException if no task in c completes
673       */
674 <    public void testInvokeAny4() {
674 >    public void testInvokeAny5() throws Throwable {
675          ExecutorService e = new ForkJoinPool(1);
676 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
677 +        l.add(new NPETask());
678          try {
816            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
817            l.add(new NPETask());
679              e.invokeAny(l);
680 +            shouldThrow();
681          } catch (ExecutionException success) {
682 <        } catch (CancellationException success) {
821 <        } catch (Exception ex) {
822 <            unexpectedException();
682 >            assertTrue(success.getCause() instanceof NullPointerException);
683          } finally {
684              joinPool(e);
685          }
# Line 828 | Line 688 | public class ForkJoinPoolTest extends JS
688      /**
689       * invokeAny(c) returns result of some task in c if at least one completes
690       */
691 <    public void testInvokeAny5() {
691 >    public void testInvokeAny6() throws Throwable {
692          ExecutorService e = new ForkJoinPool(1);
693          try {
694 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
694 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
695              l.add(new StringTask());
696              l.add(new StringTask());
697              String result = e.invokeAny(l);
698              assertSame(TEST_STRING, result);
839        } catch (ExecutionException success) {
840        } catch (CancellationException success) {
841        } catch (Exception ex) {
842            unexpectedException();
699          } finally {
700              joinPool(e);
701          }
702      }
703  
704      /**
705 <     * invokeAll(null) throws NPE
705 >     * invokeAll(null) throws NullPointerException
706       */
707 <    public void testInvokeAll1() {
707 >    public void testInvokeAll1() throws Throwable {
708          ExecutorService e = new ForkJoinPool(1);
709          try {
710              e.invokeAll(null);
711 +            shouldThrow();
712          } catch (NullPointerException success) {
856        } catch (Exception ex) {
857            unexpectedException();
713          } finally {
714              joinPool(e);
715          }
# Line 863 | Line 718 | public class ForkJoinPoolTest extends JS
718      /**
719       * invokeAll(empty collection) returns empty collection
720       */
721 <    public void testInvokeAll2() {
721 >    public void testInvokeAll2() throws InterruptedException {
722          ExecutorService e = new ForkJoinPool(1);
723          try {
724 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
724 >            List<Future<String>> r
725 >                = e.invokeAll(new ArrayList<Callable<String>>());
726              assertTrue(r.isEmpty());
871        } catch (Exception ex) {
872            unexpectedException();
727          } finally {
728              joinPool(e);
729          }
730      }
731  
732      /**
733 <     * invokeAll(c) throws NPE if c has null elements
733 >     * invokeAll(c) throws NullPointerException if c has null elements
734       */
735 <    public void testInvokeAll3() {
735 >    public void testInvokeAll3() throws InterruptedException {
736          ExecutorService e = new ForkJoinPool(1);
737 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
738 +        l.add(new StringTask());
739 +        l.add(null);
740          try {
884            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
885            l.add(new StringTask());
886            l.add(null);
741              e.invokeAll(l);
742 +            shouldThrow();
743          } catch (NullPointerException success) {
889        } catch (Exception ex) {
890            unexpectedException();
744          } finally {
745              joinPool(e);
746          }
747      }
748  
749      /**
750 <     * get of returned element of invokeAll(c) throws exception on failed task
750 >     * get of returned element of invokeAll(c) throws
751 >     * ExecutionException on failed task
752       */
753 <    public void testInvokeAll4() {
753 >    public void testInvokeAll4() throws Throwable {
754          ExecutorService e = new ForkJoinPool(1);
755 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
756 +        l.add(new NPETask());
757 +        List<Future<String>> futures = e.invokeAll(l);
758 +        assertEquals(1, futures.size());
759          try {
760 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
761 <            l.add(new NPETask());
904 <            List<Future<String>> result = e.invokeAll(l);
905 <            assertEquals(1, result.size());
906 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
907 <                it.next().get();
760 >            futures.get(0).get();
761 >            shouldThrow();
762          } catch (ExecutionException success) {
763 <        } catch (CancellationException success) {
910 <        } catch (Exception ex) {
911 <            ex.printStackTrace();
912 <            unexpectedException();
763 >            assertTrue(success.getCause() instanceof NullPointerException);
764          } finally {
765              joinPool(e);
766          }
# Line 918 | Line 769 | public class ForkJoinPoolTest extends JS
769      /**
770       * invokeAll(c) returns results of all completed tasks in c
771       */
772 <    public void testInvokeAll5() {
772 >    public void testInvokeAll5() throws Throwable {
773          ExecutorService e = new ForkJoinPool(1);
774          try {
775 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
775 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
776              l.add(new StringTask());
777              l.add(new StringTask());
778 <            List<Future<String>> result = e.invokeAll(l);
779 <            assertEquals(2, result.size());
780 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
781 <                assertSame(TEST_STRING, it.next().get());
931 <        } catch (ExecutionException success) {
932 <        } catch (CancellationException success) {
933 <        } catch (Exception ex) {
934 <            ex.printStackTrace();
935 <            unexpectedException();
778 >            List<Future<String>> futures = e.invokeAll(l);
779 >            assertEquals(2, futures.size());
780 >            for (Future<String> future : futures)
781 >                assertSame(TEST_STRING, future.get());
782          } finally {
783              joinPool(e);
784          }
# Line 940 | Line 786 | public class ForkJoinPoolTest extends JS
786  
787  
788      /**
789 <     * timed invokeAny(null) throws NPE
789 >     * timed invokeAny(null) throws NullPointerException
790       */
791 <    public void testTimedInvokeAny1() {
791 >    public void testTimedInvokeAny1() throws Throwable {
792          ExecutorService e = new ForkJoinPool(1);
793          try {
794 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
794 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
795 >            shouldThrow();
796          } catch (NullPointerException success) {
950        } catch (Exception ex) {
951            ex.printStackTrace();
952            unexpectedException();
797          } finally {
798              joinPool(e);
799          }
800      }
801  
802      /**
803 <     * timed invokeAny(null time unit) throws NPE
803 >     * timed invokeAny(null time unit) throws NullPointerException
804       */
805 <    public void testTimedInvokeAnyNullTimeUnit() {
805 >    public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
806          ExecutorService e = new ForkJoinPool(1);
807 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
808 +        l.add(new StringTask());
809          try {
964            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
965            l.add(new StringTask());
810              e.invokeAny(l, MEDIUM_DELAY_MS, null);
811 +            shouldThrow();
812          } catch (NullPointerException success) {
968        } catch (Exception ex) {
969            ex.printStackTrace();
970            unexpectedException();
813          } finally {
814              joinPool(e);
815          }
816      }
817  
818      /**
819 <     * timed invokeAny(empty collection) throws IAE
819 >     * timed invokeAny(empty collection) throws IllegalArgumentException
820       */
821 <    public void testTimedInvokeAny2() {
821 >    public void testTimedInvokeAny2() throws Throwable {
822          ExecutorService e = new ForkJoinPool(1);
823          try {
824 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
824 >            e.invokeAny(new ArrayList<Callable<String>>(),
825 >                        MEDIUM_DELAY_MS, MILLISECONDS);
826 >            shouldThrow();
827          } catch (IllegalArgumentException success) {
984        } catch (Exception ex) {
985            ex.printStackTrace();
986            unexpectedException();
828          } finally {
829              joinPool(e);
830          }
831      }
832  
833      /**
834 <     * timed invokeAny(c) throws NPE if c has null elements
834 >     * timed invokeAny(c) throws NullPointerException if c has null elements
835       */
836 <    public void testTimedInvokeAny3() {
836 >    public void testTimedInvokeAny3() throws Throwable {
837 >        CountDownLatch latch = new CountDownLatch(1);
838          ExecutorService e = new ForkJoinPool(1);
839 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
840 +        l.add(latchAwaitingStringTask(latch));
841 +        l.add(null);
842          try {
843 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
844 <            l.add(new StringTask());
1000 <            l.add(null);
1001 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
843 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
844 >            shouldThrow();
845          } catch (NullPointerException success) {
1003        } catch (Exception ex) {
1004            ex.printStackTrace();
1005            unexpectedException();
846          } finally {
847 +            latch.countDown();
848              joinPool(e);
849          }
850      }
# Line 1011 | Line 852 | public class ForkJoinPoolTest extends JS
852      /**
853       * timed invokeAny(c) throws ExecutionException if no task completes
854       */
855 <    public void testTimedInvokeAny4() {
855 >    public void testTimedInvokeAny4() throws Throwable {
856          ExecutorService e = new ForkJoinPool(1);
857 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
858 +        l.add(new NPETask());
859          try {
860 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
861 <            l.add(new NPETask());
1019 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
860 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
861 >            shouldThrow();
862          } catch (ExecutionException success) {
863 <        } catch (CancellationException success) {
1022 <        } catch (Exception ex) {
1023 <            ex.printStackTrace();
1024 <            unexpectedException();
863 >            assertTrue(success.getCause() instanceof NullPointerException);
864          } finally {
865              joinPool(e);
866          }
# Line 1030 | Line 869 | public class ForkJoinPoolTest extends JS
869      /**
870       * timed invokeAny(c) returns result of some task in c
871       */
872 <    public void testTimedInvokeAny5() {
872 >    public void testTimedInvokeAny5() throws Throwable {
873          ExecutorService e = new ForkJoinPool(1);
874          try {
875 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
875 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
876              l.add(new StringTask());
877              l.add(new StringTask());
878 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
878 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
879              assertSame(TEST_STRING, result);
1041        } catch (ExecutionException success) {
1042        } catch (CancellationException success) {
1043        } catch (Exception ex) {
1044            ex.printStackTrace();
1045            unexpectedException();
880          } finally {
881              joinPool(e);
882          }
883      }
884  
885      /**
886 <     * timed invokeAll(null) throws NPE
886 >     * timed invokeAll(null) throws NullPointerException
887       */
888 <    public void testTimedInvokeAll1() {
888 >    public void testTimedInvokeAll1() throws Throwable {
889          ExecutorService e = new ForkJoinPool(1);
890          try {
891 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
891 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
892 >            shouldThrow();
893          } catch (NullPointerException success) {
1059        } catch (Exception ex) {
1060            ex.printStackTrace();
1061            unexpectedException();
894          } finally {
895              joinPool(e);
896          }
897      }
898  
899      /**
900 <     * timed invokeAll(null time unit) throws NPE
900 >     * timed invokeAll(null time unit) throws NullPointerException
901       */
902 <    public void testTimedInvokeAllNullTimeUnit() {
902 >    public void testTimedInvokeAllNullTimeUnit() throws Throwable {
903          ExecutorService e = new ForkJoinPool(1);
904 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
905 +        l.add(new StringTask());
906          try {
1073            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1074            l.add(new StringTask());
907              e.invokeAll(l, MEDIUM_DELAY_MS, null);
908 +            shouldThrow();
909          } catch (NullPointerException success) {
1077        } catch (Exception ex) {
1078            ex.printStackTrace();
1079            unexpectedException();
910          } finally {
911              joinPool(e);
912          }
# Line 1085 | Line 915 | public class ForkJoinPoolTest extends JS
915      /**
916       * timed invokeAll(empty collection) returns empty collection
917       */
918 <    public void testTimedInvokeAll2() {
918 >    public void testTimedInvokeAll2() throws InterruptedException {
919          ExecutorService e = new ForkJoinPool(1);
920          try {
921 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
921 >            List<Future<String>> r
922 >                = e.invokeAll(new ArrayList<Callable<String>>(),
923 >                              MEDIUM_DELAY_MS, MILLISECONDS);
924              assertTrue(r.isEmpty());
1093        } catch (Exception ex) {
1094            ex.printStackTrace();
1095            unexpectedException();
925          } finally {
926              joinPool(e);
927          }
928      }
929  
930      /**
931 <     * timed invokeAll(c) throws NPE if c has null elements
931 >     * timed invokeAll(c) throws NullPointerException if c has null elements
932       */
933 <    public void testTimedInvokeAll3() {
933 >    public void testTimedInvokeAll3() throws InterruptedException {
934          ExecutorService e = new ForkJoinPool(1);
935 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
936 +        l.add(new StringTask());
937 +        l.add(null);
938          try {
939 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
940 <            l.add(new StringTask());
1109 <            l.add(null);
1110 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
939 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
940 >            shouldThrow();
941          } catch (NullPointerException success) {
1112        } catch (Exception ex) {
1113            ex.printStackTrace();
1114            unexpectedException();
942          } finally {
943              joinPool(e);
944          }
# Line 1120 | Line 947 | public class ForkJoinPoolTest extends JS
947      /**
948       * get of returned element of invokeAll(c) throws exception on failed task
949       */
950 <    public void testTimedInvokeAll4() {
950 >    public void testTimedInvokeAll4() throws Throwable {
951          ExecutorService e = new ForkJoinPool(1);
952 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
953 +        l.add(new NPETask());
954 +        List<Future<String>> futures
955 +            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
956 +        assertEquals(1, futures.size());
957          try {
958 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
959 <            l.add(new NPETask());
1128 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1129 <            assertEquals(1, result.size());
1130 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1131 <                it.next().get();
958 >            futures.get(0).get();
959 >            shouldThrow();
960          } catch (ExecutionException success) {
961 <        } catch (CancellationException success) {
1134 <        } catch (Exception ex) {
1135 <            ex.printStackTrace();
1136 <            unexpectedException();
961 >            assertTrue(success.getCause() instanceof NullPointerException);
962          } finally {
963              joinPool(e);
964          }
# Line 1142 | Line 967 | public class ForkJoinPoolTest extends JS
967      /**
968       * timed invokeAll(c) returns results of all completed tasks in c
969       */
970 <    public void testTimedInvokeAll5() {
970 >    public void testTimedInvokeAll5() throws Throwable {
971          ExecutorService e = new ForkJoinPool(1);
972          try {
973 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
973 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
974              l.add(new StringTask());
975              l.add(new StringTask());
976 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
977 <            assertEquals(2, result.size());
978 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
979 <                assertSame(TEST_STRING, it.next().get());
980 <        } catch (ExecutionException success) {
1156 <        } catch (CancellationException success) {
1157 <        } catch (Exception ex) {
1158 <            ex.printStackTrace();
1159 <            unexpectedException();
976 >            List<Future<String>> futures
977 >                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
978 >            assertEquals(2, futures.size());
979 >            for (Future<String> future : futures)
980 >                assertSame(TEST_STRING, future.get());
981          } finally {
982              joinPool(e);
983          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines