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.5 by jsr166, Sat Aug 1 22:09:13 2009 UTC vs.
Revision 1.16 by jsr166, Tue Dec 1 22:51:44 2009 UTC

# Line 8 | Line 8
8   import junit.framework.*;
9   import java.util.*;
10   import java.util.concurrent.*;
11 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
12   import java.util.concurrent.locks.*;
13   import java.security.*;
14  
# Line 50 | Line 51 | public class ForkJoinPoolTest extends JS
51          protected void onStart() { throw new Error(); }
52      }
53  
54 <    static class FailingThreadFactory implements ForkJoinPool.ForkJoinWorkerThreadFactory {
54 >    static class FailingThreadFactory
55 >            implements ForkJoinPool.ForkJoinWorkerThreadFactory {
56          int calls = 0;
57          public ForkJoinWorkerThread newThread(ForkJoinPool p) {
58              if (++calls > 1) return null;
# Line 143 | Line 145 | public class ForkJoinPoolTest extends JS
145          ForkJoinPool p = null;
146          try {
147              p = new ForkJoinPool(1);
148 <            assertTrue(p.getFactory() == ForkJoinPool.defaultForkJoinWorkerThreadFactory);
148 >            assertTrue(p.getFactory() ==
149 >                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
150              assertTrue(p.isQuiescent());
151              assertTrue(p.getMaintainsParallelism());
152              assertFalse(p.getAsyncMode());
# Line 167 | Line 170 | public class ForkJoinPoolTest extends JS
170          try {
171              new ForkJoinPool(-1);
172              shouldThrow();
173 <        }
171 <        catch (IllegalArgumentException success) {}
173 >        } catch (IllegalArgumentException success) {}
174      }
175  
176      /**
# Line 178 | Line 180 | public class ForkJoinPoolTest extends JS
180          try {
181              new ForkJoinPool(1, null);
182              shouldThrow();
183 <        }
182 <        catch (NullPointerException success) {}
183 >        } catch (NullPointerException success) {}
184      }
185  
186  
# Line 308 | Line 309 | public class ForkJoinPoolTest extends JS
309       * Additionally tests: Overriding ForkJoinWorkerThread.onStart
310       * performs its defined action
311       */
312 <    public void testSetUncaughtExceptionHandler() {
312 >    public void testSetUncaughtExceptionHandler() throws InterruptedException {
313          ForkJoinPool p = null;
314          try {
315              p = new ForkJoinPool(1, new FailingThreadFactory());
# Line 318 | Line 319 | public class ForkJoinPoolTest extends JS
319              p.execute(new FailingTask());
320              Thread.sleep(MEDIUM_DELAY_MS);
321              assertTrue(eh.catches > 0);
321        } catch (InterruptedException e) {
322            unexpectedException();
322          } finally {
323              joinPool(p);
324          }
# Line 345 | Line 344 | public class ForkJoinPoolTest extends JS
344       * queues are empty, threads are not active, and
345       * construction parameters continue to hold
346       */
347 <    public void testisQuiescent() {
347 >    public void testisQuiescent() throws InterruptedException {
348          ForkJoinPool p = null;
349          try {
350              p = new ForkJoinPool(2);
351              p.invoke(new FibTask(20));
352 <            assertTrue(p.getFactory() == ForkJoinPool.defaultForkJoinWorkerThreadFactory);
352 >            assertTrue(p.getFactory() ==
353 >                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
354              Thread.sleep(MEDIUM_DELAY_MS);
355              assertTrue(p.isQuiescent());
356              assertTrue(p.getMaintainsParallelism());
# Line 362 | Line 362 | public class ForkJoinPoolTest extends JS
362              assertFalse(p.isShutdown());
363              assertFalse(p.isTerminating());
364              assertFalse(p.isTerminated());
365        } catch (InterruptedException e) {
366            unexpectedException();
365          } finally {
366              joinPool(p);
367          }
# Line 372 | Line 370 | public class ForkJoinPoolTest extends JS
370      /**
371       * Completed submit(ForkJoinTask) returns result
372       */
373 <    public void testSubmitForkJoinTask() {
373 >    public void testSubmitForkJoinTask() throws Throwable {
374          ForkJoinPool p = null;
375          try {
376              p = new ForkJoinPool(1);
377              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
378              int r = f.get();
379              assertTrue(r == 21);
382        } catch (ExecutionException ex) {
383            unexpectedException();
384        } catch (InterruptedException ex) {
385            unexpectedException();
380          } finally {
381              joinPool(p);
382          }
# Line 408 | Line 402 | public class ForkJoinPoolTest extends JS
402      /**
403       * Pool maintains parallelism when using ManagedBlocker
404       */
405 <    public void testBlockingForkJoinTask() {
405 >    public void testBlockingForkJoinTask() throws Throwable {
406          ForkJoinPool p = null;
407          try {
408              p = new ForkJoinPool(4);
# Line 418 | Line 412 | public class ForkJoinPoolTest extends JS
412              p.execute(f);
413              assertTrue(p.getPoolSize() >= 4);
414              int r = f.get();
415 <            assertTrue(r ==  832040);
422 <        } catch (ExecutionException ex) {
423 <            unexpectedException();
424 <        } catch (InterruptedException ex) {
425 <            unexpectedException();
415 >            assertTrue(r == 832040);
416          } finally {
417 <            joinPool(p);
417 >            p.shutdownNow(); // don't wait out shutdown
418          }
419      }
420  
# Line 474 | Line 464 | public class ForkJoinPoolTest extends JS
464      /**
465       * execute(runnable) runs it to completion
466       */
467 <    public void testExecuteRunnable() {
468 <        try {
469 <            ExecutorService e = new ForkJoinPool(1);
470 <            TrackedShortRunnable task = new TrackedShortRunnable();
471 <            assertFalse(task.done);
472 <            Future<?> future = e.submit(task);
473 <            future.get();
484 <            assertTrue(task.done);
485 <        }
486 <        catch (ExecutionException ex) {
487 <            unexpectedException();
488 <        }
489 <        catch (InterruptedException ex) {
490 <            unexpectedException();
491 <        }
467 >    public void testExecuteRunnable() throws Throwable {
468 >        ExecutorService e = new ForkJoinPool(1);
469 >        TrackedShortRunnable task = new TrackedShortRunnable();
470 >        assertFalse(task.done);
471 >        Future<?> future = e.submit(task);
472 >        future.get();
473 >        assertTrue(task.done);
474      }
475  
476  
477      /**
478       * Completed submit(callable) returns result
479       */
480 <    public void testSubmitCallable() {
481 <        try {
482 <            ExecutorService e = new ForkJoinPool(1);
483 <            Future<String> future = e.submit(new StringTask());
484 <            String result = future.get();
503 <            assertSame(TEST_STRING, result);
504 <        }
505 <        catch (ExecutionException ex) {
506 <            unexpectedException();
507 <        }
508 <        catch (InterruptedException ex) {
509 <            unexpectedException();
510 <        }
480 >    public void testSubmitCallable() throws Throwable {
481 >        ExecutorService e = new ForkJoinPool(1);
482 >        Future<String> future = e.submit(new StringTask());
483 >        String result = future.get();
484 >        assertSame(TEST_STRING, result);
485      }
486  
487      /**
488       * Completed submit(runnable) returns successfully
489       */
490 <    public void testSubmitRunnable() {
491 <        try {
492 <            ExecutorService e = new ForkJoinPool(1);
493 <            Future<?> future = e.submit(new NoOpRunnable());
494 <            future.get();
521 <            assertTrue(future.isDone());
522 <        }
523 <        catch (ExecutionException ex) {
524 <            unexpectedException();
525 <        }
526 <        catch (InterruptedException ex) {
527 <            unexpectedException();
528 <        }
490 >    public void testSubmitRunnable() throws Throwable {
491 >        ExecutorService e = new ForkJoinPool(1);
492 >        Future<?> future = e.submit(new NoOpRunnable());
493 >        future.get();
494 >        assertTrue(future.isDone());
495      }
496  
497      /**
498       * Completed submit(runnable, result) returns result
499       */
500 <    public void testSubmitRunnable2() {
501 <        try {
502 <            ExecutorService e = new ForkJoinPool(1);
503 <            Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
504 <            String result = future.get();
539 <            assertSame(TEST_STRING, result);
540 <        }
541 <        catch (ExecutionException ex) {
542 <            unexpectedException();
543 <        }
544 <        catch (InterruptedException ex) {
545 <            unexpectedException();
546 <        }
500 >    public void testSubmitRunnable2() throws Throwable {
501 >        ExecutorService e = new ForkJoinPool(1);
502 >        Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
503 >        String result = future.get();
504 >        assertSame(TEST_STRING, result);
505      }
506  
507  
508      /**
509       * A submitted privileged action to completion
510       */
511 <    public void testSubmitPrivilegedAction() {
511 >    public void testSubmitPrivilegedAction() throws Throwable {
512          Policy savedPolicy = null;
513          try {
514              savedPolicy = Policy.getPolicy();
# Line 571 | Line 529 | public class ForkJoinPoolTest extends JS
529              Object result = future.get();
530              assertSame(TEST_STRING, result);
531          }
574        catch (ExecutionException ex) {
575            unexpectedException();
576        }
577        catch (InterruptedException ex) {
578            unexpectedException();
579        }
532          finally {
533 <            try {
582 <                Policy.setPolicy(savedPolicy);
583 <            } catch (AccessControlException ok) {
584 <                return;
585 <            }
533 >            Policy.setPolicy(savedPolicy);
534          }
535      }
536  
537      /**
538       * A submitted a privileged exception action runs to completion
539       */
540 <    public void testSubmitPrivilegedExceptionAction() {
540 >    public void testSubmitPrivilegedExceptionAction() throws Throwable {
541          Policy savedPolicy = null;
542          try {
543              savedPolicy = Policy.getPolicy();
# Line 611 | Line 559 | public class ForkJoinPoolTest extends JS
559              Object result = future.get();
560              assertSame(TEST_STRING, result);
561          }
614        catch (ExecutionException ex) {
615            unexpectedException();
616        }
617        catch (InterruptedException ex) {
618            unexpectedException();
619        }
562          finally {
563              Policy.setPolicy(savedPolicy);
564          }
# Line 625 | Line 567 | public class ForkJoinPoolTest extends JS
567      /**
568       * A submitted failed privileged exception action reports exception
569       */
570 <    public void testSubmitFailedPrivilegedExceptionAction() {
570 >    public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
571          Policy savedPolicy = null;
572          try {
573              savedPolicy = Policy.getPolicy();
# Line 647 | Line 589 | public class ForkJoinPoolTest extends JS
589  
590              Object result = future.get();
591              shouldThrow();
592 <        }
593 <        catch (ExecutionException success) {
594 <        } catch (CancellationException success) {
653 <        } catch (InterruptedException ex) {
654 <            unexpectedException();
655 <        }
656 <        finally {
592 >        } catch (ExecutionException success) {
593 >            assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
594 >        } finally {
595              Policy.setPolicy(savedPolicy);
596          }
597      }
598  
599      /**
600 <     * execute(null runnable) throws NPE
600 >     * execute(null runnable) throws NullPointerException
601       */
602      public void testExecuteNullRunnable() {
603          try {
# Line 667 | Line 605 | public class ForkJoinPoolTest extends JS
605              TrackedShortRunnable task = null;
606              Future<?> future = e.submit(task);
607              shouldThrow();
608 <        }
671 <        catch (NullPointerException success) {
672 <        }
673 <        catch (Exception ex) {
674 <            unexpectedException();
675 <        }
608 >        } catch (NullPointerException success) {}
609      }
610  
611  
612      /**
613 <     * submit(null callable) throws NPE
613 >     * submit(null callable) throws NullPointerException
614       */
615      public void testSubmitNullCallable() {
616          try {
# Line 685 | Line 618 | public class ForkJoinPoolTest extends JS
618              StringTask t = null;
619              Future<String> future = e.submit(t);
620              shouldThrow();
621 <        }
689 <        catch (NullPointerException success) {
690 <        }
691 <        catch (Exception ex) {
692 <            unexpectedException();
693 <        }
621 >        } catch (NullPointerException success) {}
622      }
623  
624  
# Line 698 | Line 626 | public class ForkJoinPoolTest extends JS
626       * Blocking on submit(callable) throws InterruptedException if
627       * caller interrupted.
628       */
629 <    public void testInterruptedSubmit() {
629 >    public void testInterruptedSubmit() throws InterruptedException {
630          final ForkJoinPool p = new ForkJoinPool(1);
631 <        Thread t = new Thread(new Runnable() {
632 <                public void run() {
633 <                    try {
634 <                        p.submit(new Callable<Object>() {
635 <                                public Object call() {
636 <                                    try {
637 <                                        Thread.sleep(MEDIUM_DELAY_MS);
638 <                                        shouldThrow();
639 <                                    } catch (InterruptedException e) {
640 <                                    }
641 <                                    return null;
642 <                                }
643 <                            }).get();
644 <                    } catch (InterruptedException success) {
645 <                    } catch (Exception e) {
646 <                        unexpectedException();
647 <                    }
648 <
721 <                }
722 <            });
723 <        try {
724 <            t.start();
725 <            Thread.sleep(SHORT_DELAY_MS);
726 <            t.interrupt();
727 <        } catch (Exception e) {
728 <            unexpectedException();
729 <        }
631 >
632 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
633 >            public void realRun() throws Throwable {
634 >                p.submit(new CheckedCallable<Object>() {
635 >                    public Object realCall() throws Throwable {
636 >                        try {
637 >                            Thread.sleep(MEDIUM_DELAY_MS);
638 >                        } catch (InterruptedException ok) {
639 >                        }
640 >                        return null;
641 >                    }}).get();
642 >            }});
643 >
644 >        t.start();
645 >        Thread.sleep(SHORT_DELAY_MS);
646 >        t.interrupt();
647 >        t.join();
648 >        p.shutdownNow();
649          joinPool(p);
650      }
651  
# Line 734 | Line 653 | public class ForkJoinPoolTest extends JS
653       * get of submit(callable) throws ExecutionException if callable
654       * throws exception
655       */
656 <    public void testSubmitEE() {
656 >    public void testSubmitEE() throws Throwable {
657          ForkJoinPool p = new ForkJoinPool(1);
739
658          try {
659 <            Callable c = new Callable() {
660 <                    public Object call() {
661 <                        int i = 5/0;
662 <                        return Boolean.TRUE;
663 <                    }
746 <                };
747 <
748 <            for (int i = 0; i < 5; i++) {
749 <                p.submit(c).get();
750 <            }
751 <
659 >            p.submit(new Callable() {
660 >                public Object call() {
661 >                    int i = 5/0;
662 >                    return Boolean.TRUE;
663 >                }}).get();
664              shouldThrow();
665          } catch (ExecutionException success) {
666 <        } catch (CancellationException success) {
755 <        } catch (Exception e) {
756 <            unexpectedException();
666 >            assertTrue(success.getCause() instanceof ArithmeticException);
667          }
668 +
669          joinPool(p);
670      }
671  
672      /**
673 <     * invokeAny(null) throws NPE
673 >     * invokeAny(null) throws NullPointerException
674       */
675 <    public void testInvokeAny1() {
675 >    public void testInvokeAny1() throws Throwable {
676          ExecutorService e = new ForkJoinPool(1);
677          try {
678              e.invokeAny(null);
679 +            shouldThrow();
680          } catch (NullPointerException success) {
769        } catch (Exception ex) {
770            unexpectedException();
681          } finally {
682              joinPool(e);
683          }
684      }
685  
686      /**
687 <     * invokeAny(empty collection) throws IAE
687 >     * invokeAny(empty collection) throws IllegalArgumentException
688       */
689 <    public void testInvokeAny2() {
689 >    public void testInvokeAny2() throws Throwable {
690          ExecutorService e = new ForkJoinPool(1);
691          try {
692              e.invokeAny(new ArrayList<Callable<String>>());
693 +            shouldThrow();
694          } catch (IllegalArgumentException success) {
784        } catch (Exception ex) {
785            unexpectedException();
695          } finally {
696              joinPool(e);
697          }
698      }
699  
700      /**
701 <     * invokeAny(c) throws NPE if c has null elements
701 >     * invokeAny(c) throws NullPointerException if c has a single null element
702       */
703 <    public void testInvokeAny3() {
703 >    public void testInvokeAny3() throws Throwable {
704          ExecutorService e = new ForkJoinPool(1);
705 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
706 +        l.add(null);
707          try {
797            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
798            l.add(new StringTask());
799            l.add(null);
708              e.invokeAny(l);
709 +            shouldThrow();
710 +        } catch (NullPointerException success) {
711 +        } finally {
712 +            joinPool(e);
713 +        }
714 +    }
715 +
716 +    /**
717 +     * invokeAny(c) throws NullPointerException if c has null elements
718 +     */
719 +    public void testInvokeAny4() throws Throwable {
720 +        CountDownLatch latch = new CountDownLatch(1);
721 +        ExecutorService e = new ForkJoinPool(1);
722 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
723 +        l.add(latchAwaitingStringTask(latch));
724 +        l.add(null);
725 +        try {
726 +            e.invokeAny(l);
727 +            shouldThrow();
728          } catch (NullPointerException success) {
802        } catch (Exception ex) {
803            ex.printStackTrace();
804            unexpectedException();
729          } finally {
730 +            latch.countDown();
731              joinPool(e);
732          }
733      }
# Line 810 | Line 735 | public class ForkJoinPoolTest extends JS
735      /**
736       * invokeAny(c) throws ExecutionException if no task in c completes
737       */
738 <    public void testInvokeAny4() {
738 >    public void testInvokeAny5() throws Throwable {
739          ExecutorService e = new ForkJoinPool(1);
740 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
741 +        l.add(new NPETask());
742          try {
816            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
817            l.add(new NPETask());
743              e.invokeAny(l);
744 +            shouldThrow();
745          } catch (ExecutionException success) {
746 <        } catch (CancellationException success) {
821 <        } catch (Exception ex) {
822 <            unexpectedException();
746 >            assertTrue(success.getCause() instanceof NullPointerException);
747          } finally {
748              joinPool(e);
749          }
# Line 828 | Line 752 | public class ForkJoinPoolTest extends JS
752      /**
753       * invokeAny(c) returns result of some task in c if at least one completes
754       */
755 <    public void testInvokeAny5() {
755 >    public void testInvokeAny6() throws Throwable {
756          ExecutorService e = new ForkJoinPool(1);
757          try {
758 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
758 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
759              l.add(new StringTask());
760              l.add(new StringTask());
761              String result = e.invokeAny(l);
762              assertSame(TEST_STRING, result);
839        } catch (ExecutionException success) {
840        } catch (CancellationException success) {
841        } catch (Exception ex) {
842            unexpectedException();
763          } finally {
764              joinPool(e);
765          }
766      }
767  
768      /**
769 <     * invokeAll(null) throws NPE
769 >     * invokeAll(null) throws NullPointerException
770       */
771 <    public void testInvokeAll1() {
771 >    public void testInvokeAll1() throws Throwable {
772          ExecutorService e = new ForkJoinPool(1);
773          try {
774              e.invokeAll(null);
775 +            shouldThrow();
776          } catch (NullPointerException success) {
856        } catch (Exception ex) {
857            unexpectedException();
777          } finally {
778              joinPool(e);
779          }
# Line 863 | Line 782 | public class ForkJoinPoolTest extends JS
782      /**
783       * invokeAll(empty collection) returns empty collection
784       */
785 <    public void testInvokeAll2() {
785 >    public void testInvokeAll2() throws InterruptedException {
786          ExecutorService e = new ForkJoinPool(1);
787          try {
788 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
788 >            List<Future<String>> r
789 >                = e.invokeAll(new ArrayList<Callable<String>>());
790              assertTrue(r.isEmpty());
871        } catch (Exception ex) {
872            unexpectedException();
791          } finally {
792              joinPool(e);
793          }
794      }
795  
796      /**
797 <     * invokeAll(c) throws NPE if c has null elements
797 >     * invokeAll(c) throws NullPointerException if c has null elements
798       */
799 <    public void testInvokeAll3() {
799 >    public void testInvokeAll3() throws InterruptedException {
800          ExecutorService e = new ForkJoinPool(1);
801 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
802 +        l.add(new StringTask());
803 +        l.add(null);
804          try {
884            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
885            l.add(new StringTask());
886            l.add(null);
805              e.invokeAll(l);
806 +            shouldThrow();
807          } catch (NullPointerException success) {
889        } catch (Exception ex) {
890            unexpectedException();
808          } finally {
809              joinPool(e);
810          }
811      }
812  
813      /**
814 <     * get of returned element of invokeAll(c) throws exception on failed task
814 >     * get of returned element of invokeAll(c) throws
815 >     * ExecutionException on failed task
816       */
817 <    public void testInvokeAll4() {
817 >    public void testInvokeAll4() throws Throwable {
818          ExecutorService e = new ForkJoinPool(1);
819 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
820 +        l.add(new NPETask());
821 +        List<Future<String>> futures = e.invokeAll(l);
822 +        assertEquals(1, futures.size());
823          try {
824 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
825 <            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();
824 >            futures.get(0).get();
825 >            shouldThrow();
826          } catch (ExecutionException success) {
827 <        } catch (CancellationException success) {
910 <        } catch (Exception ex) {
911 <            ex.printStackTrace();
912 <            unexpectedException();
827 >            assertTrue(success.getCause() instanceof NullPointerException);
828          } finally {
829              joinPool(e);
830          }
# Line 918 | Line 833 | public class ForkJoinPoolTest extends JS
833      /**
834       * invokeAll(c) returns results of all completed tasks in c
835       */
836 <    public void testInvokeAll5() {
836 >    public void testInvokeAll5() throws Throwable {
837          ExecutorService e = new ForkJoinPool(1);
838          try {
839 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
839 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
840              l.add(new StringTask());
841              l.add(new StringTask());
842 <            List<Future<String>> result = e.invokeAll(l);
843 <            assertEquals(2, result.size());
844 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
845 <                assertSame(TEST_STRING, it.next().get());
931 <        } catch (ExecutionException success) {
932 <        } catch (CancellationException success) {
933 <        } catch (Exception ex) {
934 <            ex.printStackTrace();
935 <            unexpectedException();
842 >            List<Future<String>> futures = e.invokeAll(l);
843 >            assertEquals(2, futures.size());
844 >            for (Future<String> future : futures)
845 >                assertSame(TEST_STRING, future.get());
846          } finally {
847              joinPool(e);
848          }
# Line 940 | Line 850 | public class ForkJoinPoolTest extends JS
850  
851  
852      /**
853 <     * timed invokeAny(null) throws NPE
853 >     * timed invokeAny(null) throws NullPointerException
854       */
855 <    public void testTimedInvokeAny1() {
855 >    public void testTimedInvokeAny1() throws Throwable {
856          ExecutorService e = new ForkJoinPool(1);
857          try {
858 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
858 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
859 >            shouldThrow();
860          } catch (NullPointerException success) {
950        } catch (Exception ex) {
951            ex.printStackTrace();
952            unexpectedException();
861          } finally {
862              joinPool(e);
863          }
864      }
865  
866      /**
867 <     * timed invokeAny(null time unit) throws NPE
867 >     * timed invokeAny(null time unit) throws NullPointerException
868       */
869 <    public void testTimedInvokeAnyNullTimeUnit() {
869 >    public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
870          ExecutorService e = new ForkJoinPool(1);
871 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
872 +        l.add(new StringTask());
873          try {
964            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
965            l.add(new StringTask());
874              e.invokeAny(l, MEDIUM_DELAY_MS, null);
875 +            shouldThrow();
876          } catch (NullPointerException success) {
968        } catch (Exception ex) {
969            ex.printStackTrace();
970            unexpectedException();
877          } finally {
878              joinPool(e);
879          }
880      }
881  
882      /**
883 <     * timed invokeAny(empty collection) throws IAE
883 >     * timed invokeAny(empty collection) throws IllegalArgumentException
884       */
885 <    public void testTimedInvokeAny2() {
885 >    public void testTimedInvokeAny2() throws Throwable {
886          ExecutorService e = new ForkJoinPool(1);
887          try {
888 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
888 >            e.invokeAny(new ArrayList<Callable<String>>(),
889 >                        MEDIUM_DELAY_MS, MILLISECONDS);
890 >            shouldThrow();
891          } catch (IllegalArgumentException success) {
984        } catch (Exception ex) {
985            ex.printStackTrace();
986            unexpectedException();
892          } finally {
893              joinPool(e);
894          }
895      }
896  
897      /**
898 <     * timed invokeAny(c) throws NPE if c has null elements
898 >     * timed invokeAny(c) throws NullPointerException if c has null elements
899       */
900 <    public void testTimedInvokeAny3() {
900 >    public void testTimedInvokeAny3() throws Throwable {
901 >        CountDownLatch latch = new CountDownLatch(1);
902          ExecutorService e = new ForkJoinPool(1);
903 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
904 +        l.add(latchAwaitingStringTask(latch));
905 +        l.add(null);
906          try {
907 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
908 <            l.add(new StringTask());
1000 <            l.add(null);
1001 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
907 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
908 >            shouldThrow();
909          } catch (NullPointerException success) {
1003        } catch (Exception ex) {
1004            ex.printStackTrace();
1005            unexpectedException();
910          } finally {
911 +            latch.countDown();
912              joinPool(e);
913          }
914      }
# Line 1011 | Line 916 | public class ForkJoinPoolTest extends JS
916      /**
917       * timed invokeAny(c) throws ExecutionException if no task completes
918       */
919 <    public void testTimedInvokeAny4() {
919 >    public void testTimedInvokeAny4() throws Throwable {
920          ExecutorService e = new ForkJoinPool(1);
921 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
922 +        l.add(new NPETask());
923          try {
924 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
925 <            l.add(new NPETask());
1019 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
924 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
925 >            shouldThrow();
926          } catch (ExecutionException success) {
927 <        } catch (CancellationException success) {
1022 <        } catch (Exception ex) {
1023 <            ex.printStackTrace();
1024 <            unexpectedException();
927 >            assertTrue(success.getCause() instanceof NullPointerException);
928          } finally {
929              joinPool(e);
930          }
# Line 1030 | Line 933 | public class ForkJoinPoolTest extends JS
933      /**
934       * timed invokeAny(c) returns result of some task in c
935       */
936 <    public void testTimedInvokeAny5() {
936 >    public void testTimedInvokeAny5() throws Throwable {
937          ExecutorService e = new ForkJoinPool(1);
938          try {
939 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
939 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
940              l.add(new StringTask());
941              l.add(new StringTask());
942 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
942 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
943              assertSame(TEST_STRING, result);
1041        } catch (ExecutionException success) {
1042        } catch (CancellationException success) {
1043        } catch (Exception ex) {
1044            ex.printStackTrace();
1045            unexpectedException();
944          } finally {
945              joinPool(e);
946          }
947      }
948  
949      /**
950 <     * timed invokeAll(null) throws NPE
950 >     * timed invokeAll(null) throws NullPointerException
951       */
952 <    public void testTimedInvokeAll1() {
952 >    public void testTimedInvokeAll1() throws Throwable {
953          ExecutorService e = new ForkJoinPool(1);
954          try {
955 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
955 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
956 >            shouldThrow();
957          } catch (NullPointerException success) {
1059        } catch (Exception ex) {
1060            ex.printStackTrace();
1061            unexpectedException();
958          } finally {
959              joinPool(e);
960          }
961      }
962  
963      /**
964 <     * timed invokeAll(null time unit) throws NPE
964 >     * timed invokeAll(null time unit) throws NullPointerException
965       */
966 <    public void testTimedInvokeAllNullTimeUnit() {
966 >    public void testTimedInvokeAllNullTimeUnit() throws Throwable {
967          ExecutorService e = new ForkJoinPool(1);
968 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
969 +        l.add(new StringTask());
970          try {
1073            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1074            l.add(new StringTask());
971              e.invokeAll(l, MEDIUM_DELAY_MS, null);
972 +            shouldThrow();
973          } catch (NullPointerException success) {
1077        } catch (Exception ex) {
1078            ex.printStackTrace();
1079            unexpectedException();
974          } finally {
975              joinPool(e);
976          }
# Line 1085 | Line 979 | public class ForkJoinPoolTest extends JS
979      /**
980       * timed invokeAll(empty collection) returns empty collection
981       */
982 <    public void testTimedInvokeAll2() {
982 >    public void testTimedInvokeAll2() throws InterruptedException {
983          ExecutorService e = new ForkJoinPool(1);
984          try {
985 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
985 >            List<Future<String>> r
986 >                = e.invokeAll(new ArrayList<Callable<String>>(),
987 >                              MEDIUM_DELAY_MS, MILLISECONDS);
988              assertTrue(r.isEmpty());
1093        } catch (Exception ex) {
1094            ex.printStackTrace();
1095            unexpectedException();
989          } finally {
990              joinPool(e);
991          }
992      }
993  
994      /**
995 <     * timed invokeAll(c) throws NPE if c has null elements
995 >     * timed invokeAll(c) throws NullPointerException if c has null elements
996       */
997 <    public void testTimedInvokeAll3() {
997 >    public void testTimedInvokeAll3() throws InterruptedException {
998          ExecutorService e = new ForkJoinPool(1);
999 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1000 +        l.add(new StringTask());
1001 +        l.add(null);
1002          try {
1003 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1004 <            l.add(new StringTask());
1109 <            l.add(null);
1110 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1003 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1004 >            shouldThrow();
1005          } catch (NullPointerException success) {
1112        } catch (Exception ex) {
1113            ex.printStackTrace();
1114            unexpectedException();
1006          } finally {
1007              joinPool(e);
1008          }
# Line 1120 | Line 1011 | public class ForkJoinPoolTest extends JS
1011      /**
1012       * get of returned element of invokeAll(c) throws exception on failed task
1013       */
1014 <    public void testTimedInvokeAll4() {
1014 >    public void testTimedInvokeAll4() throws Throwable {
1015          ExecutorService e = new ForkJoinPool(1);
1016 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
1017 +        l.add(new NPETask());
1018 +        List<Future<String>> futures
1019 +            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1020 +        assertEquals(1, futures.size());
1021          try {
1022 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1023 <            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();
1022 >            futures.get(0).get();
1023 >            shouldThrow();
1024          } catch (ExecutionException success) {
1025 <        } catch (CancellationException success) {
1134 <        } catch (Exception ex) {
1135 <            ex.printStackTrace();
1136 <            unexpectedException();
1025 >            assertTrue(success.getCause() instanceof NullPointerException);
1026          } finally {
1027              joinPool(e);
1028          }
# Line 1142 | Line 1031 | public class ForkJoinPoolTest extends JS
1031      /**
1032       * timed invokeAll(c) returns results of all completed tasks in c
1033       */
1034 <    public void testTimedInvokeAll5() {
1034 >    public void testTimedInvokeAll5() throws Throwable {
1035          ExecutorService e = new ForkJoinPool(1);
1036          try {
1037 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1037 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
1038              l.add(new StringTask());
1039              l.add(new StringTask());
1040 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1041 <            assertEquals(2, result.size());
1042 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1043 <                assertSame(TEST_STRING, it.next().get());
1044 <        } catch (ExecutionException success) {
1156 <        } catch (CancellationException success) {
1157 <        } catch (Exception ex) {
1158 <            ex.printStackTrace();
1159 <            unexpectedException();
1040 >            List<Future<String>> futures
1041 >                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1042 >            assertEquals(2, futures.size());
1043 >            for (Future<String> future : futures)
1044 >                assertSame(TEST_STRING, future.get());
1045          } finally {
1046              joinPool(e);
1047          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines