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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines