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.62 by jsr166, Sun Oct 4 07:42:07 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 107 | Line 107 | public class ForkJoinPoolTest extends JS
107      static final class FibTask extends RecursiveTask<Integer> {
108          final int number;
109          FibTask(int n) { number = n; }
110 <        public Integer compute() {
110 >        protected Integer compute() {
111              int n = number;
112              if (n <= 1)
113                  return n;
# Line 135 | Line 135 | public class ForkJoinPoolTest extends JS
135              this.locker = locker;
136              this.lock = lock;
137          }
138 <        public Integer compute() {
138 >        protected Integer compute() {
139              int n;
140              LockingFibTask f1 = null;
141              LockingFibTask f2 = null;
# Line 162 | Line 162 | public class ForkJoinPoolTest extends JS
162       */
163      public void testDefaultInitialState() {
164          ForkJoinPool p = new ForkJoinPool(1);
165 <        try {
165 >        try (PoolCleaner cleaner = cleaner(p)) {
166              assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
167                         p.getFactory());
168              assertFalse(p.getAsyncMode());
# Line 174 | Line 174 | public class ForkJoinPoolTest extends JS
174              assertFalse(p.isShutdown());
175              assertFalse(p.isTerminating());
176              assertFalse(p.isTerminated());
177        } finally {
178            joinPool(p);
177          }
178      }
179  
# Line 204 | Line 202 | public class ForkJoinPoolTest extends JS
202       */
203      public void testGetParallelism() {
204          ForkJoinPool p = new ForkJoinPool(1);
205 <        try {
205 >        try (PoolCleaner cleaner = cleaner(p)) {
206              assertEquals(1, p.getParallelism());
209        } finally {
210            joinPool(p);
207          }
208      }
209  
# Line 216 | Line 212 | public class ForkJoinPoolTest extends JS
212       */
213      public void testGetPoolSize() {
214          ForkJoinPool p = new ForkJoinPool(1);
215 <        try {
215 >        try (PoolCleaner cleaner = cleaner(p)) {
216              assertEquals(0, p.getActiveThreadCount());
217              Future<String> future = p.submit(new StringTask());
218              assertEquals(1, p.getPoolSize());
219 <        } finally {
220 <            joinPool(p);
219 >        }
220 >    }
221 >
222 >    /**
223 >     * awaitTermination on a non-shutdown pool times out
224 >     */
225 >    public void testAwaitTermination_timesOut() throws InterruptedException {
226 >        ForkJoinPool p = new ForkJoinPool(1);
227 >        try (PoolCleaner cleaner = cleaner(p)) {
228 >            assertFalse(p.isTerminated());
229 >            assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
230 >            assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
231 >            assertFalse(p.awaitTermination(-1L, NANOSECONDS));
232 >            assertFalse(p.awaitTermination(-1L, MILLISECONDS));
233 >            assertFalse(p.awaitTermination(0L, NANOSECONDS));
234 >            assertFalse(p.awaitTermination(0L, MILLISECONDS));
235 >            long timeoutNanos = 999999L;
236 >            long startTime = System.nanoTime();
237 >            assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
238 >            assertTrue(System.nanoTime() - startTime >= timeoutNanos);
239 >            assertFalse(p.isTerminated());
240 >            startTime = System.nanoTime();
241 >            long timeoutMillis = timeoutMillis();
242 >            assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
243 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
244 >            assertFalse(p.isTerminated());
245 >            p.shutdown();
246 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
247 >            assertTrue(p.isTerminated());
248          }
249      }
250  
# Line 242 | Line 265 | public class ForkJoinPoolTest extends JS
265                                            eh, false);
266          try {
267              assertSame(eh, p.getUncaughtExceptionHandler());
268 <            p.execute(new FibTask(8));
269 <            assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
268 >            try {
269 >                p.execute(new FibTask(8));
270 >                assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
271 >            } catch (RejectedExecutionException ok) {
272 >            }
273          } finally {
274              p.shutdownNow(); // failure might have prevented processing task
275              joinPool(p);
# Line 258 | Line 284 | public class ForkJoinPoolTest extends JS
284       */
285      public void testIsQuiescent() throws Exception {
286          ForkJoinPool p = new ForkJoinPool(2);
287 <        try {
287 >        try (PoolCleaner cleaner = cleaner(p)) {
288              assertTrue(p.isQuiescent());
289              long startTime = System.nanoTime();
290              FibTask f = new FibTask(20);
# Line 286 | Line 312 | public class ForkJoinPoolTest extends JS
312              assertFalse(p.isTerminated());
313              assertTrue(f.isDone());
314              assertEquals(6765, (int) f.get());
289        } finally {
290            joinPool(p);
315          }
316      }
317  
# Line 296 | Line 320 | public class ForkJoinPoolTest extends JS
320       */
321      public void testSubmitForkJoinTask() throws Throwable {
322          ForkJoinPool p = new ForkJoinPool(1);
323 <        try {
323 >        try (PoolCleaner cleaner = cleaner(p)) {
324              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
325              assertEquals(21, (int) f.get());
302        } finally {
303            joinPool(p);
326          }
327      }
328  
# Line 309 | Line 331 | public class ForkJoinPoolTest extends JS
331       */
332      public void testSubmitAfterShutdown() {
333          ForkJoinPool p = new ForkJoinPool(1);
334 <        try {
334 >        try (PoolCleaner cleaner = cleaner(p)) {
335              p.shutdown();
336              assertTrue(p.isShutdown());
337              try {
338                  ForkJoinTask<Integer> f = p.submit(new FibTask(8));
339                  shouldThrow();
340              } catch (RejectedExecutionException success) {}
319        } finally {
320            joinPool(p);
341          }
342      }
343  
# Line 343 | Line 363 | public class ForkJoinPoolTest extends JS
363      public void testPollSubmission() {
364          final CountDownLatch done = new CountDownLatch(1);
365          SubFJP p = new SubFJP();
366 <        try {
366 >        try (PoolCleaner cleaner = cleaner(p)) {
367              ForkJoinTask a = p.submit(awaiter(done));
368              ForkJoinTask b = p.submit(awaiter(done));
369              ForkJoinTask c = p.submit(awaiter(done));
370              ForkJoinTask r = p.pollSubmission();
371              assertTrue(r == a || r == b || r == c);
372              assertFalse(r.isDone());
353        } finally {
373              done.countDown();
355            joinPool(p);
374          }
375      }
376  
# Line 362 | Line 380 | public class ForkJoinPoolTest extends JS
380      public void testDrainTasksTo() {
381          final CountDownLatch done = new CountDownLatch(1);
382          SubFJP p = new SubFJP();
383 <        try {
383 >        try (PoolCleaner cleaner = cleaner(p)) {
384              ForkJoinTask a = p.submit(awaiter(done));
385              ForkJoinTask b = p.submit(awaiter(done));
386              ForkJoinTask c = p.submit(awaiter(done));
# Line 373 | Line 391 | public class ForkJoinPoolTest extends JS
391                  assertTrue(r == a || r == b || r == c);
392                  assertFalse(r.isDone());
393              }
376        } finally {
394              done.countDown();
378            joinPool(p);
395          }
396      }
397  
# Line 386 | Line 402 | public class ForkJoinPoolTest extends JS
402       */
403      public void testExecuteRunnable() throws Throwable {
404          ExecutorService e = new ForkJoinPool(1);
405 <        try {
405 >        try (PoolCleaner cleaner = cleaner(e)) {
406              final AtomicBoolean done = new AtomicBoolean(false);
407 <            CheckedRunnable task = new CheckedRunnable() {
407 >            Future<?> future = e.submit(new CheckedRunnable() {
408                  public void realRun() {
409                      done.set(true);
410 <                }};
395 <            Future<?> future = e.submit(task);
410 >                }});
411              assertNull(future.get());
412              assertNull(future.get(0, MILLISECONDS));
413              assertTrue(done.get());
414              assertTrue(future.isDone());
415              assertFalse(future.isCancelled());
401        } finally {
402            joinPool(e);
416          }
417      }
418  
# Line 408 | Line 421 | public class ForkJoinPoolTest extends JS
421       */
422      public void testSubmitCallable() throws Throwable {
423          ExecutorService e = new ForkJoinPool(1);
424 <        try {
424 >        try (PoolCleaner cleaner = cleaner(e)) {
425              Future<String> future = e.submit(new StringTask());
426              assertSame(TEST_STRING, future.get());
427              assertTrue(future.isDone());
428              assertFalse(future.isCancelled());
416        } finally {
417            joinPool(e);
429          }
430      }
431  
# Line 423 | Line 434 | public class ForkJoinPoolTest extends JS
434       */
435      public void testSubmitRunnable() throws Throwable {
436          ExecutorService e = new ForkJoinPool(1);
437 <        try {
437 >        try (PoolCleaner cleaner = cleaner(e)) {
438              Future<?> future = e.submit(new NoOpRunnable());
439              assertNull(future.get());
440              assertTrue(future.isDone());
441              assertFalse(future.isCancelled());
431        } finally {
432            joinPool(e);
442          }
443      }
444  
# Line 438 | Line 447 | public class ForkJoinPoolTest extends JS
447       */
448      public void testSubmitRunnable2() throws Throwable {
449          ExecutorService e = new ForkJoinPool(1);
450 <        try {
450 >        try (PoolCleaner cleaner = cleaner(e)) {
451              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
452              assertSame(TEST_STRING, future.get());
453              assertTrue(future.isDone());
454              assertFalse(future.isCancelled());
446        } finally {
447            joinPool(e);
455          }
456      }
457  
# Line 452 | Line 459 | public class ForkJoinPoolTest extends JS
459       * A submitted privileged action runs to completion
460       */
461      public void testSubmitPrivilegedAction() throws Exception {
462 +        final Callable callable = Executors.callable(new PrivilegedAction() {
463 +                public Object run() { return TEST_STRING; }});
464          Runnable r = new CheckedRunnable() {
465 <            public void realRun() throws Exception {
466 <                ExecutorService e = new ForkJoinPool(1);
467 <                Future future = e.submit(Executors.callable(new PrivilegedAction() {
468 <                    public Object run() {
460 <                        return TEST_STRING;
461 <                    }}));
462 <
465 >        public void realRun() throws Exception {
466 >            ExecutorService e = new ForkJoinPool(1);
467 >            try (PoolCleaner cleaner = cleaner(e)) {
468 >                Future future = e.submit(callable);
469                  assertSame(TEST_STRING, future.get());
470 <            }};
470 >            }
471 >        }};
472  
473 <        runWithPermissions(r,
467 <                           new RuntimePermission("modifyThread"));
473 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
474      }
475  
476      /**
477       * A submitted privileged exception action runs to completion
478       */
479      public void testSubmitPrivilegedExceptionAction() throws Exception {
480 +        final Callable callable =
481 +            Executors.callable(new PrivilegedExceptionAction() {
482 +                public Object run() { return TEST_STRING; }});
483          Runnable r = new CheckedRunnable() {
484 <            public void realRun() throws Exception {
485 <                ExecutorService e = new ForkJoinPool(1);
486 <                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
487 <                    public Object run() {
479 <                        return TEST_STRING;
480 <                    }}));
481 <
484 >        public void realRun() throws Exception {
485 >            ExecutorService e = new ForkJoinPool(1);
486 >            try (PoolCleaner cleaner = cleaner(e)) {
487 >                Future future = e.submit(callable);
488                  assertSame(TEST_STRING, future.get());
489 <            }};
489 >            }
490 >        }};
491  
492          runWithPermissions(r, new RuntimePermission("modifyThread"));
493      }
# Line 489 | Line 496 | public class ForkJoinPoolTest extends JS
496       * A submitted failed privileged exception action reports exception
497       */
498      public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
499 +        final Callable callable =
500 +            Executors.callable(new PrivilegedExceptionAction() {
501 +                public Object run() { throw new IndexOutOfBoundsException(); }});
502          Runnable r = new CheckedRunnable() {
503 <            public void realRun() throws Exception {
504 <                ExecutorService e = new ForkJoinPool(1);
505 <                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
506 <                    public Object run() throws Exception {
497 <                        throw new IndexOutOfBoundsException();
498 <                    }}));
499 <
503 >        public void realRun() throws Exception {
504 >            ExecutorService e = new ForkJoinPool(1);
505 >            try (PoolCleaner cleaner = cleaner(e)) {
506 >                Future future = e.submit(callable);
507                  try {
508                      future.get();
509                      shouldThrow();
510                  } catch (ExecutionException success) {
511                      assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
512 <                }}};
512 >                }
513 >            }
514 >        }};
515  
516          runWithPermissions(r, new RuntimePermission("modifyThread"));
517      }
# Line 512 | Line 521 | public class ForkJoinPoolTest extends JS
521       */
522      public void testExecuteNullRunnable() {
523          ExecutorService e = new ForkJoinPool(1);
524 <        try {
525 <            Future<?> future = e.submit((Runnable) null);
526 <            shouldThrow();
527 <        } catch (NullPointerException success) {
528 <        } finally {
520 <            joinPool(e);
524 >        try (PoolCleaner cleaner = cleaner(e)) {
525 >            try {
526 >                Future<?> future = e.submit((Runnable) null);
527 >                shouldThrow();
528 >            } catch (NullPointerException success) {}
529          }
530      }
531  
# Line 526 | Line 534 | public class ForkJoinPoolTest extends JS
534       */
535      public void testSubmitNullCallable() {
536          ExecutorService e = new ForkJoinPool(1);
537 <        try {
538 <            Future<String> future = e.submit((Callable) null);
539 <            shouldThrow();
540 <        } catch (NullPointerException success) {
541 <        } finally {
534 <            joinPool(e);
537 >        try (PoolCleaner cleaner = cleaner(e)) {
538 >            try {
539 >                Future<String> future = e.submit((Callable) null);
540 >                shouldThrow();
541 >            } catch (NullPointerException success) {}
542          }
543      }
544  
# Line 570 | Line 577 | public class ForkJoinPoolTest extends JS
577       */
578      public void testSubmitEE() throws Throwable {
579          ForkJoinPool p = new ForkJoinPool(1);
580 <        try {
581 <            p.submit(new Callable() {
582 <                public Object call() {
583 <                    int i = 5/0;
584 <                    return Boolean.TRUE;
585 <                }}).get();
586 <            shouldThrow();
587 <        } catch (ExecutionException success) {
588 <            assertTrue(success.getCause() instanceof ArithmeticException);
582 <        } finally {
583 <            joinPool(p);
580 >        try (PoolCleaner cleaner = cleaner(p)) {
581 >            try {
582 >                p.submit(new Callable() {
583 >                        public Object call() { throw new ArithmeticException(); }})
584 >                    .get();
585 >                shouldThrow();
586 >            } catch (ExecutionException success) {
587 >                assertTrue(success.getCause() instanceof ArithmeticException);
588 >            }
589          }
590      }
591  
# Line 589 | Line 594 | public class ForkJoinPoolTest extends JS
594       */
595      public void testInvokeAny1() throws Throwable {
596          ExecutorService e = new ForkJoinPool(1);
597 <        try {
598 <            e.invokeAny(null);
599 <            shouldThrow();
600 <        } catch (NullPointerException success) {
601 <        } finally {
597 <            joinPool(e);
597 >        try (PoolCleaner cleaner = cleaner(e)) {
598 >            try {
599 >                e.invokeAny(null);
600 >                shouldThrow();
601 >            } catch (NullPointerException success) {}
602          }
603      }
604  
# Line 603 | Line 607 | public class ForkJoinPoolTest extends JS
607       */
608      public void testInvokeAny2() throws Throwable {
609          ExecutorService e = new ForkJoinPool(1);
610 <        try {
611 <            e.invokeAny(new ArrayList<Callable<String>>());
612 <            shouldThrow();
613 <        } catch (IllegalArgumentException success) {
614 <        } finally {
611 <            joinPool(e);
610 >        try (PoolCleaner cleaner = cleaner(e)) {
611 >            try {
612 >                e.invokeAny(new ArrayList<Callable<String>>());
613 >                shouldThrow();
614 >            } catch (IllegalArgumentException success) {}
615          }
616      }
617  
# Line 617 | Line 620 | public class ForkJoinPoolTest extends JS
620       */
621      public void testInvokeAny3() throws Throwable {
622          ExecutorService e = new ForkJoinPool(1);
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 <        } finally {
627 <            joinPool(e);
623 >        try (PoolCleaner cleaner = cleaner(e)) {
624 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
625 >            l.add(null);
626 >            try {
627 >                e.invokeAny(l);
628 >                shouldThrow();
629 >            } catch (NullPointerException success) {}
630          }
631      }
632  
# Line 634 | Line 636 | public class ForkJoinPoolTest extends JS
636      public void testInvokeAny4() throws Throwable {
637          CountDownLatch latch = new CountDownLatch(1);
638          ExecutorService e = new ForkJoinPool(1);
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 <        } finally {
639 >        try (PoolCleaner cleaner = cleaner(e)) {
640 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
641 >            l.add(latchAwaitingStringTask(latch));
642 >            l.add(null);
643 >            try {
644 >                e.invokeAny(l);
645 >                shouldThrow();
646 >            } catch (NullPointerException success) {}
647              latch.countDown();
646            joinPool(e);
648          }
649      }
650  
# Line 652 | Line 653 | public class ForkJoinPoolTest extends JS
653       */
654      public void testInvokeAny5() throws Throwable {
655          ExecutorService e = new ForkJoinPool(1);
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 <        } finally {
664 <            joinPool(e);
656 >        try (PoolCleaner cleaner = cleaner(e)) {
657 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
658 >            l.add(new NPETask());
659 >            try {
660 >                e.invokeAny(l);
661 >                shouldThrow();
662 >            } catch (ExecutionException success) {
663 >                assertTrue(success.getCause() instanceof NullPointerException);
664 >            }
665          }
666      }
667  
# Line 669 | Line 670 | public class ForkJoinPoolTest extends JS
670       */
671      public void testInvokeAny6() throws Throwable {
672          ExecutorService e = new ForkJoinPool(1);
673 <        try {
673 >        try (PoolCleaner cleaner = cleaner(e)) {
674              List<Callable<String>> l = new ArrayList<Callable<String>>();
675              l.add(new StringTask());
676              l.add(new StringTask());
677              String result = e.invokeAny(l);
678              assertSame(TEST_STRING, result);
678        } finally {
679            joinPool(e);
679          }
680      }
681  
# Line 685 | Line 684 | public class ForkJoinPoolTest extends JS
684       */
685      public void testInvokeAll1() throws Throwable {
686          ExecutorService e = new ForkJoinPool(1);
687 <        try {
688 <            e.invokeAll(null);
689 <            shouldThrow();
690 <        } catch (NullPointerException success) {
691 <        } finally {
693 <            joinPool(e);
687 >        try (PoolCleaner cleaner = cleaner(e)) {
688 >            try {
689 >                e.invokeAll(null);
690 >                shouldThrow();
691 >            } catch (NullPointerException success) {}
692          }
693      }
694  
# Line 699 | Line 697 | public class ForkJoinPoolTest extends JS
697       */
698      public void testInvokeAll2() throws InterruptedException {
699          ExecutorService e = new ForkJoinPool(1);
700 <        try {
700 >        try (PoolCleaner cleaner = cleaner(e)) {
701              List<Future<String>> r
702                  = e.invokeAll(new ArrayList<Callable<String>>());
703              assertTrue(r.isEmpty());
706        } finally {
707            joinPool(e);
704          }
705      }
706  
# Line 713 | Line 709 | public class ForkJoinPoolTest extends JS
709       */
710      public void testInvokeAll3() throws InterruptedException {
711          ExecutorService e = new ForkJoinPool(1);
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 <        } finally {
724 <            joinPool(e);
712 >        try (PoolCleaner cleaner = cleaner(e)) {
713 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
714 >            l.add(new StringTask());
715 >            l.add(null);
716 >            try {
717 >                e.invokeAll(l);
718 >                shouldThrow();
719 >            } catch (NullPointerException success) {}
720          }
721      }
722  
# Line 731 | Line 726 | public class ForkJoinPoolTest extends JS
726       */
727      public void testInvokeAll4() throws Throwable {
728          ExecutorService e = new ForkJoinPool(1);
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 <        } finally {
739 <            joinPool(e);
729 >        try (PoolCleaner cleaner = cleaner(e)) {
730 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
731 >            l.add(new NPETask());
732 >            List<Future<String>> futures = e.invokeAll(l);
733 >            assertEquals(1, futures.size());
734 >            try {
735 >                futures.get(0).get();
736 >                shouldThrow();
737 >            } catch (ExecutionException success) {
738 >                assertTrue(success.getCause() instanceof NullPointerException);
739 >            }
740          }
741      }
742  
# Line 750 | Line 745 | public class ForkJoinPoolTest extends JS
745       */
746      public void testInvokeAll5() throws Throwable {
747          ExecutorService e = new ForkJoinPool(1);
748 <        try {
748 >        try (PoolCleaner cleaner = cleaner(e)) {
749              List<Callable<String>> l = new ArrayList<Callable<String>>();
750              l.add(new StringTask());
751              l.add(new StringTask());
# Line 758 | Line 753 | public class ForkJoinPoolTest extends JS
753              assertEquals(2, futures.size());
754              for (Future<String> future : futures)
755                  assertSame(TEST_STRING, future.get());
761        } finally {
762            joinPool(e);
756          }
757      }
758  
# Line 768 | Line 761 | public class ForkJoinPoolTest extends JS
761       */
762      public void testTimedInvokeAny1() throws Throwable {
763          ExecutorService e = new ForkJoinPool(1);
764 <        try {
765 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
766 <            shouldThrow();
767 <        } catch (NullPointerException success) {
768 <        } finally {
776 <            joinPool(e);
764 >        try (PoolCleaner cleaner = cleaner(e)) {
765 >            try {
766 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
767 >                shouldThrow();
768 >            } catch (NullPointerException success) {}
769          }
770      }
771  
# Line 782 | Line 774 | public class ForkJoinPoolTest extends JS
774       */
775      public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
776          ExecutorService e = new ForkJoinPool(1);
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 <        } finally {
792 <            joinPool(e);
777 >        try (PoolCleaner cleaner = cleaner(e)) {
778 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
779 >            l.add(new StringTask());
780 >            try {
781 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
782 >                shouldThrow();
783 >            } catch (NullPointerException success) {}
784          }
785      }
786  
# Line 798 | Line 789 | public class ForkJoinPoolTest extends JS
789       */
790      public void testTimedInvokeAny2() throws Throwable {
791          ExecutorService e = new ForkJoinPool(1);
792 <        try {
793 <            e.invokeAny(new ArrayList<Callable<String>>(),
794 <                        MEDIUM_DELAY_MS, MILLISECONDS);
795 <            shouldThrow();
796 <        } catch (IllegalArgumentException success) {
797 <        } finally {
807 <            joinPool(e);
792 >        try (PoolCleaner cleaner = cleaner(e)) {
793 >            try {
794 >                e.invokeAny(new ArrayList<Callable<String>>(),
795 >                            MEDIUM_DELAY_MS, MILLISECONDS);
796 >                shouldThrow();
797 >            } catch (IllegalArgumentException success) {}
798          }
799      }
800  
# Line 814 | Line 804 | public class ForkJoinPoolTest extends JS
804      public void testTimedInvokeAny3() throws Throwable {
805          CountDownLatch latch = new CountDownLatch(1);
806          ExecutorService e = new ForkJoinPool(1);
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 <        } finally {
807 >        try (PoolCleaner cleaner = cleaner(e)) {
808 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
809 >            l.add(latchAwaitingStringTask(latch));
810 >            l.add(null);
811 >            try {
812 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
813 >                shouldThrow();
814 >            } catch (NullPointerException success) {}
815              latch.countDown();
826            joinPool(e);
816          }
817      }
818  
# Line 832 | Line 821 | public class ForkJoinPoolTest extends JS
821       */
822      public void testTimedInvokeAny4() throws Throwable {
823          ExecutorService e = new ForkJoinPool(1);
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 <        } finally {
832 <            joinPool(e);
824 >        try (PoolCleaner cleaner = cleaner(e)) {
825 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
826 >            l.add(new NPETask());
827 >            try {
828 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
829 >                shouldThrow();
830 >            } catch (ExecutionException success) {
831 >                assertTrue(success.getCause() instanceof NullPointerException);
832 >            }
833          }
834      }
835  
# Line 849 | Line 838 | public class ForkJoinPoolTest extends JS
838       */
839      public void testTimedInvokeAny5() throws Throwable {
840          ExecutorService e = new ForkJoinPool(1);
841 <        try {
841 >        try (PoolCleaner cleaner = cleaner(e)) {
842              List<Callable<String>> l = new ArrayList<Callable<String>>();
843              l.add(new StringTask());
844              l.add(new StringTask());
845              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
846              assertSame(TEST_STRING, result);
858        } finally {
859            joinPool(e);
847          }
848      }
849  
# Line 865 | Line 852 | public class ForkJoinPoolTest extends JS
852       */
853      public void testTimedInvokeAll1() throws Throwable {
854          ExecutorService e = new ForkJoinPool(1);
855 <        try {
856 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
857 <            shouldThrow();
858 <        } catch (NullPointerException success) {
859 <        } finally {
873 <            joinPool(e);
855 >        try (PoolCleaner cleaner = cleaner(e)) {
856 >            try {
857 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
858 >                shouldThrow();
859 >            } catch (NullPointerException success) {}
860          }
861      }
862  
# Line 879 | Line 865 | public class ForkJoinPoolTest extends JS
865       */
866      public void testTimedInvokeAllNullTimeUnit() throws Throwable {
867          ExecutorService e = new ForkJoinPool(1);
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 <        } finally {
889 <            joinPool(e);
868 >        try (PoolCleaner cleaner = cleaner(e)) {
869 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
870 >            l.add(new StringTask());
871 >            try {
872 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
873 >                shouldThrow();
874 >            } catch (NullPointerException success) {}
875          }
876      }
877  
# Line 895 | Line 880 | public class ForkJoinPoolTest extends JS
880       */
881      public void testTimedInvokeAll2() throws InterruptedException {
882          ExecutorService e = new ForkJoinPool(1);
883 <        try {
883 >        try (PoolCleaner cleaner = cleaner(e)) {
884              List<Future<String>> r
885                  = e.invokeAll(new ArrayList<Callable<String>>(),
886                                MEDIUM_DELAY_MS, MILLISECONDS);
887              assertTrue(r.isEmpty());
903        } finally {
904            joinPool(e);
888          }
889      }
890  
# Line 910 | Line 893 | public class ForkJoinPoolTest extends JS
893       */
894      public void testTimedInvokeAll3() throws InterruptedException {
895          ExecutorService e = new ForkJoinPool(1);
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 <        } finally {
921 <            joinPool(e);
896 >        try (PoolCleaner cleaner = cleaner(e)) {
897 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
898 >            l.add(new StringTask());
899 >            l.add(null);
900 >            try {
901 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
902 >                shouldThrow();
903 >            } catch (NullPointerException success) {}
904          }
905      }
906  
# Line 927 | Line 909 | public class ForkJoinPoolTest extends JS
909       */
910      public void testTimedInvokeAll4() throws Throwable {
911          ExecutorService e = new ForkJoinPool(1);
912 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
913 <        l.add(new NPETask());
914 <        List<Future<String>> futures
915 <            = e.invokeAll(l, MEDIUM_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 <        } finally {
923 <            joinPool(e);
912 >        try (PoolCleaner cleaner = cleaner(e)) {
913 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
914 >            l.add(new NPETask());
915 >            List<Future<String>> futures
916 >                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
917 >            assertEquals(1, futures.size());
918 >            try {
919 >                futures.get(0).get();
920 >                shouldThrow();
921 >            } catch (ExecutionException success) {
922 >                assertTrue(success.getCause() instanceof NullPointerException);
923 >            }
924          }
925      }
926  
# Line 946 | Line 928 | public class ForkJoinPoolTest extends JS
928       * timed invokeAll(c) returns results of all completed tasks in c
929       */
930      public void testTimedInvokeAll5() throws Throwable {
931 <        ExecutorService e = new ForkJoinPool(1);
932 <        try {
931 >        ForkJoinPool e = new ForkJoinPool(1);
932 >        try (PoolCleaner cleaner = cleaner(e)) {
933              List<Callable<String>> l = new ArrayList<Callable<String>>();
934              l.add(new StringTask());
935              l.add(new StringTask());
936              List<Future<String>> futures
937 <                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
937 >                = e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
938              assertEquals(2, futures.size());
939              for (Future<String> future : futures)
940                  assertSame(TEST_STRING, future.get());
959        } finally {
960            joinPool(e);
941          }
942      }
943  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines