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.1 by dl, Fri Jul 31 23:02:49 2009 UTC vs.
Revision 1.10 by jsr166, Sat Nov 21 10:25:05 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  
15 < public class ForkJoinPoolTest extends JSR166TestCase{
15 > public class ForkJoinPoolTest extends JSR166TestCase {
16      public static void main(String[] args) {
17          junit.textui.TestRunner.run (suite());
18      }
# Line 25 | Line 26 | public class ForkJoinPoolTest extends JS
26       * 1. shutdown and related methods are tested via super.joinPool.
27       *
28       * 2. newTaskFor and adapters are tested in submit/invoke tests
29 <     *
29 >     *
30       * 3. We cannot portably test monitoring methods such as
31       * getStealCount() since they rely ultimately on random task
32       * stealing that may cause tasks not to be stolen/propagated
33       * across threads, especially on uniprocessors.
34 <     *
34 >     *
35       * 4. There are no independently testable ForkJoinWorkerThread
36       * methods, but they are covered here and in task tests.
37       */
# 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){
57 >        public ForkJoinWorkerThread newThread(ForkJoinPool p) {
58              if (++calls > 1) return null;
59              return new FailingFJWSubclass(p);
60 <        }  
60 >        }
61      }
62  
63 <    static class SubFJP extends ForkJoinPool { // to expose protected
63 >    static class SubFJP extends ForkJoinPool { // to expose protected
64          SubFJP() { super(1); }
65          public int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
66              return super.drainTasksTo(c);
# Line 83 | Line 85 | public class ForkJoinPoolTest extends JS
85      }
86  
87      // A simple recursive task for testing
88 <    static final class FibTask extends RecursiveTask<Integer> {
88 >    static final class FibTask extends RecursiveTask<Integer> {
89          final int number;
90          FibTask(int n) { number = n; }
91          public Integer compute() {
# Line 97 | Line 99 | public class ForkJoinPoolTest extends JS
99      }
100  
101      // A failing task for testing
102 <    static final class FailingTask extends ForkJoinTask<Void> {
102 >    static final class FailingTask extends ForkJoinTask<Void> {
103          public final Void getRawResult() { return null; }
104          protected final void setRawResult(Void mustBeNull) { }
105          protected final boolean exec() { throw new Error(); }
# Line 105 | Line 107 | public class ForkJoinPoolTest extends JS
107      }
108  
109      // Fib needlessly using locking to test ManagedBlockers
110 <    static final class LockingFibTask extends RecursiveTask<Integer> {
110 >    static final class LockingFibTask extends RecursiveTask<Integer> {
111          final int number;
112          final ManagedLocker locker;
113          final ReentrantLock lock;
114 <        LockingFibTask(int n, ManagedLocker locker, ReentrantLock lock) {
115 <            number = n;
114 >        LockingFibTask(int n, ManagedLocker locker, ReentrantLock lock) {
115 >            number = n;
116              this.locker = locker;
117              this.lock = lock;
118          }
# Line 119 | Line 121 | public class ForkJoinPoolTest extends JS
121              LockingFibTask f1 = null;
122              LockingFibTask f2 = null;
123              locker.block();
124 <            n = number;
124 >            n = number;
125              if (n > 1) {
126                  f1 = new LockingFibTask(n - 1, locker, lock);
127                  f2 = new LockingFibTask(n - 2, locker, lock);
# Line 134 | Line 136 | public class ForkJoinPoolTest extends JS
136          }
137      }
138  
139 <    /**
140 <     * Succesfully constructed pool reports default factory,
139 >    /**
140 >     * Successfully constructed pool reports default factory,
141       * parallelism and async mode policies, no active threads or
142       * tasks, and quiescent running state.
143       */
# 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 160 | Line 163 | public class ForkJoinPoolTest extends JS
163          }
164      }
165  
166 <    /**
167 <     * Constructor throws if size argument is less than zero
166 >    /**
167 >     * Constructor throws if size argument is less than zero
168       */
169      public void testConstructor1() {
170          try {
171              new ForkJoinPool(-1);
172              shouldThrow();
173 <        }
171 <        catch (IllegalArgumentException success){}
173 >        } catch (IllegalArgumentException success) {}
174      }
175  
176 <    /**
177 <     * Constructor throws if factory argument is null
176 >    /**
177 >     * Constructor throws if factory argument is null
178       */
179      public void testConstructor2() {
180          try {
181              new ForkJoinPool(1, null);
182              shouldThrow();
183 <        }
182 <        catch (NullPointerException success){}  
183 >        } catch (NullPointerException success) {}
184      }
185  
186  
187 <    /**
188 <     * getParallelism returns size set in constructor
187 >    /**
188 >     * getParallelism returns size set in constructor
189       */
190      public void testGetParallelism() {
191          ForkJoinPool p = null;
# Line 196 | Line 197 | public class ForkJoinPoolTest extends JS
197          }
198      }
199  
200 <    /**
200 >    /**
201       * setParallelism changes reported parallelism level.
202       */
203      public void testSetParallelism() {
# Line 211 | Line 212 | public class ForkJoinPoolTest extends JS
212          }
213      }
214  
215 <    /**
215 >    /**
216       * setParallelism with argument <= 0 throws exception
217       */
218      public void testSetParallelism2() {
# Line 221 | Line 222 | public class ForkJoinPoolTest extends JS
222              assertTrue(p.getParallelism() == 1);
223              p.setParallelism(-2);
224              shouldThrow();
225 <        }catch (IllegalArgumentException success){
225 >        } catch (IllegalArgumentException success) {
226          } finally {
227              joinPool(p);
228          }
229      }
230  
231 <    /**
231 >    /**
232       * getPoolSize returns number of started workers.
233       */
234      public void testGetPoolSize() {
# Line 243 | Line 244 | public class ForkJoinPoolTest extends JS
244          }
245      }
246  
247 <    /**
247 >    /**
248       * setMaximumPoolSize changes size reported by getMaximumPoolSize.
249       */
250      public void testSetMaximumPoolSize() {
# Line 257 | Line 258 | public class ForkJoinPoolTest extends JS
258          }
259      }
260  
261 <    /**
261 >    /**
262       * setMaximumPoolSize with argument <= 0 throws exception
263       */
264      public void testSetMaximumPoolSize2() {
# Line 266 | Line 267 | public class ForkJoinPoolTest extends JS
267              p = new ForkJoinPool(1);
268              p.setMaximumPoolSize(-2);
269              shouldThrow();
270 <        }catch (IllegalArgumentException success){
270 >        } catch (IllegalArgumentException success) {
271          } finally {
272              joinPool(p);
273          }
274      }
275  
276 <    /**
276 >    /**
277       * setMaintainsParallelism changes policy reported by
278       * getMaintainsParallelism.
279       */
# Line 286 | Line 287 | public class ForkJoinPoolTest extends JS
287              joinPool(p);
288          }
289      }
290 <    
291 <    /**
290 >
291 >    /**
292       * setAsyncMode changes policy reported by
293       * getAsyncMode.
294       */
# Line 302 | Line 303 | public class ForkJoinPoolTest extends JS
303          }
304      }
305  
306 <    /**
306 >    /**
307       * setUncaughtExceptionHandler changes handler for uncaught exceptions.
308       *
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          }
325      }
326  
327 <    /**
327 >    /**
328       * setUncaughtExceptionHandler of null removes handler
329       */
330      public void testSetUncaughtExceptionHandler2() {
# Line 340 | Line 339 | public class ForkJoinPoolTest extends JS
339      }
340  
341  
342 <    /**
342 >    /**
343       * After invoking a single task, isQuiescent is true,
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 419 | Line 413 | public class ForkJoinPoolTest extends JS
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();
416          } finally {
417 <            joinPool(p);
417 >            p.shutdownNow(); // don't wait out shutdown
418          }
419      }
420  
# Line 468 | Line 458 | public class ForkJoinPoolTest extends JS
458          }
459      }
460  
461 <    
461 >
462      // FJ Versions of AbstractExecutorService tests
463  
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 558 | Line 516 | public class ForkJoinPoolTest extends JS
516              policy.addPermission(new RuntimePermission("getContextClassLoader"));
517              policy.addPermission(new RuntimePermission("setContextClassLoader"));
518              Policy.setPolicy(policy);
519 <        } catch(AccessControlException ok) {
519 >        } catch (AccessControlException ok) {
520              return;
521          }
522          try {
# 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 597 | Line 545 | public class ForkJoinPoolTest extends JS
545              policy.addPermission(new RuntimePermission("getContextClassLoader"));
546              policy.addPermission(new RuntimePermission("setContextClassLoader"));
547              Policy.setPolicy(policy);
548 <        } catch(AccessControlException ok) {
548 >        } catch (AccessControlException ok) {
549              return;
550          }
551  
# 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 633 | Line 575 | public class ForkJoinPoolTest extends JS
575              policy.addPermission(new RuntimePermission("getContextClassLoader"));
576              policy.addPermission(new RuntimePermission("setContextClassLoader"));
577              Policy.setPolicy(policy);
578 <        } catch(AccessControlException ok) {
578 >        } catch (AccessControlException ok) {
579              return;
580          }
581  
# Line 647 | Line 589 | public class ForkJoinPoolTest extends JS
589  
590              Object result = future.get();
591              shouldThrow();
592 <        }
593 <        catch (ExecutionException success) {
652 <        } catch (CancellationException success) {
653 <        } catch (InterruptedException ex) {
654 <            unexpectedException();
655 <        }
656 <        finally {
592 >        } catch (ExecutionException success) {
593 >        } finally {
594              Policy.setPolicy(savedPolicy);
595          }
596      }
597  
598      /**
599 <     * execute(null runnable) throws NPE
599 >     * execute(null runnable) throws NullPointerException
600       */
601      public void testExecuteNullRunnable() {
602          try {
# Line 667 | Line 604 | public class ForkJoinPoolTest extends JS
604              TrackedShortRunnable task = null;
605              Future<?> future = e.submit(task);
606              shouldThrow();
607 <        }
671 <        catch (NullPointerException success) {
672 <        }
673 <        catch (Exception ex) {
674 <            unexpectedException();
675 <        }
607 >        } catch (NullPointerException success) {}
608      }
609  
610  
611      /**
612 <     * submit(null callable) throws NPE
612 >     * submit(null callable) throws NullPointerException
613       */
614      public void testSubmitNullCallable() {
615          try {
# Line 685 | Line 617 | public class ForkJoinPoolTest extends JS
617              StringTask t = null;
618              Future<String> future = e.submit(t);
619              shouldThrow();
620 <        }
689 <        catch (NullPointerException success) {
690 <        }
691 <        catch (Exception ex) {
692 <            unexpectedException();
693 <        }
620 >        } catch (NullPointerException success) {}
621      }
622  
623  
624      /**
625 <     *  Blocking on submit(callable) throws InterruptedException if
626 <     *  caller interrupted.
625 >     * Blocking on submit(callable) throws InterruptedException if
626 >     * caller interrupted.
627       */
628 <    public void testInterruptedSubmit() {
628 >    public void testInterruptedSubmit() throws InterruptedException {
629          final ForkJoinPool p = new ForkJoinPool(1);
630 <        Thread t = new Thread(new Runnable() {
631 <                public void run() {
632 <                    try {
633 <                        p.submit(new Callable<Object>() {
634 <                                public Object call() {
635 <                                    try {
636 <                                        Thread.sleep(MEDIUM_DELAY_MS);
637 <                                        shouldThrow();
638 <                                    } catch(InterruptedException e){
639 <                                    }
640 <                                    return null;
641 <                                }
642 <                            }).get();
643 <                    } catch(InterruptedException success){
644 <                    } catch(Exception e) {
645 <                        unexpectedException();
646 <                    }
647 <
721 <                }
722 <            });
723 <        try {
724 <            t.start();
725 <            Thread.sleep(SHORT_DELAY_MS);
726 <            t.interrupt();
727 <        } catch(Exception e){
728 <            unexpectedException();
729 <        }
630 >
631 >        Thread t = new Thread(new CheckedInterruptedRunnable() {
632 >            void realRun() throws Throwable {
633 >                p.submit(new CheckedCallable<Object>() {
634 >                    public Object realCall() throws Throwable {
635 >                        try {
636 >                            Thread.sleep(MEDIUM_DELAY_MS);
637 >                        } catch (InterruptedException ok) {
638 >                        }
639 >                        return null;
640 >                    }}).get();
641 >            }});
642 >
643 >        t.start();
644 >        Thread.sleep(SHORT_DELAY_MS);
645 >        t.interrupt();
646 >        t.join();
647 >        p.shutdownNow();
648          joinPool(p);
649      }
650  
651      /**
652 <     *  get of submit(callable) throws ExecutionException if callable
653 <     *  throws exception
652 >     * get of submit(callable) throws ExecutionException if callable
653 >     * throws exception
654       */
655 <    public void testSubmitEE() {
655 >    public void testSubmitEE() throws Throwable {
656          ForkJoinPool p = new ForkJoinPool(1);
739
657          try {
658 <            Callable c = new Callable() {
659 <                    public Object call() {
660 <                        int i = 5/0;
661 <                        return Boolean.TRUE;
662 <                    }
746 <                };
747 <
748 <            for(int i =0; i < 5; i++){
749 <                p.submit(c).get();
750 <            }
751 <
658 >            p.submit(new Callable() {
659 >                public Object call() {
660 >                    int i = 5/0;
661 >                    return Boolean.TRUE;
662 >                }}).get();
663              shouldThrow();
664 <        }
665 <        catch(ExecutionException success){
755 <        } catch (CancellationException success) {
756 <        } catch(Exception e) {
757 <            unexpectedException();
758 <        }
664 >        } catch (ExecutionException success) {}
665 >
666          joinPool(p);
667      }
668  
669      /**
670 <     * invokeAny(null) throws NPE
670 >     * invokeAny(null) throws NullPointerException
671       */
672 <    public void testInvokeAny1() {
672 >    public void testInvokeAny1() throws Throwable {
673          ExecutorService e = new ForkJoinPool(1);
674          try {
675              e.invokeAny(null);
676 +            shouldThrow();
677          } catch (NullPointerException success) {
770        } catch(Exception ex) {
771            unexpectedException();
678          } finally {
679              joinPool(e);
680          }
681      }
682  
683      /**
684 <     * invokeAny(empty collection) throws IAE
684 >     * invokeAny(empty collection) throws IllegalArgumentException
685       */
686 <    public void testInvokeAny2() {
686 >    public void testInvokeAny2() throws Throwable {
687          ExecutorService e = new ForkJoinPool(1);
688          try {
689              e.invokeAny(new ArrayList<Callable<String>>());
690 +            shouldThrow();
691          } catch (IllegalArgumentException success) {
785        } catch(Exception ex) {
786            unexpectedException();
692          } finally {
693              joinPool(e);
694          }
695      }
696  
697      /**
698 <     * invokeAny(c) throws NPE if c has null elements
698 >     * invokeAny(c) throws NullPointerException if c has a single null element
699       */
700 <    public void testInvokeAny3() {
700 >    public void testInvokeAny3() throws Throwable {
701          ExecutorService e = new ForkJoinPool(1);
702          try {
703              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
799            l.add(new StringTask());
704              l.add(null);
705              e.invokeAny(l);
706 +            shouldThrow();
707 +        } catch (NullPointerException success) {
708 +        } finally {
709 +            joinPool(e);
710 +        }
711 +    }
712 +
713 +    /**
714 +     * invokeAny(c) throws NullPointerException if c has null elements
715 +     */
716 +    public void testInvokeAny4() throws Throwable {
717 +        ExecutorService e = new ForkJoinPool(1);
718 +        try {
719 +            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
720 +            l.add(new Callable<String>() {
721 +                public String call() {
722 +                    // The delay gives the pool a chance to notice
723 +                    // the null element.
724 +                    sleepTillInterrupted(SMALL_DELAY_MS);
725 +                    return "foo";
726 +                }});
727 +            l.add(null);
728 +            e.invokeAny(l);
729 +            shouldThrow();
730          } catch (NullPointerException success) {
803        } catch(Exception ex) {
804            ex.printStackTrace();
805            unexpectedException();
731          } finally {
732              joinPool(e);
733          }
# Line 811 | Line 736 | public class ForkJoinPoolTest extends JS
736      /**
737       * invokeAny(c) throws ExecutionException if no task in c completes
738       */
739 <    public void testInvokeAny4() {
739 >    public void testInvokeAny5() throws Throwable {
740          ExecutorService e = new ForkJoinPool(1);
741          try {
742              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
743              l.add(new NPETask());
744              e.invokeAny(l);
745 <        } catch(ExecutionException success) {
746 <        } catch (CancellationException success) {
822 <        } catch(Exception ex) {
823 <            unexpectedException();
745 >            shouldThrow();
746 >        } catch (ExecutionException success) {
747          } finally {
748              joinPool(e);
749          }
# Line 829 | 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>>();
# Line 837 | Line 760 | public class ForkJoinPoolTest extends JS
760              l.add(new StringTask());
761              String result = e.invokeAny(l);
762              assertSame(TEST_STRING, result);
840        } catch (ExecutionException success) {
841        } catch (CancellationException success) {
842        } catch(Exception ex) {
843            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) {
857        } catch(Exception ex) {
858            unexpectedException();
777          } finally {
778              joinPool(e);
779          }
# Line 864 | 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());
872        } catch(Exception ex) {
873            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          try {
802              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
803              l.add(new StringTask());
804              l.add(null);
805              e.invokeAll(l);
806 +            shouldThrow();
807          } catch (NullPointerException success) {
890        } catch(Exception ex) {
891            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          try {
820              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
821              l.add(new NPETask());
822              List<Future<String>> result = e.invokeAll(l);
823              assertEquals(1, result.size());
824 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
825 <                it.next().get();
826 <        } catch(ExecutionException success) {
827 <        } catch (CancellationException success) {
911 <        } catch(Exception ex) {
912 <            ex.printStackTrace();
913 <            unexpectedException();
824 >            for (Future<String> future : result)
825 >                future.get();
826 >            shouldThrow();
827 >        } catch (ExecutionException success) {
828          } finally {
829              joinPool(e);
830          }
# Line 919 | 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>>();
# Line 927 | Line 841 | public class ForkJoinPoolTest extends JS
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());
932 <        } catch (ExecutionException success) {
933 <        } catch (CancellationException success) {
934 <        } catch(Exception ex) {
935 <            ex.printStackTrace();
936 <            unexpectedException();
844 >            for (Future<String> future : result)
845 >                assertSame(TEST_STRING, future.get());
846          } finally {
847              joinPool(e);
848          }
# Line 941 | 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) {
951        } catch(Exception ex) {
952            ex.printStackTrace();
953            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          try {
872              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
873              l.add(new StringTask());
874              e.invokeAny(l, MEDIUM_DELAY_MS, null);
875 +            shouldThrow();
876          } catch (NullPointerException success) {
969        } catch(Exception ex) {
970            ex.printStackTrace();
971            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) {
985        } catch(Exception ex) {
986            ex.printStackTrace();
987            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          ExecutorService e = new ForkJoinPool(1);
902          try {
903              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
904              l.add(new StringTask());
905              l.add(null);
906 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
906 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
907 >            shouldThrow();
908          } catch (NullPointerException success) {
1004        } catch(Exception ex) {
1005            ex.printStackTrace();
1006            unexpectedException();
909          } finally {
910              joinPool(e);
911          }
# Line 1012 | Line 914 | public class ForkJoinPoolTest extends JS
914      /**
915       * timed invokeAny(c) throws ExecutionException if no task completes
916       */
917 <    public void testTimedInvokeAny4() {
917 >    public void testTimedInvokeAny4() throws Throwable {
918          ExecutorService e = new ForkJoinPool(1);
919          try {
920              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
921              l.add(new NPETask());
922 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
923 <        } catch(ExecutionException success) {
924 <        } catch (CancellationException success) {
1023 <        } catch(Exception ex) {
1024 <            ex.printStackTrace();
1025 <            unexpectedException();
922 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
923 >            shouldThrow();
924 >        } catch (ExecutionException success) {
925          } finally {
926              joinPool(e);
927          }
# Line 1031 | Line 930 | public class ForkJoinPoolTest extends JS
930      /**
931       * timed invokeAny(c) returns result of some task in c
932       */
933 <    public void testTimedInvokeAny5() {
933 >    public void testTimedInvokeAny5() throws Throwable {
934          ExecutorService e = new ForkJoinPool(1);
935          try {
936              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
937              l.add(new StringTask());
938              l.add(new StringTask());
939 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
939 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
940              assertSame(TEST_STRING, result);
1042        } catch (ExecutionException success) {
1043        } catch (CancellationException success) {
1044        } catch(Exception ex) {
1045            ex.printStackTrace();
1046            unexpectedException();
941          } finally {
942              joinPool(e);
943          }
944      }
945  
946      /**
947 <     * timed invokeAll(null) throws NPE
947 >     * timed invokeAll(null) throws NullPointerException
948       */
949 <    public void testTimedInvokeAll1() {
949 >    public void testTimedInvokeAll1() throws Throwable {
950          ExecutorService e = new ForkJoinPool(1);
951          try {
952 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
952 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
953 >            shouldThrow();
954          } catch (NullPointerException success) {
1060        } catch(Exception ex) {
1061            ex.printStackTrace();
1062            unexpectedException();
955          } finally {
956              joinPool(e);
957          }
958      }
959  
960      /**
961 <     * timed invokeAll(null time unit) throws NPE
961 >     * timed invokeAll(null time unit) throws NullPointerException
962       */
963 <    public void testTimedInvokeAllNullTimeUnit() {
963 >    public void testTimedInvokeAllNullTimeUnit() throws Throwable {
964          ExecutorService e = new ForkJoinPool(1);
965          try {
966              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
967              l.add(new StringTask());
968              e.invokeAll(l, MEDIUM_DELAY_MS, null);
969 +            shouldThrow();
970          } catch (NullPointerException success) {
1078        } catch(Exception ex) {
1079            ex.printStackTrace();
1080            unexpectedException();
971          } finally {
972              joinPool(e);
973          }
# Line 1086 | Line 976 | public class ForkJoinPoolTest extends JS
976      /**
977       * timed invokeAll(empty collection) returns empty collection
978       */
979 <    public void testTimedInvokeAll2() {
979 >    public void testTimedInvokeAll2() throws InterruptedException {
980          ExecutorService e = new ForkJoinPool(1);
981          try {
982 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
982 >            List<Future<String>> r
983 >                = e.invokeAll(new ArrayList<Callable<String>>(),
984 >                              MEDIUM_DELAY_MS, MILLISECONDS);
985              assertTrue(r.isEmpty());
1094        } catch(Exception ex) {
1095            ex.printStackTrace();
1096            unexpectedException();
986          } finally {
987              joinPool(e);
988          }
989      }
990  
991      /**
992 <     * timed invokeAll(c) throws NPE if c has null elements
992 >     * timed invokeAll(c) throws NullPointerException if c has null elements
993       */
994 <    public void testTimedInvokeAll3() {
994 >    public void testTimedInvokeAll3() throws InterruptedException {
995          ExecutorService e = new ForkJoinPool(1);
996          try {
997              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
998              l.add(new StringTask());
999              l.add(null);
1000 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1000 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1001 >            shouldThrow();
1002          } catch (NullPointerException success) {
1113        } catch(Exception ex) {
1114            ex.printStackTrace();
1115            unexpectedException();
1003          } finally {
1004              joinPool(e);
1005          }
# Line 1121 | Line 1008 | public class ForkJoinPoolTest extends JS
1008      /**
1009       * get of returned element of invokeAll(c) throws exception on failed task
1010       */
1011 <    public void testTimedInvokeAll4() {
1011 >    public void testTimedInvokeAll4() throws Throwable {
1012          ExecutorService e = new ForkJoinPool(1);
1013          try {
1014              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1015              l.add(new NPETask());
1016 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1016 >            List<Future<String>> result
1017 >                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1018              assertEquals(1, result.size());
1019 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1020 <                it.next().get();
1021 <        } catch(ExecutionException success) {
1022 <        } catch (CancellationException success) {
1135 <        } catch(Exception ex) {
1136 <            ex.printStackTrace();
1137 <            unexpectedException();
1019 >            for (Future<String> future : result)
1020 >                future.get();
1021 >            shouldThrow();
1022 >        } catch (ExecutionException success) {
1023          } finally {
1024              joinPool(e);
1025          }
# Line 1143 | Line 1028 | public class ForkJoinPoolTest extends JS
1028      /**
1029       * timed invokeAll(c) returns results of all completed tasks in c
1030       */
1031 <    public void testTimedInvokeAll5() {
1031 >    public void testTimedInvokeAll5() throws Throwable {
1032          ExecutorService e = new ForkJoinPool(1);
1033          try {
1034              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1035              l.add(new StringTask());
1036              l.add(new StringTask());
1037 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
1037 >            List<Future<String>> result
1038 >                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1039              assertEquals(2, result.size());
1040 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1041 <                assertSame(TEST_STRING, it.next().get());
1156 <        } catch (ExecutionException success) {
1157 <        } catch (CancellationException success) {
1158 <        } catch(Exception ex) {
1159 <            ex.printStackTrace();
1160 <            unexpectedException();
1040 >            for (Future<String> future : result)
1041 >                assertSame(TEST_STRING, future.get());
1042          } finally {
1043              joinPool(e);
1044          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines