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.43 by jsr166, Sun May 29 13:45:35 2011 UTC vs.
Revision 1.66 by jsr166, Tue Oct 6 23:16:51 2015 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 < import junit.framework.*;
7 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
8 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
9 >
10 > import java.security.PrivilegedAction;
11 > import java.security.PrivilegedExceptionAction;
12   import java.util.ArrayList;
13   import java.util.Collection;
14   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;
16 > import java.util.concurrent.CountDownLatch;
17   import java.util.concurrent.ExecutionException;
18 < import java.util.concurrent.CancellationException;
19 < import java.util.concurrent.RejectedExecutionException;
18 > import java.util.concurrent.Executors;
19 > import java.util.concurrent.ExecutorService;
20   import java.util.concurrent.ForkJoinPool;
21   import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.ForkJoinWorkerThread;
23 + import java.util.concurrent.Future;
24   import java.util.concurrent.RecursiveTask;
25 < import java.util.concurrent.TimeUnit;
25 > import java.util.concurrent.RejectedExecutionException;
26   import java.util.concurrent.atomic.AtomicBoolean;
27   import java.util.concurrent.locks.ReentrantLock;
28 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
29 < import java.security.AccessControlException;
30 < import java.security.Policy;
31 < import java.security.PrivilegedAction;
31 < import java.security.PrivilegedExceptionAction;
28 >
29 > import junit.framework.AssertionFailedError;
30 > import junit.framework.Test;
31 > import junit.framework.TestSuite;
32  
33   public class ForkJoinPoolTest extends JSR166TestCase {
34      public static void main(String[] args) {
35 <        junit.textui.TestRunner.run(suite());
35 >        main(suite(), args);
36      }
37  
38      public static Test suite() {
39          return new TestSuite(ForkJoinPoolTest.class);
40      }
41  
42 <    /**
42 >    /*
43       * Testing coverage notes:
44       *
45       * 1. shutdown and related methods are tested via super.joinPool.
# Line 64 | Line 64 | public class ForkJoinPoolTest extends JS
64          }
65      }
66  
67 +    static class MyError extends Error {}
68 +
69      // to test handlers
70      static class FailingFJWSubclass extends ForkJoinWorkerThread {
71          public FailingFJWSubclass(ForkJoinPool p) { super(p) ; }
72 <        protected void onStart() { super.onStart(); throw new Error(); }
72 >        protected void onStart() { super.onStart(); throw new MyError(); }
73      }
74  
75      static class FailingThreadFactory
# Line 107 | Line 109 | public class ForkJoinPoolTest extends JS
109      static final class FibTask extends RecursiveTask<Integer> {
110          final int number;
111          FibTask(int n) { number = n; }
112 <        public Integer compute() {
112 >        protected Integer compute() {
113              int n = number;
114              if (n <= 1)
115                  return n;
# Line 135 | Line 137 | public class ForkJoinPoolTest extends JS
137              this.locker = locker;
138              this.lock = lock;
139          }
140 <        public Integer compute() {
140 >        protected Integer compute() {
141              int n;
142              LockingFibTask f1 = null;
143              LockingFibTask f2 = null;
# Line 162 | Line 164 | public class ForkJoinPoolTest extends JS
164       */
165      public void testDefaultInitialState() {
166          ForkJoinPool p = new ForkJoinPool(1);
167 <        try {
167 >        try (PoolCleaner cleaner = cleaner(p)) {
168              assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
169                         p.getFactory());
170              assertFalse(p.getAsyncMode());
# Line 174 | Line 176 | public class ForkJoinPoolTest extends JS
176              assertFalse(p.isShutdown());
177              assertFalse(p.isTerminating());
178              assertFalse(p.isTerminated());
177        } finally {
178            joinPool(p);
179          }
180      }
181  
# Line 204 | Line 204 | public class ForkJoinPoolTest extends JS
204       */
205      public void testGetParallelism() {
206          ForkJoinPool p = new ForkJoinPool(1);
207 <        try {
207 >        try (PoolCleaner cleaner = cleaner(p)) {
208              assertEquals(1, p.getParallelism());
209        } finally {
210            joinPool(p);
209          }
210      }
211  
# Line 216 | Line 214 | public class ForkJoinPoolTest extends JS
214       */
215      public void testGetPoolSize() {
216          ForkJoinPool p = new ForkJoinPool(1);
217 <        try {
217 >        try (PoolCleaner cleaner = cleaner(p)) {
218              assertEquals(0, p.getActiveThreadCount());
219              Future<String> future = p.submit(new StringTask());
220              assertEquals(1, p.getPoolSize());
221 <        } finally {
222 <            joinPool(p);
221 >        }
222 >    }
223 >
224 >    /**
225 >     * awaitTermination on a non-shutdown pool times out
226 >     */
227 >    public void testAwaitTermination_timesOut() throws InterruptedException {
228 >        ForkJoinPool p = new ForkJoinPool(1);
229 >        try (PoolCleaner cleaner = cleaner(p)) {
230 >            assertFalse(p.isTerminated());
231 >            assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
232 >            assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
233 >            assertFalse(p.awaitTermination(-1L, NANOSECONDS));
234 >            assertFalse(p.awaitTermination(-1L, MILLISECONDS));
235 >            assertFalse(p.awaitTermination(0L, NANOSECONDS));
236 >            assertFalse(p.awaitTermination(0L, MILLISECONDS));
237 >            long timeoutNanos = 999999L;
238 >            long startTime = System.nanoTime();
239 >            assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
240 >            assertTrue(System.nanoTime() - startTime >= timeoutNanos);
241 >            assertFalse(p.isTerminated());
242 >            startTime = System.nanoTime();
243 >            long timeoutMillis = timeoutMillis();
244 >            assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
245 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
246 >            assertFalse(p.isTerminated());
247 >            p.shutdown();
248 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
249 >            assertTrue(p.isTerminated());
250          }
251      }
252  
# Line 233 | Line 258 | public class ForkJoinPoolTest extends JS
258       */
259      public void testSetUncaughtExceptionHandler() throws InterruptedException {
260          final CountDownLatch uehInvoked = new CountDownLatch(1);
261 <        final Thread.UncaughtExceptionHandler eh =
261 >        final Thread.UncaughtExceptionHandler ueh =
262              new Thread.UncaughtExceptionHandler() {
263                  public void uncaughtException(Thread t, Throwable e) {
264 +                    threadAssertTrue(e instanceof MyError);
265 +                    threadAssertTrue(t instanceof FailingFJWSubclass);
266                      uehInvoked.countDown();
267                  }};
268          ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
269 <                                          eh, false);
270 <        try {
271 <            assertSame(eh, p.getUncaughtExceptionHandler());
272 <            p.execute(new FibTask(8));
273 <            assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
274 <        } finally {
275 <            p.shutdownNow(); // failure might have prevented processing task
276 <            joinPool(p);
269 >                                          ueh, false);
270 >        try (PoolCleaner cleaner = cleaner(p)) {
271 >            assertSame(ueh, p.getUncaughtExceptionHandler());
272 >            try {
273 >                p.execute(new FibTask(8));
274 >                await(uehInvoked);
275 >            } finally {
276 >                p.shutdownNow(); // failure might have prevented processing task
277 >            }
278          }
279      }
280  
# Line 258 | Line 286 | public class ForkJoinPoolTest extends JS
286       */
287      public void testIsQuiescent() throws Exception {
288          ForkJoinPool p = new ForkJoinPool(2);
289 <        try {
289 >        try (PoolCleaner cleaner = cleaner(p)) {
290              assertTrue(p.isQuiescent());
291              long startTime = System.nanoTime();
292              FibTask f = new FibTask(20);
# Line 286 | Line 314 | public class ForkJoinPoolTest extends JS
314              assertFalse(p.isTerminated());
315              assertTrue(f.isDone());
316              assertEquals(6765, (int) f.get());
289        } finally {
290            joinPool(p);
317          }
318      }
319  
# Line 296 | Line 322 | public class ForkJoinPoolTest extends JS
322       */
323      public void testSubmitForkJoinTask() throws Throwable {
324          ForkJoinPool p = new ForkJoinPool(1);
325 <        try {
325 >        try (PoolCleaner cleaner = cleaner(p)) {
326              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
327              assertEquals(21, (int) f.get());
302        } finally {
303            joinPool(p);
328          }
329      }
330  
# Line 309 | Line 333 | public class ForkJoinPoolTest extends JS
333       */
334      public void testSubmitAfterShutdown() {
335          ForkJoinPool p = new ForkJoinPool(1);
336 <        try {
336 >        try (PoolCleaner cleaner = cleaner(p)) {
337              p.shutdown();
338              assertTrue(p.isShutdown());
339              try {
340                  ForkJoinTask<Integer> f = p.submit(new FibTask(8));
341                  shouldThrow();
342              } catch (RejectedExecutionException success) {}
319        } finally {
320            joinPool(p);
343          }
344      }
345  
# Line 343 | Line 365 | public class ForkJoinPoolTest extends JS
365      public void testPollSubmission() {
366          final CountDownLatch done = new CountDownLatch(1);
367          SubFJP p = new SubFJP();
368 <        try {
368 >        try (PoolCleaner cleaner = cleaner(p)) {
369              ForkJoinTask a = p.submit(awaiter(done));
370              ForkJoinTask b = p.submit(awaiter(done));
371              ForkJoinTask c = p.submit(awaiter(done));
372              ForkJoinTask r = p.pollSubmission();
373              assertTrue(r == a || r == b || r == c);
374              assertFalse(r.isDone());
353        } finally {
375              done.countDown();
355            joinPool(p);
376          }
377      }
378  
# Line 362 | Line 382 | public class ForkJoinPoolTest extends JS
382      public void testDrainTasksTo() {
383          final CountDownLatch done = new CountDownLatch(1);
384          SubFJP p = new SubFJP();
385 <        try {
385 >        try (PoolCleaner cleaner = cleaner(p)) {
386              ForkJoinTask a = p.submit(awaiter(done));
387              ForkJoinTask b = p.submit(awaiter(done));
388              ForkJoinTask c = p.submit(awaiter(done));
# Line 373 | Line 393 | public class ForkJoinPoolTest extends JS
393                  assertTrue(r == a || r == b || r == c);
394                  assertFalse(r.isDone());
395              }
376        } finally {
396              done.countDown();
378            joinPool(p);
397          }
398      }
399  
# Line 386 | Line 404 | public class ForkJoinPoolTest extends JS
404       */
405      public void testExecuteRunnable() throws Throwable {
406          ExecutorService e = new ForkJoinPool(1);
407 <        try {
407 >        try (PoolCleaner cleaner = cleaner(e)) {
408              final AtomicBoolean done = new AtomicBoolean(false);
409 <            CheckedRunnable task = new CheckedRunnable() {
409 >            Future<?> future = e.submit(new CheckedRunnable() {
410                  public void realRun() {
411                      done.set(true);
412 <                }};
395 <            Future<?> future = e.submit(task);
412 >                }});
413              assertNull(future.get());
414              assertNull(future.get(0, MILLISECONDS));
415              assertTrue(done.get());
416              assertTrue(future.isDone());
417              assertFalse(future.isCancelled());
401        } finally {
402            joinPool(e);
418          }
419      }
420  
# Line 408 | Line 423 | public class ForkJoinPoolTest extends JS
423       */
424      public void testSubmitCallable() throws Throwable {
425          ExecutorService e = new ForkJoinPool(1);
426 <        try {
426 >        try (PoolCleaner cleaner = cleaner(e)) {
427              Future<String> future = e.submit(new StringTask());
428              assertSame(TEST_STRING, future.get());
429              assertTrue(future.isDone());
430              assertFalse(future.isCancelled());
416        } finally {
417            joinPool(e);
431          }
432      }
433  
# Line 423 | Line 436 | public class ForkJoinPoolTest extends JS
436       */
437      public void testSubmitRunnable() throws Throwable {
438          ExecutorService e = new ForkJoinPool(1);
439 <        try {
439 >        try (PoolCleaner cleaner = cleaner(e)) {
440              Future<?> future = e.submit(new NoOpRunnable());
441              assertNull(future.get());
442              assertTrue(future.isDone());
443              assertFalse(future.isCancelled());
431        } finally {
432            joinPool(e);
444          }
445      }
446  
# Line 438 | Line 449 | public class ForkJoinPoolTest extends JS
449       */
450      public void testSubmitRunnable2() throws Throwable {
451          ExecutorService e = new ForkJoinPool(1);
452 <        try {
452 >        try (PoolCleaner cleaner = cleaner(e)) {
453              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
454              assertSame(TEST_STRING, future.get());
455              assertTrue(future.isDone());
456              assertFalse(future.isCancelled());
446        } finally {
447            joinPool(e);
457          }
458      }
459  
# Line 452 | Line 461 | public class ForkJoinPoolTest extends JS
461       * A submitted privileged action runs to completion
462       */
463      public void testSubmitPrivilegedAction() throws Exception {
464 +        final Callable callable = Executors.callable(new PrivilegedAction() {
465 +                public Object run() { return TEST_STRING; }});
466          Runnable r = new CheckedRunnable() {
467 <            public void realRun() throws Exception {
468 <                ExecutorService e = new ForkJoinPool(1);
469 <                Future future = e.submit(Executors.callable(new PrivilegedAction() {
470 <                    public Object run() {
460 <                        return TEST_STRING;
461 <                    }}));
462 <
467 >        public void realRun() throws Exception {
468 >            ExecutorService e = new ForkJoinPool(1);
469 >            try (PoolCleaner cleaner = cleaner(e)) {
470 >                Future future = e.submit(callable);
471                  assertSame(TEST_STRING, future.get());
472 <            }};
472 >            }
473 >        }};
474  
475 <        runWithPermissions(r,
467 <                           new RuntimePermission("modifyThread"));
475 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
476      }
477  
478      /**
479       * A submitted privileged exception action runs to completion
480       */
481      public void testSubmitPrivilegedExceptionAction() throws Exception {
482 +        final Callable callable =
483 +            Executors.callable(new PrivilegedExceptionAction() {
484 +                public Object run() { return TEST_STRING; }});
485          Runnable r = new CheckedRunnable() {
486 <            public void realRun() throws Exception {
487 <                ExecutorService e = new ForkJoinPool(1);
488 <                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
489 <                    public Object run() {
479 <                        return TEST_STRING;
480 <                    }}));
481 <
486 >        public void realRun() throws Exception {
487 >            ExecutorService e = new ForkJoinPool(1);
488 >            try (PoolCleaner cleaner = cleaner(e)) {
489 >                Future future = e.submit(callable);
490                  assertSame(TEST_STRING, future.get());
491 <            }};
491 >            }
492 >        }};
493  
494          runWithPermissions(r, new RuntimePermission("modifyThread"));
495      }
# Line 489 | Line 498 | public class ForkJoinPoolTest extends JS
498       * A submitted failed privileged exception action reports exception
499       */
500      public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
501 +        final Callable callable =
502 +            Executors.callable(new PrivilegedExceptionAction() {
503 +                public Object run() { throw new IndexOutOfBoundsException(); }});
504          Runnable r = new CheckedRunnable() {
505 <            public void realRun() throws Exception {
506 <                ExecutorService e = new ForkJoinPool(1);
507 <                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
508 <                    public Object run() throws Exception {
497 <                        throw new IndexOutOfBoundsException();
498 <                    }}));
499 <
505 >        public void realRun() throws Exception {
506 >            ExecutorService e = new ForkJoinPool(1);
507 >            try (PoolCleaner cleaner = cleaner(e)) {
508 >                Future future = e.submit(callable);
509                  try {
510                      future.get();
511                      shouldThrow();
512                  } catch (ExecutionException success) {
513                      assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
514 <                }}};
514 >                }
515 >            }
516 >        }};
517  
518          runWithPermissions(r, new RuntimePermission("modifyThread"));
519      }
# Line 512 | Line 523 | public class ForkJoinPoolTest extends JS
523       */
524      public void testExecuteNullRunnable() {
525          ExecutorService e = new ForkJoinPool(1);
526 <        try {
527 <            Future<?> future = e.submit((Runnable) null);
528 <            shouldThrow();
529 <        } catch (NullPointerException success) {
530 <        } finally {
520 <            joinPool(e);
526 >        try (PoolCleaner cleaner = cleaner(e)) {
527 >            try {
528 >                Future<?> future = e.submit((Runnable) null);
529 >                shouldThrow();
530 >            } catch (NullPointerException success) {}
531          }
532      }
533  
# Line 526 | Line 536 | public class ForkJoinPoolTest extends JS
536       */
537      public void testSubmitNullCallable() {
538          ExecutorService e = new ForkJoinPool(1);
539 <        try {
540 <            Future<String> future = e.submit((Callable) null);
541 <            shouldThrow();
542 <        } catch (NullPointerException success) {
543 <        } finally {
534 <            joinPool(e);
539 >        try (PoolCleaner cleaner = cleaner(e)) {
540 >            try {
541 >                Future<String> future = e.submit((Callable) null);
542 >                shouldThrow();
543 >            } catch (NullPointerException success) {}
544          }
545      }
546  
# Line 541 | Line 550 | public class ForkJoinPoolTest extends JS
550      public void testInterruptedSubmit() throws InterruptedException {
551          final CountDownLatch submitted    = new CountDownLatch(1);
552          final CountDownLatch quittingTime = new CountDownLatch(1);
544        final ExecutorService p = new ForkJoinPool(1);
553          final Callable<Void> awaiter = new CheckedCallable<Void>() {
554              public Void realCall() throws InterruptedException {
555 <                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
555 >                assertTrue(quittingTime.await(2*LONG_DELAY_MS, MILLISECONDS));
556                  return null;
557              }};
558 <        try {
558 >        final ExecutorService p = new ForkJoinPool(1);
559 >        try (PoolCleaner cleaner = cleaner(p, quittingTime)) {
560              Thread t = new Thread(new CheckedInterruptedRunnable() {
561                  public void realRun() throws Exception {
562                      Future<Void> future = p.submit(awaiter);
# Line 555 | Line 564 | public class ForkJoinPoolTest extends JS
564                      future.get();
565                  }});
566              t.start();
567 <            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
567 >            await(submitted);
568              t.interrupt();
569 <            t.join();
561 <        } finally {
562 <            quittingTime.countDown();
563 <            joinPool(p);
569 >            awaitTermination(t);
570          }
571      }
572  
# Line 570 | Line 576 | public class ForkJoinPoolTest extends JS
576       */
577      public void testSubmitEE() throws Throwable {
578          ForkJoinPool p = new ForkJoinPool(1);
579 <        try {
580 <            p.submit(new Callable() {
581 <                public Object call() {
582 <                    int i = 5/0;
583 <                    return Boolean.TRUE;
584 <                }}).get();
585 <            shouldThrow();
586 <        } catch (ExecutionException success) {
587 <            assertTrue(success.getCause() instanceof ArithmeticException);
582 <        } finally {
583 <            joinPool(p);
579 >        try (PoolCleaner cleaner = cleaner(p)) {
580 >            try {
581 >                p.submit(new Callable() {
582 >                        public Object call() { throw new ArithmeticException(); }})
583 >                    .get();
584 >                shouldThrow();
585 >            } catch (ExecutionException success) {
586 >                assertTrue(success.getCause() instanceof ArithmeticException);
587 >            }
588          }
589      }
590  
# Line 589 | Line 593 | public class ForkJoinPoolTest extends JS
593       */
594      public void testInvokeAny1() throws Throwable {
595          ExecutorService e = new ForkJoinPool(1);
596 <        try {
597 <            e.invokeAny(null);
598 <            shouldThrow();
599 <        } catch (NullPointerException success) {
600 <        } finally {
597 <            joinPool(e);
596 >        try (PoolCleaner cleaner = cleaner(e)) {
597 >            try {
598 >                e.invokeAny(null);
599 >                shouldThrow();
600 >            } catch (NullPointerException success) {}
601          }
602      }
603  
# Line 603 | Line 606 | public class ForkJoinPoolTest extends JS
606       */
607      public void testInvokeAny2() throws Throwable {
608          ExecutorService e = new ForkJoinPool(1);
609 <        try {
610 <            e.invokeAny(new ArrayList<Callable<String>>());
611 <            shouldThrow();
612 <        } catch (IllegalArgumentException success) {
613 <        } finally {
611 <            joinPool(e);
609 >        try (PoolCleaner cleaner = cleaner(e)) {
610 >            try {
611 >                e.invokeAny(new ArrayList<Callable<String>>());
612 >                shouldThrow();
613 >            } catch (IllegalArgumentException success) {}
614          }
615      }
616  
# Line 617 | Line 619 | public class ForkJoinPoolTest extends JS
619       */
620      public void testInvokeAny3() throws Throwable {
621          ExecutorService e = new ForkJoinPool(1);
622 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
623 <        l.add(null);
624 <        try {
625 <            e.invokeAny(l);
626 <            shouldThrow();
627 <        } catch (NullPointerException success) {
628 <        } finally {
627 <            joinPool(e);
622 >        try (PoolCleaner cleaner = cleaner(e)) {
623 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
624 >            l.add(null);
625 >            try {
626 >                e.invokeAny(l);
627 >                shouldThrow();
628 >            } catch (NullPointerException success) {}
629          }
630      }
631  
# Line 634 | Line 635 | public class ForkJoinPoolTest extends JS
635      public void testInvokeAny4() throws Throwable {
636          CountDownLatch latch = new CountDownLatch(1);
637          ExecutorService e = new ForkJoinPool(1);
638 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
639 <        l.add(latchAwaitingStringTask(latch));
640 <        l.add(null);
641 <        try {
642 <            e.invokeAny(l);
643 <            shouldThrow();
644 <        } catch (NullPointerException success) {
645 <        } finally {
638 >        try (PoolCleaner cleaner = cleaner(e)) {
639 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
640 >            l.add(latchAwaitingStringTask(latch));
641 >            l.add(null);
642 >            try {
643 >                e.invokeAny(l);
644 >                shouldThrow();
645 >            } catch (NullPointerException success) {}
646              latch.countDown();
646            joinPool(e);
647          }
648      }
649  
# Line 652 | Line 652 | public class ForkJoinPoolTest extends JS
652       */
653      public void testInvokeAny5() throws Throwable {
654          ExecutorService e = new ForkJoinPool(1);
655 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
656 <        l.add(new NPETask());
657 <        try {
658 <            e.invokeAny(l);
659 <            shouldThrow();
660 <        } catch (ExecutionException success) {
661 <            assertTrue(success.getCause() instanceof NullPointerException);
662 <        } finally {
663 <            joinPool(e);
655 >        try (PoolCleaner cleaner = cleaner(e)) {
656 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
657 >            l.add(new NPETask());
658 >            try {
659 >                e.invokeAny(l);
660 >                shouldThrow();
661 >            } catch (ExecutionException success) {
662 >                assertTrue(success.getCause() instanceof NullPointerException);
663 >            }
664          }
665      }
666  
# Line 669 | Line 669 | public class ForkJoinPoolTest extends JS
669       */
670      public void testInvokeAny6() throws Throwable {
671          ExecutorService e = new ForkJoinPool(1);
672 <        try {
672 >        try (PoolCleaner cleaner = cleaner(e)) {
673              List<Callable<String>> l = new ArrayList<Callable<String>>();
674              l.add(new StringTask());
675              l.add(new StringTask());
676              String result = e.invokeAny(l);
677              assertSame(TEST_STRING, result);
678        } finally {
679            joinPool(e);
678          }
679      }
680  
# Line 685 | Line 683 | public class ForkJoinPoolTest extends JS
683       */
684      public void testInvokeAll1() throws Throwable {
685          ExecutorService e = new ForkJoinPool(1);
686 <        try {
687 <            e.invokeAll(null);
688 <            shouldThrow();
689 <        } catch (NullPointerException success) {
690 <        } finally {
693 <            joinPool(e);
686 >        try (PoolCleaner cleaner = cleaner(e)) {
687 >            try {
688 >                e.invokeAll(null);
689 >                shouldThrow();
690 >            } catch (NullPointerException success) {}
691          }
692      }
693  
# Line 699 | Line 696 | public class ForkJoinPoolTest extends JS
696       */
697      public void testInvokeAll2() throws InterruptedException {
698          ExecutorService e = new ForkJoinPool(1);
699 <        try {
699 >        try (PoolCleaner cleaner = cleaner(e)) {
700              List<Future<String>> r
701                  = e.invokeAll(new ArrayList<Callable<String>>());
702              assertTrue(r.isEmpty());
706        } finally {
707            joinPool(e);
703          }
704      }
705  
# Line 713 | Line 708 | public class ForkJoinPoolTest extends JS
708       */
709      public void testInvokeAll3() throws InterruptedException {
710          ExecutorService e = new ForkJoinPool(1);
711 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
712 <        l.add(new StringTask());
713 <        l.add(null);
714 <        try {
715 <            e.invokeAll(l);
716 <            shouldThrow();
717 <        } catch (NullPointerException success) {
718 <        } finally {
724 <            joinPool(e);
711 >        try (PoolCleaner cleaner = cleaner(e)) {
712 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
713 >            l.add(new StringTask());
714 >            l.add(null);
715 >            try {
716 >                e.invokeAll(l);
717 >                shouldThrow();
718 >            } catch (NullPointerException success) {}
719          }
720      }
721  
# Line 731 | Line 725 | public class ForkJoinPoolTest extends JS
725       */
726      public void testInvokeAll4() throws Throwable {
727          ExecutorService e = new ForkJoinPool(1);
728 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
729 <        l.add(new NPETask());
730 <        List<Future<String>> futures = e.invokeAll(l);
731 <        assertEquals(1, futures.size());
732 <        try {
733 <            futures.get(0).get();
734 <            shouldThrow();
735 <        } catch (ExecutionException success) {
736 <            assertTrue(success.getCause() instanceof NullPointerException);
737 <        } finally {
738 <            joinPool(e);
728 >        try (PoolCleaner cleaner = cleaner(e)) {
729 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
730 >            l.add(new NPETask());
731 >            List<Future<String>> futures = e.invokeAll(l);
732 >            assertEquals(1, futures.size());
733 >            try {
734 >                futures.get(0).get();
735 >                shouldThrow();
736 >            } catch (ExecutionException success) {
737 >                assertTrue(success.getCause() instanceof NullPointerException);
738 >            }
739          }
740      }
741  
# Line 750 | Line 744 | public class ForkJoinPoolTest extends JS
744       */
745      public void testInvokeAll5() throws Throwable {
746          ExecutorService e = new ForkJoinPool(1);
747 <        try {
747 >        try (PoolCleaner cleaner = cleaner(e)) {
748              List<Callable<String>> l = new ArrayList<Callable<String>>();
749              l.add(new StringTask());
750              l.add(new StringTask());
# Line 758 | Line 752 | public class ForkJoinPoolTest extends JS
752              assertEquals(2, futures.size());
753              for (Future<String> future : futures)
754                  assertSame(TEST_STRING, future.get());
761        } finally {
762            joinPool(e);
755          }
756      }
757  
# Line 768 | Line 760 | public class ForkJoinPoolTest extends JS
760       */
761      public void testTimedInvokeAny1() throws Throwable {
762          ExecutorService e = new ForkJoinPool(1);
763 <        try {
764 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
765 <            shouldThrow();
766 <        } catch (NullPointerException success) {
767 <        } finally {
776 <            joinPool(e);
763 >        try (PoolCleaner cleaner = cleaner(e)) {
764 >            try {
765 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
766 >                shouldThrow();
767 >            } catch (NullPointerException success) {}
768          }
769      }
770  
# Line 782 | Line 773 | public class ForkJoinPoolTest extends JS
773       */
774      public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
775          ExecutorService e = new ForkJoinPool(1);
776 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
777 <        l.add(new StringTask());
778 <        try {
779 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
780 <            shouldThrow();
781 <        } catch (NullPointerException success) {
782 <        } finally {
792 <            joinPool(e);
776 >        try (PoolCleaner cleaner = cleaner(e)) {
777 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
778 >            l.add(new StringTask());
779 >            try {
780 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
781 >                shouldThrow();
782 >            } catch (NullPointerException success) {}
783          }
784      }
785  
# Line 798 | Line 788 | public class ForkJoinPoolTest extends JS
788       */
789      public void testTimedInvokeAny2() throws Throwable {
790          ExecutorService e = new ForkJoinPool(1);
791 <        try {
792 <            e.invokeAny(new ArrayList<Callable<String>>(),
793 <                        MEDIUM_DELAY_MS, MILLISECONDS);
794 <            shouldThrow();
795 <        } catch (IllegalArgumentException success) {
796 <        } finally {
807 <            joinPool(e);
791 >        try (PoolCleaner cleaner = cleaner(e)) {
792 >            try {
793 >                e.invokeAny(new ArrayList<Callable<String>>(),
794 >                            MEDIUM_DELAY_MS, MILLISECONDS);
795 >                shouldThrow();
796 >            } catch (IllegalArgumentException success) {}
797          }
798      }
799  
# Line 814 | Line 803 | public class ForkJoinPoolTest extends JS
803      public void testTimedInvokeAny3() throws Throwable {
804          CountDownLatch latch = new CountDownLatch(1);
805          ExecutorService e = new ForkJoinPool(1);
806 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
807 <        l.add(latchAwaitingStringTask(latch));
808 <        l.add(null);
809 <        try {
810 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
811 <            shouldThrow();
812 <        } catch (NullPointerException success) {
813 <        } finally {
806 >        try (PoolCleaner cleaner = cleaner(e)) {
807 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
808 >            l.add(latchAwaitingStringTask(latch));
809 >            l.add(null);
810 >            try {
811 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
812 >                shouldThrow();
813 >            } catch (NullPointerException success) {}
814              latch.countDown();
826            joinPool(e);
815          }
816      }
817  
# Line 832 | Line 820 | public class ForkJoinPoolTest extends JS
820       */
821      public void testTimedInvokeAny4() throws Throwable {
822          ExecutorService e = new ForkJoinPool(1);
823 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
824 <        l.add(new NPETask());
825 <        try {
826 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
827 <            shouldThrow();
828 <        } catch (ExecutionException success) {
829 <            assertTrue(success.getCause() instanceof NullPointerException);
830 <        } finally {
831 <            joinPool(e);
823 >        try (PoolCleaner cleaner = cleaner(e)) {
824 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
825 >            l.add(new NPETask());
826 >            try {
827 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
828 >                shouldThrow();
829 >            } catch (ExecutionException success) {
830 >                assertTrue(success.getCause() instanceof NullPointerException);
831 >            }
832          }
833      }
834  
# Line 849 | Line 837 | public class ForkJoinPoolTest extends JS
837       */
838      public void testTimedInvokeAny5() throws Throwable {
839          ExecutorService e = new ForkJoinPool(1);
840 <        try {
840 >        try (PoolCleaner cleaner = cleaner(e)) {
841              List<Callable<String>> l = new ArrayList<Callable<String>>();
842              l.add(new StringTask());
843              l.add(new StringTask());
844              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
845              assertSame(TEST_STRING, result);
858        } finally {
859            joinPool(e);
846          }
847      }
848  
# Line 865 | Line 851 | public class ForkJoinPoolTest extends JS
851       */
852      public void testTimedInvokeAll1() throws Throwable {
853          ExecutorService e = new ForkJoinPool(1);
854 <        try {
855 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
856 <            shouldThrow();
857 <        } catch (NullPointerException success) {
858 <        } finally {
873 <            joinPool(e);
854 >        try (PoolCleaner cleaner = cleaner(e)) {
855 >            try {
856 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
857 >                shouldThrow();
858 >            } catch (NullPointerException success) {}
859          }
860      }
861  
# Line 879 | Line 864 | public class ForkJoinPoolTest extends JS
864       */
865      public void testTimedInvokeAllNullTimeUnit() throws Throwable {
866          ExecutorService e = new ForkJoinPool(1);
867 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
868 <        l.add(new StringTask());
869 <        try {
870 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
871 <            shouldThrow();
872 <        } catch (NullPointerException success) {
873 <        } finally {
889 <            joinPool(e);
867 >        try (PoolCleaner cleaner = cleaner(e)) {
868 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
869 >            l.add(new StringTask());
870 >            try {
871 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
872 >                shouldThrow();
873 >            } catch (NullPointerException success) {}
874          }
875      }
876  
# Line 895 | Line 879 | public class ForkJoinPoolTest extends JS
879       */
880      public void testTimedInvokeAll2() throws InterruptedException {
881          ExecutorService e = new ForkJoinPool(1);
882 <        try {
882 >        try (PoolCleaner cleaner = cleaner(e)) {
883              List<Future<String>> r
884                  = e.invokeAll(new ArrayList<Callable<String>>(),
885                                MEDIUM_DELAY_MS, MILLISECONDS);
886              assertTrue(r.isEmpty());
903        } finally {
904            joinPool(e);
887          }
888      }
889  
# Line 910 | Line 892 | public class ForkJoinPoolTest extends JS
892       */
893      public void testTimedInvokeAll3() throws InterruptedException {
894          ExecutorService e = new ForkJoinPool(1);
895 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
896 <        l.add(new StringTask());
897 <        l.add(null);
898 <        try {
899 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
900 <            shouldThrow();
901 <        } catch (NullPointerException success) {
902 <        } finally {
921 <            joinPool(e);
895 >        try (PoolCleaner cleaner = cleaner(e)) {
896 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
897 >            l.add(new StringTask());
898 >            l.add(null);
899 >            try {
900 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
901 >                shouldThrow();
902 >            } catch (NullPointerException success) {}
903          }
904      }
905  
# Line 927 | Line 908 | public class ForkJoinPoolTest extends JS
908       */
909      public void testTimedInvokeAll4() throws Throwable {
910          ExecutorService e = new ForkJoinPool(1);
911 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
912 <        l.add(new NPETask());
913 <        List<Future<String>> futures
914 <            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
915 <        assertEquals(1, futures.size());
916 <        try {
917 <            futures.get(0).get();
918 <            shouldThrow();
919 <        } catch (ExecutionException success) {
920 <            assertTrue(success.getCause() instanceof NullPointerException);
921 <        } finally {
922 <            joinPool(e);
911 >        try (PoolCleaner cleaner = cleaner(e)) {
912 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
913 >            l.add(new NPETask());
914 >            List<Future<String>> futures
915 >                = e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
916 >            assertEquals(1, futures.size());
917 >            try {
918 >                futures.get(0).get();
919 >                shouldThrow();
920 >            } catch (ExecutionException success) {
921 >                assertTrue(success.getCause() instanceof NullPointerException);
922 >            }
923          }
924      }
925  
# Line 946 | Line 927 | public class ForkJoinPoolTest extends JS
927       * timed invokeAll(c) returns results of all completed tasks in c
928       */
929      public void testTimedInvokeAll5() throws Throwable {
930 <        ExecutorService e = new ForkJoinPool(1);
931 <        try {
930 >        ForkJoinPool e = new ForkJoinPool(1);
931 >        try (PoolCleaner cleaner = cleaner(e)) {
932              List<Callable<String>> l = new ArrayList<Callable<String>>();
933              l.add(new StringTask());
934              l.add(new StringTask());
935              List<Future<String>> futures
936 <                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
936 >                = e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
937              assertEquals(2, futures.size());
938              for (Future<String> future : futures)
939                  assertSame(TEST_STRING, future.get());
959        } finally {
960            joinPool(e);
940          }
941      }
942  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines