ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.42 by jsr166, Mon Jun 2 02:19:23 2014 UTC vs.
Revision 1.63 by jsr166, Fri Jun 6 16:54:16 2014 UTC

# Line 17 | Line 17 | import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19   import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 247 | Line 249 | public class CompletableFutureTest exten
249          f = new CompletableFuture<>();
250          f.obtrudeValue(three);
251          checkCompletedNormally(f, three);
252 +        f.obtrudeValue(null);
253 +        checkCompletedNormally(f, null);
254          f = new CompletableFuture<>();
255          f.completeExceptionally(new CFException());
256          f.obtrudeValue(four);
# Line 279 | Line 283 | public class CompletableFutureTest exten
283       */
284      public void testGetNumberOfDependents() {
285          CompletableFuture<Integer> f = new CompletableFuture<>();
286 <        assertEquals(f.getNumberOfDependents(), 0);
287 <        CompletableFuture g = f.thenRun(new Noop());
288 <        assertEquals(f.getNumberOfDependents(), 1);
289 <        assertEquals(g.getNumberOfDependents(), 0);
290 <        CompletableFuture h = f.thenRun(new Noop());
291 <        assertEquals(f.getNumberOfDependents(), 2);
286 >        assertEquals(0, f.getNumberOfDependents());
287 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
288 >        assertEquals(1, f.getNumberOfDependents());
289 >        assertEquals(0, g.getNumberOfDependents());
290 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
291 >        assertEquals(2, f.getNumberOfDependents());
292          f.complete(1);
293          checkCompletedNormally(g, null);
294 <        assertEquals(f.getNumberOfDependents(), 0);
295 <        assertEquals(g.getNumberOfDependents(), 0);
294 >        assertEquals(0, f.getNumberOfDependents());
295 >        assertEquals(0, g.getNumberOfDependents());
296      }
297  
298      /**
# Line 316 | Line 320 | public class CompletableFutureTest exten
320          checkCompletedNormally(f, "test");
321      }
322  
323 <    // Choose non-commutative actions for better coverage
323 >    abstract class CheckedAction {
324 >        int invocationCount = 0;
325 >        final ExecutionMode m;
326 >        CheckedAction(ExecutionMode m) { this.m = m; }
327 >        void invoked() {
328 >            m.checkExecutionMode();
329 >            assertEquals(0, invocationCount++);
330 >        }
331 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
332 >        void assertInvoked() { assertEquals(1, invocationCount); }
333 >    }
334  
335 <    // A non-commutative function that handles and produces null values as well.
336 <    static Integer subtract(Integer x, Integer y) {
337 <        return (x == null && y == null) ? null :
338 <            ((x == null) ? 42 : x.intValue())
339 <            - ((y == null) ? 99 : y.intValue());
335 >    abstract class CheckedIntegerAction extends CheckedAction {
336 >        Integer value;
337 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
338 >        void assertValue(Integer expected) {
339 >            assertInvoked();
340 >            assertEquals(expected, value);
341 >        }
342 >    }
343 >
344 >    class IntegerSupplier extends CheckedAction
345 >        implements Supplier<Integer>
346 >    {
347 >        final Integer value;
348 >        IntegerSupplier(ExecutionMode m, Integer value) {
349 >            super(m);
350 >            this.value = value;
351 >        }
352 >        public Integer get() {
353 >            invoked();
354 >            return value;
355 >        }
356      }
357  
358      // A function that handles and produces null values as well.
# Line 330 | Line 360 | public class CompletableFutureTest exten
360          return (x == null) ? null : x + 1;
361      }
362  
363 <    static final Supplier<Integer> supplyOne =
364 <        () -> Integer.valueOf(1);
365 <    static final Function<Integer, Integer> inc =
366 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
337 <    static final BiFunction<Integer, Integer, Integer> subtract =
338 <        (Integer x, Integer y) -> subtract(x, y);
339 <    static final class IncAction implements Consumer<Integer> {
340 <        int invocationCount = 0;
341 <        Integer value;
342 <        public boolean ran() { return invocationCount == 1; }
363 >    class IncAction extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        IncAction(ExecutionMode m) { super(m); }
367          public void accept(Integer x) {
368 <            invocationCount++;
368 >            invoked();
369              value = inc(x);
370          }
371      }
372 <    static final class IncFunction implements Function<Integer,Integer> {
373 <        int invocationCount = 0;
374 <        Integer value;
375 <        public boolean ran() { return invocationCount == 1; }
372 >
373 >    class IncFunction extends CheckedIntegerAction
374 >        implements Function<Integer,Integer>
375 >    {
376 >        IncFunction(ExecutionMode m) { super(m); }
377          public Integer apply(Integer x) {
378 <            invocationCount++;
378 >            invoked();
379              return value = inc(x);
380          }
381      }
382 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
383 <        int invocationCount = 0;
384 <        Integer value;
385 <        // Check this action was invoked exactly once when result is computed.
386 <        public boolean ran() { return invocationCount == 1; }
382 >
383 >    // Choose non-commutative actions for better coverage
384 >    // A non-commutative function that handles and produces null values as well.
385 >    static Integer subtract(Integer x, Integer y) {
386 >        return (x == null && y == null) ? null :
387 >            ((x == null) ? 42 : x.intValue())
388 >            - ((y == null) ? 99 : y.intValue());
389 >    }
390 >
391 >    class SubtractAction extends CheckedIntegerAction
392 >        implements BiConsumer<Integer, Integer>
393 >    {
394 >        SubtractAction(ExecutionMode m) { super(m); }
395          public void accept(Integer x, Integer y) {
396 <            invocationCount++;
396 >            invoked();
397              value = subtract(x, y);
398          }
399      }
400 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
401 <        int invocationCount = 0;
402 <        Integer value;
403 <        // Check this action was invoked exactly once when result is computed.
404 <        public boolean ran() { return invocationCount == 1; }
400 >
401 >    class SubtractFunction extends CheckedIntegerAction
402 >        implements BiFunction<Integer, Integer, Integer>
403 >    {
404 >        SubtractFunction(ExecutionMode m) { super(m); }
405          public Integer apply(Integer x, Integer y) {
406 <            invocationCount++;
406 >            invoked();
407              return value = subtract(x, y);
408          }
409      }
410 <    static final class Noop implements Runnable {
411 <        int invocationCount = 0;
412 <        boolean ran;
410 >
411 >    class Noop extends CheckedAction implements Runnable {
412 >        Noop(ExecutionMode m) { super(m); }
413          public void run() {
414 <            invocationCount++;
382 <            ran = true;
414 >            invoked();
415          }
416      }
417  
418 <    static final class FailingSupplier implements Supplier<Integer> {
419 <        boolean ran;
420 <        public Integer get() { ran = true; throw new CFException(); }
418 >    class FailingSupplier extends CheckedAction
419 >        implements Supplier<Integer>
420 >    {
421 >        FailingSupplier(ExecutionMode m) { super(m); }
422 >        public Integer get() {
423 >            invoked();
424 >            throw new CFException();
425 >        }
426      }
427 <    static final class FailingConsumer implements Consumer<Integer> {
428 <        boolean ran;
429 <        public void accept(Integer x) { ran = true; throw new CFException(); }
427 >
428 >    class FailingConsumer extends CheckedIntegerAction
429 >        implements Consumer<Integer>
430 >    {
431 >        FailingConsumer(ExecutionMode m) { super(m); }
432 >        public void accept(Integer x) {
433 >            invoked();
434 >            value = x;
435 >            throw new CFException();
436 >        }
437      }
438 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
439 <        boolean ran;
440 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
438 >
439 >    class FailingBiConsumer extends CheckedIntegerAction
440 >        implements BiConsumer<Integer, Integer>
441 >    {
442 >        FailingBiConsumer(ExecutionMode m) { super(m); }
443 >        public void accept(Integer x, Integer y) {
444 >            invoked();
445 >            value = subtract(x, y);
446 >            throw new CFException();
447 >        }
448      }
449 <    static final class FailingFunction implements Function<Integer, Integer> {
450 <        boolean ran;
451 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
449 >
450 >    class FailingFunction extends CheckedIntegerAction
451 >        implements Function<Integer, Integer>
452 >    {
453 >        FailingFunction(ExecutionMode m) { super(m); }
454 >        public Integer apply(Integer x) {
455 >            invoked();
456 >            value = x;
457 >            throw new CFException();
458 >        }
459      }
460 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
461 <        boolean ran;
462 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
460 >
461 >    class FailingBiFunction extends CheckedIntegerAction
462 >        implements BiFunction<Integer, Integer, Integer>
463 >    {
464 >        FailingBiFunction(ExecutionMode m) { super(m); }
465 >        public Integer apply(Integer x, Integer y) {
466 >            invoked();
467 >            value = subtract(x, y);
468 >            throw new CFException();
469 >        }
470      }
471 <    static final class FailingNoop implements Runnable {
472 <        boolean ran;
473 <        public void run() { ran = true; throw new CFException(); }
471 >
472 >    class FailingRunnable extends CheckedAction implements Runnable {
473 >        FailingRunnable(ExecutionMode m) { super(m); }
474 >        public void run() {
475 >            invoked();
476 >            throw new CFException();
477 >        }
478      }
479  
480 <    static final class CompletableFutureInc
481 <        implements Function<Integer, CompletableFuture<Integer>> {
482 <        boolean ran;
480 >
481 >    class CompletableFutureInc extends CheckedIntegerAction
482 >        implements Function<Integer, CompletableFuture<Integer>>
483 >    {
484 >        CompletableFutureInc(ExecutionMode m) { super(m); }
485          public CompletableFuture<Integer> apply(Integer x) {
486 <            ran = true;
486 >            invoked();
487 >            value = x;
488              CompletableFuture<Integer> f = new CompletableFuture<>();
489 <            f.complete(Integer.valueOf(x.intValue() + 1));
489 >            f.complete(inc(x));
490              return f;
491          }
492      }
493  
494 <    static final class FailingCompletableFutureFunction
495 <        implements Function<Integer, CompletableFuture<Integer>> {
496 <        boolean ran;
494 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
495 >        implements Function<Integer, CompletableFuture<Integer>>
496 >    {
497 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
498          public CompletableFuture<Integer> apply(Integer x) {
499 <            ran = true; throw new CFException();
499 >            invoked();
500 >            value = x;
501 >            throw new CFException();
502          }
503      }
504  
505      // Used for explicit executor tests
506      static final class ThreadExecutor implements Executor {
507 <        AtomicInteger count = new AtomicInteger(0);
507 >        final AtomicInteger count = new AtomicInteger(0);
508 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
509 >        static boolean startedCurrentThread() {
510 >            return Thread.currentThread().getThreadGroup() == tg;
511 >        }
512  
513          public void execute(Runnable r) {
514              count.getAndIncrement();
515 <            new Thread(r).start();
437 <        }
438 <    }
439 <
440 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
441 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
442 <    }
443 <
444 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
445 <        boolean ran;
446 <        public Integer apply(Integer x, Throwable t) {
447 <            ran = true;
448 <            return (t == null) ? two : three;
515 >            new Thread(tg, r).start();
516          }
517      }
518  
519      /**
520       * Permits the testing of parallel code for the 3 different
521 <     * execution modes without repeating all the testing code.
521 >     * execution modes without copy/pasting all the test methods.
522       */
523      enum ExecutionMode {
524          DEFAULT {
525 +            public void checkExecutionMode() {
526 +                assertFalse(ThreadExecutor.startedCurrentThread());
527 +                assertNull(ForkJoinTask.getPool());
528 +            }
529 +            public CompletableFuture<Void> runAsync(Runnable a) {
530 +                throw new UnsupportedOperationException();
531 +            }
532 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
533 +                throw new UnsupportedOperationException();
534 +            }
535 +            public <T> CompletableFuture<Void> thenRun
536 +                (CompletableFuture<T> f, Runnable a) {
537 +                return f.thenRun(a);
538 +            }
539 +            public <T> CompletableFuture<Void> thenAccept
540 +                (CompletableFuture<T> f, Consumer<? super T> a) {
541 +                return f.thenAccept(a);
542 +            }
543 +            public <T,U> CompletableFuture<U> thenApply
544 +                (CompletableFuture<T> f, Function<? super T,U> a) {
545 +                return f.thenApply(a);
546 +            }
547 +            public <T,U> CompletableFuture<U> thenCompose
548 +                (CompletableFuture<T> f,
549 +                 Function<? super T,? extends CompletionStage<U>> a) {
550 +                return f.thenCompose(a);
551 +            }
552 +            public <T,U> CompletableFuture<U> handle
553 +                (CompletableFuture<T> f,
554 +                 BiFunction<? super T,Throwable,? extends U> a) {
555 +                return f.handle(a);
556 +            }
557 +            public <T> CompletableFuture<T> whenComplete
558 +                (CompletableFuture<T> f,
559 +                 BiConsumer<? super T,? super Throwable> a) {
560 +                return f.whenComplete(a);
561 +            }
562              public <T,U> CompletableFuture<Void> runAfterBoth
563                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
564                  return f.runAfterBoth(g, a);
# Line 471 | Line 575 | public class CompletableFutureTest exten
575                   BiFunction<? super T,? super U,? extends V> a) {
576                  return f.thenCombine(g, a);
577              }
578 <            public <T,U> CompletableFuture<U> applyToEither
578 >            public <T> CompletableFuture<Void> runAfterEither
579                  (CompletableFuture<T> f,
580 <                 CompletionStage<? extends T> g,
581 <                 Function<? super T,U> a) {
582 <                return f.applyToEither(g, a);
580 >                 CompletionStage<?> g,
581 >                 java.lang.Runnable a) {
582 >                return f.runAfterEither(g, a);
583              }
584              public <T> CompletableFuture<Void> acceptEither
585                  (CompletableFuture<T> f,
# Line 483 | Line 587 | public class CompletableFutureTest exten
587                   Consumer<? super T> a) {
588                  return f.acceptEither(g, a);
589              }
590 <            public <T> CompletableFuture<Void> runAfterEither
590 >            public <T,U> CompletableFuture<U> applyToEither
591                  (CompletableFuture<T> f,
592 <                 CompletionStage<?> g,
593 <                 java.lang.Runnable a) {
594 <                return f.runAfterEither(g, a);
592 >                 CompletionStage<? extends T> g,
593 >                 Function<? super T,U> a) {
594 >                return f.applyToEither(g, a);
595 >            }
596 >        },
597 >
598 >        ASYNC {
599 >            public void checkExecutionMode() {
600 >                assertSame(ForkJoinPool.commonPool(),
601 >                           ForkJoinTask.getPool());
602 >            }
603 >            public CompletableFuture<Void> runAsync(Runnable a) {
604 >                return CompletableFuture.runAsync(a);
605 >            }
606 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
607 >                return CompletableFuture.supplyAsync(a);
608 >            }
609 >            public <T> CompletableFuture<Void> thenRun
610 >                (CompletableFuture<T> f, Runnable a) {
611 >                return f.thenRunAsync(a);
612 >            }
613 >            public <T> CompletableFuture<Void> thenAccept
614 >                (CompletableFuture<T> f, Consumer<? super T> a) {
615 >                return f.thenAcceptAsync(a);
616 >            }
617 >            public <T,U> CompletableFuture<U> thenApply
618 >                (CompletableFuture<T> f, Function<? super T,U> a) {
619 >                return f.thenApplyAsync(a);
620              }
621              public <T,U> CompletableFuture<U> thenCompose
622                  (CompletableFuture<T> f,
623                   Function<? super T,? extends CompletionStage<U>> a) {
624 <                return f.thenCompose(a);
624 >                return f.thenComposeAsync(a);
625 >            }
626 >            public <T,U> CompletableFuture<U> handle
627 >                (CompletableFuture<T> f,
628 >                 BiFunction<? super T,Throwable,? extends U> a) {
629 >                return f.handleAsync(a);
630              }
631              public <T> CompletableFuture<T> whenComplete
632                  (CompletableFuture<T> f,
633                   BiConsumer<? super T,? super Throwable> a) {
634 <                return f.whenComplete(a);
634 >                return f.whenCompleteAsync(a);
635              }
502        },
503
504 //             /** Experimental way to do more testing */
505 //         REVERSE_DEFAULT {
506 //             public <T,U> CompletableFuture<Void> runAfterBoth
507 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
508 //                 return g.runAfterBoth(f, a);
509 //             }
510 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
511 //                 (CompletableFuture<T> f,
512 //                  CompletionStage<? extends U> g,
513 //                  BiConsumer<? super T,? super U> a) {
514 //                 return DEFAULT.thenAcceptBoth(f, g, a);
515 //             }
516 //         },
517
518        DEFAULT_ASYNC {
636              public <T,U> CompletableFuture<Void> runAfterBoth
637                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
638                  return f.runAfterBothAsync(g, a);
# Line 532 | Line 649 | public class CompletableFutureTest exten
649                   BiFunction<? super T,? super U,? extends V> a) {
650                  return f.thenCombineAsync(g, a);
651              }
652 <            public <T,U> CompletableFuture<U> applyToEither
652 >            public <T> CompletableFuture<Void> runAfterEither
653                  (CompletableFuture<T> f,
654 <                 CompletionStage<? extends T> g,
655 <                 Function<? super T,U> a) {
656 <                return f.applyToEitherAsync(g, a);
654 >                 CompletionStage<?> g,
655 >                 java.lang.Runnable a) {
656 >                return f.runAfterEitherAsync(g, a);
657              }
658              public <T> CompletableFuture<Void> acceptEither
659                  (CompletableFuture<T> f,
# Line 544 | Line 661 | public class CompletableFutureTest exten
661                   Consumer<? super T> a) {
662                  return f.acceptEitherAsync(g, a);
663              }
664 <            public <T> CompletableFuture<Void> runAfterEither
664 >            public <T,U> CompletableFuture<U> applyToEither
665                  (CompletableFuture<T> f,
666 <                 CompletionStage<?> g,
667 <                 java.lang.Runnable a) {
668 <                return f.runAfterEitherAsync(g, a);
666 >                 CompletionStage<? extends T> g,
667 >                 Function<? super T,U> a) {
668 >                return f.applyToEitherAsync(g, a);
669 >            }
670 >        },
671 >
672 >        EXECUTOR {
673 >            public void checkExecutionMode() {
674 >                assertTrue(ThreadExecutor.startedCurrentThread());
675 >            }
676 >            public CompletableFuture<Void> runAsync(Runnable a) {
677 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
678 >            }
679 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
680 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
681 >            }
682 >            public <T> CompletableFuture<Void> thenRun
683 >                (CompletableFuture<T> f, Runnable a) {
684 >                return f.thenRunAsync(a, new ThreadExecutor());
685 >            }
686 >            public <T> CompletableFuture<Void> thenAccept
687 >                (CompletableFuture<T> f, Consumer<? super T> a) {
688 >                return f.thenAcceptAsync(a, new ThreadExecutor());
689 >            }
690 >            public <T,U> CompletableFuture<U> thenApply
691 >                (CompletableFuture<T> f, Function<? super T,U> a) {
692 >                return f.thenApplyAsync(a, new ThreadExecutor());
693              }
694              public <T,U> CompletableFuture<U> thenCompose
695                  (CompletableFuture<T> f,
696                   Function<? super T,? extends CompletionStage<U>> a) {
697 <                return f.thenComposeAsync(a);
697 >                return f.thenComposeAsync(a, new ThreadExecutor());
698 >            }
699 >            public <T,U> CompletableFuture<U> handle
700 >                (CompletableFuture<T> f,
701 >                 BiFunction<? super T,Throwable,? extends U> a) {
702 >                return f.handleAsync(a, new ThreadExecutor());
703              }
704              public <T> CompletableFuture<T> whenComplete
705                  (CompletableFuture<T> f,
706                   BiConsumer<? super T,? super Throwable> a) {
707 <                return f.whenCompleteAsync(a);
707 >                return f.whenCompleteAsync(a, new ThreadExecutor());
708              }
563        },
564
565 //         REVERSE_DEFAULT_ASYNC {
566 //             public <T,U> CompletableFuture<Void> runAfterBoth
567 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
568 //                 return f.runAfterBothAsync(g, a);
569 //             }
570 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
571 //                 (CompletableFuture<T> f,
572 //                  CompletionStage<? extends U> g,
573 //                  BiConsumer<? super T,? super U> a) {
574 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
575 //             }
576 //         },
577
578        EXECUTOR {
709              public <T,U> CompletableFuture<Void> runAfterBoth
710                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
711                  return f.runAfterBothAsync(g, a, new ThreadExecutor());
# Line 592 | Line 722 | public class CompletableFutureTest exten
722                   BiFunction<? super T,? super U,? extends V> a) {
723                  return f.thenCombineAsync(g, a, new ThreadExecutor());
724              }
595            public <T,U> CompletableFuture<U> applyToEither
596                (CompletableFuture<T> f,
597                 CompletionStage<? extends T> g,
598                 Function<? super T,U> a) {
599                return f.applyToEitherAsync(g, a, new ThreadExecutor());
600            }
601            public <T> CompletableFuture<Void> acceptEither
602                (CompletableFuture<T> f,
603                 CompletionStage<? extends T> g,
604                 Consumer<? super T> a) {
605                return f.acceptEitherAsync(g, a, new ThreadExecutor());
606            }
725              public <T> CompletableFuture<Void> runAfterEither
726                  (CompletableFuture<T> f,
727                   CompletionStage<?> g,
728                   java.lang.Runnable a) {
729                  return f.runAfterEitherAsync(g, a, new ThreadExecutor());
730              }
731 <            public <T,U> CompletableFuture<U> thenCompose
731 >            public <T> CompletableFuture<Void> acceptEither
732                  (CompletableFuture<T> f,
733 <                 Function<? super T,? extends CompletionStage<U>> a) {
734 <                return f.thenComposeAsync(a, new ThreadExecutor());
733 >                 CompletionStage<? extends T> g,
734 >                 Consumer<? super T> a) {
735 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
736              }
737 <            public <T> CompletableFuture<T> whenComplete
737 >            public <T,U> CompletableFuture<U> applyToEither
738                  (CompletableFuture<T> f,
739 <                 BiConsumer<? super T,? super Throwable> a) {
740 <                return f.whenCompleteAsync(a, new ThreadExecutor());
739 >                 CompletionStage<? extends T> g,
740 >                 Function<? super T,U> a) {
741 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
742              }
743          };
744  
745 +        public abstract void checkExecutionMode();
746 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
747 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
748 +        public abstract <T> CompletableFuture<Void> thenRun
749 +            (CompletableFuture<T> f, Runnable a);
750 +        public abstract <T> CompletableFuture<Void> thenAccept
751 +            (CompletableFuture<T> f, Consumer<? super T> a);
752 +        public abstract <T,U> CompletableFuture<U> thenApply
753 +            (CompletableFuture<T> f, Function<? super T,U> a);
754 +        public abstract <T,U> CompletableFuture<U> thenCompose
755 +            (CompletableFuture<T> f,
756 +             Function<? super T,? extends CompletionStage<U>> a);
757 +        public abstract <T,U> CompletableFuture<U> handle
758 +            (CompletableFuture<T> f,
759 +             BiFunction<? super T,Throwable,? extends U> a);
760 +        public abstract <T> CompletableFuture<T> whenComplete
761 +            (CompletableFuture<T> f,
762 +             BiConsumer<? super T,? super Throwable> a);
763          public abstract <T,U> CompletableFuture<Void> runAfterBoth
764              (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
765          public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
# Line 632 | Line 770 | public class CompletableFutureTest exten
770              (CompletableFuture<T> f,
771               CompletionStage<? extends U> g,
772               BiFunction<? super T,? super U,? extends V> a);
635        public abstract <T,U> CompletableFuture<U> applyToEither
636            (CompletableFuture<T> f,
637             CompletionStage<? extends T> g,
638             Function<? super T,U> a);
639        public abstract <T> CompletableFuture<Void> acceptEither
640            (CompletableFuture<T> f,
641             CompletionStage<? extends T> g,
642             Consumer<? super T> a);
773          public abstract <T> CompletableFuture<Void> runAfterEither
774              (CompletableFuture<T> f,
775               CompletionStage<?> g,
776               java.lang.Runnable a);
777 <        public abstract <T,U> CompletableFuture<U> thenCompose
777 >        public abstract <T> CompletableFuture<Void> acceptEither
778              (CompletableFuture<T> f,
779 <             Function<? super T,? extends CompletionStage<U>> a);
780 <        public abstract <T> CompletableFuture<T> whenComplete
779 >             CompletionStage<? extends T> g,
780 >             Consumer<? super T> a);
781 >        public abstract <T,U> CompletableFuture<U> applyToEither
782              (CompletableFuture<T> f,
783 <             BiConsumer<? super T,? super Throwable> a);
784 <
654 <
783 >             CompletionStage<? extends T> g,
784 >             Function<? super T,U> a);
785      }
786  
787      /**
788 <     * exceptionally action completes with function value on source
789 <     * exception; otherwise with source value
788 >     * exceptionally action is not invoked when source completes
789 >     * normally, and source result is propagated
790       */
791 <    public void testExceptionally() {
792 <        CompletableFuture<Integer> f = new CompletableFuture<>();
793 <        ExceptionToInteger r = new ExceptionToInteger();
794 <        CompletableFuture<Integer> g = f.exceptionally(r);
795 <        f.completeExceptionally(new CFException());
796 <        checkCompletedNormally(g, three);
791 >    public void testExceptionally_normalCompletion() {
792 >        for (boolean createIncomplete : new boolean[] { true, false })
793 >        for (Integer v1 : new Integer[] { 1, null })
794 >    {
795 >        final AtomicInteger a = new AtomicInteger(0);
796 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
797 >        if (!createIncomplete) f.complete(v1);
798 >        final CompletableFuture<Integer> g = f.exceptionally
799 >            ((Throwable t) -> {
800 >                // Should not be called
801 >                a.getAndIncrement();
802 >                throw new AssertionError();
803 >            });
804 >        if (createIncomplete) f.complete(v1);
805 >
806 >        checkCompletedNormally(g, v1);
807 >        checkCompletedNormally(f, v1);
808 >        assertEquals(0, a.get());
809 >    }}
810  
668        f = new CompletableFuture<>();
669        r = new ExceptionToInteger();
670        g = f.exceptionally(r);
671        f.complete(one);
672        checkCompletedNormally(g, one);
673    }
811  
812      /**
813 <     * handle action completes normally with function value on either
814 <     * normal or exceptional completion of source
813 >     * exceptionally action completes with function value on source
814 >     * exception
815       */
816 <    public void testHandle() {
817 <        CompletableFuture<Integer> f, g;
818 <        IntegerHandler r;
819 <
820 <        f = new CompletableFuture<>();
821 <        f.completeExceptionally(new CFException());
822 <        g = f.handle(r = new IntegerHandler());
823 <        assertTrue(r.ran);
824 <        checkCompletedNormally(g, three);
825 <
826 <        f = new CompletableFuture<>();
827 <        g = f.handle(r = new IntegerHandler());
828 <        assertFalse(r.ran);
829 <        f.completeExceptionally(new CFException());
830 <        checkCompletedNormally(g, three);
831 <        assertTrue(r.ran);
816 >    public void testExceptionally_exceptionalCompletion() {
817 >        for (boolean createIncomplete : new boolean[] { true, false })
818 >        for (Integer v1 : new Integer[] { 1, null })
819 >    {
820 >        final AtomicInteger a = new AtomicInteger(0);
821 >        final CFException ex = new CFException();
822 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
823 >        if (!createIncomplete) f.completeExceptionally(ex);
824 >        final CompletableFuture<Integer> g = f.exceptionally
825 >            ((Throwable t) -> {
826 >                ExecutionMode.DEFAULT.checkExecutionMode();
827 >                threadAssertSame(t, ex);
828 >                a.getAndIncrement();
829 >                return v1;
830 >            });
831 >        if (createIncomplete) f.completeExceptionally(ex);
832  
833 <        f = new CompletableFuture<>();
834 <        f.complete(one);
835 <        g = f.handle(r = new IntegerHandler());
699 <        assertTrue(r.ran);
700 <        checkCompletedNormally(g, two);
833 >        checkCompletedNormally(g, v1);
834 >        assertEquals(1, a.get());
835 >    }}
836  
837 <        f = new CompletableFuture<>();
838 <        g = f.handle(r = new IntegerHandler());
839 <        assertFalse(r.ran);
840 <        f.complete(one);
841 <        assertTrue(r.ran);
842 <        checkCompletedNormally(g, two);
843 <    }
837 >    public void testExceptionally_exceptionalCompletionActionFailed() {
838 >        for (boolean createIncomplete : new boolean[] { true, false })
839 >        for (Integer v1 : new Integer[] { 1, null })
840 >    {
841 >        final AtomicInteger a = new AtomicInteger(0);
842 >        final CFException ex1 = new CFException();
843 >        final CFException ex2 = new CFException();
844 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
845 >        if (!createIncomplete) f.completeExceptionally(ex1);
846 >        final CompletableFuture<Integer> g = f.exceptionally
847 >            ((Throwable t) -> {
848 >                ExecutionMode.DEFAULT.checkExecutionMode();
849 >                threadAssertSame(t, ex1);
850 >                a.getAndIncrement();
851 >                throw ex2;
852 >            });
853 >        if (createIncomplete) f.completeExceptionally(ex1);
854  
855 <    /**
856 <     * runAsync completes after running Runnable
857 <     */
713 <    public void testRunAsync() {
714 <        Noop r = new Noop();
715 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
716 <        assertNull(f.join());
717 <        assertTrue(r.ran);
718 <        checkCompletedNormally(f, null);
719 <    }
855 >        checkCompletedWithWrappedCFException(g, ex2);
856 >        assertEquals(1, a.get());
857 >    }}
858  
859      /**
860 <     * runAsync with executor completes after running Runnable
860 >     * handle action completes normally with function value on normal
861 >     * completion of source
862       */
863 <    public void testRunAsync2() {
864 <        Noop r = new Noop();
865 <        ThreadExecutor exec = new ThreadExecutor();
866 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
867 <        assertNull(f.join());
868 <        assertTrue(r.ran);
869 <        checkCompletedNormally(f, null);
870 <        assertEquals(1, exec.count.get());
871 <    }
863 >    public void testHandle_normalCompletion() {
864 >        for (ExecutionMode m : ExecutionMode.values())
865 >        for (boolean createIncomplete : new boolean[] { true, false })
866 >        for (Integer v1 : new Integer[] { 1, null })
867 >    {
868 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
869 >        final AtomicInteger a = new AtomicInteger(0);
870 >        if (!createIncomplete) f.complete(v1);
871 >        final CompletableFuture<Integer> g = m.handle
872 >            (f,
873 >             (Integer x, Throwable t) -> {
874 >                m.checkExecutionMode();
875 >                threadAssertSame(x, v1);
876 >                threadAssertNull(t);
877 >                a.getAndIncrement();
878 >                return inc(v1);
879 >            });
880 >        if (createIncomplete) f.complete(v1);
881  
882 <    /**
883 <     * failing runAsync completes exceptionally after running Runnable
884 <     */
885 <    public void testRunAsync3() {
738 <        FailingNoop r = new FailingNoop();
739 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
740 <        checkCompletedWithWrappedCFException(f);
741 <        assertTrue(r.ran);
742 <    }
882 >        checkCompletedNormally(g, inc(v1));
883 >        checkCompletedNormally(f, v1);
884 >        assertEquals(1, a.get());
885 >    }}
886  
887      /**
888 <     * supplyAsync completes with result of supplier
888 >     * handle action completes normally with function value on
889 >     * exceptional completion of source
890       */
891 <    public void testSupplyAsync() {
892 <        CompletableFuture<Integer> f;
893 <        f = CompletableFuture.supplyAsync(supplyOne);
894 <        assertEquals(f.join(), one);
895 <        checkCompletedNormally(f, one);
896 <    }
891 >    public void testHandle_exceptionalCompletion() {
892 >        for (ExecutionMode m : ExecutionMode.values())
893 >        for (boolean createIncomplete : new boolean[] { true, false })
894 >        for (Integer v1 : new Integer[] { 1, null })
895 >    {
896 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
897 >        final AtomicInteger a = new AtomicInteger(0);
898 >        final CFException ex = new CFException();
899 >        if (!createIncomplete) f.completeExceptionally(ex);
900 >        final CompletableFuture<Integer> g = m.handle
901 >            (f,
902 >             (Integer x, Throwable t) -> {
903 >                m.checkExecutionMode();
904 >                threadAssertNull(x);
905 >                threadAssertSame(t, ex);
906 >                a.getAndIncrement();
907 >                return v1;
908 >            });
909 >        if (createIncomplete) f.completeExceptionally(ex);
910  
911 <    /**
912 <     * supplyAsync with executor completes with result of supplier
913 <     */
914 <    public void testSupplyAsync2() {
758 <        CompletableFuture<Integer> f;
759 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
760 <        assertEquals(f.join(), one);
761 <        checkCompletedNormally(f, one);
762 <    }
911 >        checkCompletedNormally(g, v1);
912 >        checkCompletedWithWrappedCFException(f, ex);
913 >        assertEquals(1, a.get());
914 >    }}
915  
916      /**
917 <     * Failing supplyAsync completes exceptionally
917 >     * handle action completes normally with function value on
918 >     * cancelled source
919       */
920 <    public void testSupplyAsync3() {
921 <        FailingSupplier r = new FailingSupplier();
922 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
923 <        checkCompletedWithWrappedCFException(f);
924 <        assertTrue(r.ran);
925 <    }
920 >    public void testHandle_sourceCancelled() {
921 >        for (ExecutionMode m : ExecutionMode.values())
922 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
923 >        for (boolean createIncomplete : new boolean[] { true, false })
924 >        for (Integer v1 : new Integer[] { 1, null })
925 >    {
926 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
927 >        final AtomicInteger a = new AtomicInteger(0);
928 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
929 >        final CompletableFuture<Integer> g = m.handle
930 >            (f,
931 >             (Integer x, Throwable t) -> {
932 >                m.checkExecutionMode();
933 >                threadAssertNull(x);
934 >                threadAssertTrue(t instanceof CancellationException);
935 >                a.getAndIncrement();
936 >                return v1;
937 >            });
938 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
939  
940 <    // seq completion methods
940 >        checkCompletedNormally(g, v1);
941 >        checkCancelled(f);
942 >        assertEquals(1, a.get());
943 >    }}
944  
945      /**
946 <     * thenRun result completes normally after normal completion of source
946 >     * handle result completes exceptionally if action does
947       */
948 <    public void testThenRun() {
949 <        CompletableFuture<Integer> f;
950 <        CompletableFuture<Void> g;
951 <        Noop r;
952 <
953 <        f = new CompletableFuture<>();
954 <        g = f.thenRun(r = new Noop());
955 <        f.complete(null);
956 <        checkCompletedNormally(g, null);
957 <        assertTrue(r.ran);
958 <
959 <        f = new CompletableFuture<>();
960 <        f.complete(null);
961 <        g = f.thenRun(r = new Noop());
962 <        checkCompletedNormally(g, null);
963 <        assertTrue(r.ran);
964 <    }
948 >    public void testHandle_sourceFailedActionFailed() {
949 >        for (ExecutionMode m : ExecutionMode.values())
950 >        for (boolean createIncomplete : new boolean[] { true, false })
951 >    {
952 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
953 >        final AtomicInteger a = new AtomicInteger(0);
954 >        final CFException ex1 = new CFException();
955 >        final CFException ex2 = new CFException();
956 >        if (!createIncomplete) f.completeExceptionally(ex1);
957 >        final CompletableFuture<Integer> g = m.handle
958 >            (f,
959 >             (Integer x, Throwable t) -> {
960 >                m.checkExecutionMode();
961 >                threadAssertNull(x);
962 >                threadAssertSame(ex1, t);
963 >                a.getAndIncrement();
964 >                throw ex2;
965 >            });
966 >        if (createIncomplete) f.completeExceptionally(ex1);
967  
968 <    /**
969 <     * thenRun result completes exceptionally after exceptional
970 <     * completion of source
971 <     */
801 <    public void testThenRun2() {
802 <        CompletableFuture<Integer> f;
803 <        CompletableFuture<Void> g;
804 <        Noop r;
968 >        checkCompletedWithWrappedCFException(g, ex2);
969 >        checkCompletedWithWrappedCFException(f, ex1);
970 >        assertEquals(1, a.get());
971 >    }}
972  
973 <        f = new CompletableFuture<>();
974 <        g = f.thenRun(r = new Noop());
975 <        f.completeExceptionally(new CFException());
976 <        checkCompletedWithWrappedCFException(g);
977 <        assertFalse(r.ran);
973 >    public void testHandle_sourceCompletedNormallyActionFailed() {
974 >        for (ExecutionMode m : ExecutionMode.values())
975 >        for (boolean createIncomplete : new boolean[] { true, false })
976 >        for (Integer v1 : new Integer[] { 1, null })
977 >    {
978 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
979 >        final AtomicInteger a = new AtomicInteger(0);
980 >        final CFException ex = new CFException();
981 >        if (!createIncomplete) f.complete(v1);
982 >        final CompletableFuture<Integer> g = m.handle
983 >            (f,
984 >             (Integer x, Throwable t) -> {
985 >                m.checkExecutionMode();
986 >                threadAssertSame(x, v1);
987 >                threadAssertNull(t);
988 >                a.getAndIncrement();
989 >                throw ex;
990 >            });
991 >        if (createIncomplete) f.complete(v1);
992  
993 <        f = new CompletableFuture<>();
994 <        f.completeExceptionally(new CFException());
995 <        g = f.thenRun(r = new Noop());
996 <        checkCompletedWithWrappedCFException(g);
816 <        assertFalse(r.ran);
817 <    }
993 >        checkCompletedWithWrappedCFException(g, ex);
994 >        checkCompletedNormally(f, v1);
995 >        assertEquals(1, a.get());
996 >    }}
997  
998      /**
999 <     * thenRun result completes exceptionally if action does
999 >     * runAsync completes after running Runnable
1000       */
1001 <    public void testThenRun3() {
1002 <        CompletableFuture<Integer> f;
1003 <        CompletableFuture<Void> g;
1004 <        FailingNoop r;
1005 <
1006 <        f = new CompletableFuture<>();
1007 <        g = f.thenRun(r = new FailingNoop());
1008 <        f.complete(null);
1009 <        checkCompletedWithWrappedCFException(g);
1010 <
1011 <        f = new CompletableFuture<>();
1012 <        f.complete(null);
1013 <        g = f.thenRun(r = new FailingNoop());
835 <        checkCompletedWithWrappedCFException(g);
836 <    }
1001 >    public void testRunAsync_normalCompletion() {
1002 >        ExecutionMode[] executionModes = {
1003 >            ExecutionMode.ASYNC,
1004 >            ExecutionMode.EXECUTOR,
1005 >        };
1006 >        for (ExecutionMode m : executionModes)
1007 >    {
1008 >        final Noop r = new Noop(m);
1009 >        final CompletableFuture<Void> f = m.runAsync(r);
1010 >        assertNull(f.join());
1011 >        checkCompletedNormally(f, null);
1012 >        r.assertInvoked();
1013 >    }}
1014  
1015      /**
1016 <     * thenRun result completes exceptionally if source cancelled
1016 >     * failing runAsync completes exceptionally after running Runnable
1017       */
1018 <    public void testThenRun4() {
1019 <        CompletableFuture<Integer> f;
1020 <        CompletableFuture<Void> g;
1021 <        Noop r;
1022 <
1023 <        f = new CompletableFuture<>();
1024 <        g = f.thenRun(r = new Noop());
1025 <        assertTrue(f.cancel(true));
1026 <        checkCompletedWithWrappedCancellationException(g);
1027 <
1028 <        f = new CompletableFuture<>();
1029 <        assertTrue(f.cancel(true));
853 <        g = f.thenRun(r = new Noop());
854 <        checkCompletedWithWrappedCancellationException(g);
855 <    }
1018 >    public void testRunAsync_exceptionalCompletion() {
1019 >        ExecutionMode[] executionModes = {
1020 >            ExecutionMode.ASYNC,
1021 >            ExecutionMode.EXECUTOR,
1022 >        };
1023 >        for (ExecutionMode m : executionModes)
1024 >    {
1025 >        final FailingRunnable r = new FailingRunnable(m);
1026 >        final CompletableFuture<Void> f = m.runAsync(r);
1027 >        checkCompletedWithWrappedCFException(f);
1028 >        r.assertInvoked();
1029 >    }}
1030  
1031      /**
1032 <     * thenApply result completes normally after normal completion of source
1032 >     * supplyAsync completes with result of supplier
1033       */
1034 <    public void testThenApply() {
1035 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1036 <        CompletableFuture<Integer> g = f.thenApply(inc);
1037 <        f.complete(one);
1038 <        checkCompletedNormally(g, two);
1039 <    }
1034 >    public void testSupplyAsync_normalCompletion() {
1035 >        ExecutionMode[] executionModes = {
1036 >            ExecutionMode.ASYNC,
1037 >            ExecutionMode.EXECUTOR,
1038 >        };
1039 >        for (ExecutionMode m : executionModes)
1040 >        for (Integer v1 : new Integer[] { 1, null })
1041 >    {
1042 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1043 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1044 >        assertSame(v1, f.join());
1045 >        checkCompletedNormally(f, v1);
1046 >        r.assertInvoked();
1047 >    }}
1048  
1049      /**
1050 <     * thenApply result completes exceptionally after exceptional
869 <     * completion of source
1050 >     * Failing supplyAsync completes exceptionally
1051       */
1052 <    public void testThenApply2() {
1053 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1054 <        CompletableFuture<Integer> g = f.thenApply(inc);
1055 <        f.completeExceptionally(new CFException());
1056 <        checkCompletedWithWrappedCFException(g);
1057 <    }
1052 >    public void testSupplyAsync_exceptionalCompletion() {
1053 >        ExecutionMode[] executionModes = {
1054 >            ExecutionMode.ASYNC,
1055 >            ExecutionMode.EXECUTOR,
1056 >        };
1057 >        for (ExecutionMode m : executionModes)
1058 >    {
1059 >        FailingSupplier r = new FailingSupplier(m);
1060 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1061 >        checkCompletedWithWrappedCFException(f);
1062 >        r.assertInvoked();
1063 >    }}
1064  
1065 <    /**
879 <     * thenApply result completes exceptionally if action does
880 <     */
881 <    public void testThenApply3() {
882 <        CompletableFuture<Integer> f = new CompletableFuture<>();
883 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
884 <        f.complete(one);
885 <        checkCompletedWithWrappedCFException(g);
886 <    }
1065 >    // seq completion methods
1066  
1067      /**
1068 <     * thenApply result completes exceptionally if source cancelled
1068 >     * thenRun result completes normally after normal completion of source
1069       */
1070 <    public void testThenApply4() {
1071 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1072 <        CompletableFuture<Integer> g = f.thenApply(inc);
1073 <        assertTrue(f.cancel(true));
1074 <        checkCompletedWithWrappedCancellationException(g);
1075 <    }
1070 >    public void testThenRun_normalCompletion() {
1071 >        for (ExecutionMode m : ExecutionMode.values())
1072 >        for (boolean createIncomplete : new boolean[] { true, false })
1073 >        for (Integer v1 : new Integer[] { 1, null })
1074 >    {
1075 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1076 >        final Noop r = new Noop(m);
1077 >        if (!createIncomplete) f.complete(v1);
1078 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1079 >        if (createIncomplete) {
1080 >            checkIncomplete(g);
1081 >            f.complete(v1);
1082 >        }
1083  
898    /**
899     * thenAccept result completes normally after normal completion of source
900     */
901    public void testThenAccept() {
902        CompletableFuture<Integer> f = new CompletableFuture<>();
903        IncAction r = new IncAction();
904        CompletableFuture<Void> g = f.thenAccept(r);
905        f.complete(one);
1084          checkCompletedNormally(g, null);
1085 <        assertEquals(r.value, (Integer) 2);
1086 <    }
1085 >        checkCompletedNormally(f, v1);
1086 >        r.assertInvoked();
1087 >    }}
1088  
1089      /**
1090 <     * thenAccept result completes exceptionally after exceptional
1090 >     * thenRun result completes exceptionally after exceptional
1091       * completion of source
1092       */
1093 <    public void testThenAccept2() {
1094 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1095 <        IncAction r = new IncAction();
1096 <        CompletableFuture<Void> g = f.thenAccept(r);
1097 <        f.completeExceptionally(new CFException());
1098 <        checkCompletedWithWrappedCFException(g);
1099 <    }
1093 >    public void testThenRun_exceptionalCompletion() {
1094 >        for (ExecutionMode m : ExecutionMode.values())
1095 >        for (boolean createIncomplete : new boolean[] { true, false })
1096 >    {
1097 >        final CFException ex = new CFException();
1098 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1099 >        final Noop r = new Noop(m);
1100 >        if (!createIncomplete) f.completeExceptionally(ex);
1101 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1102 >        if (createIncomplete) {
1103 >            checkIncomplete(g);
1104 >            f.completeExceptionally(ex);
1105 >        }
1106  
1107 <    /**
1108 <     * thenAccept result completes exceptionally if action does
1109 <     */
1110 <    public void testThenAccept3() {
926 <        CompletableFuture<Integer> f = new CompletableFuture<>();
927 <        FailingConsumer r = new FailingConsumer();
928 <        CompletableFuture<Void> g = f.thenAccept(r);
929 <        f.complete(one);
930 <        checkCompletedWithWrappedCFException(g);
931 <        assertTrue(r.ran);
932 <    }
1107 >        checkCompletedWithWrappedCFException(g, ex);
1108 >        checkCompletedWithWrappedCFException(f, ex);
1109 >        r.assertNotInvoked();
1110 >    }}
1111  
1112      /**
1113 <     * thenAccept result completes exceptionally if source cancelled
1113 >     * thenRun result completes exceptionally if source cancelled
1114       */
1115 <    public void testThenAccept4() {
1116 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1117 <        IncAction r = new IncAction();
1118 <        CompletableFuture<Void> g = f.thenAccept(r);
1119 <        assertTrue(f.cancel(true));
1115 >    public void testThenRun_sourceCancelled() {
1116 >        for (ExecutionMode m : ExecutionMode.values())
1117 >        for (boolean createIncomplete : new boolean[] { true, false })
1118 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1119 >    {
1120 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1121 >        final Noop r = new Noop(m);
1122 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1123 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1124 >        if (createIncomplete) {
1125 >            checkIncomplete(g);
1126 >            assertTrue(f.cancel(mayInterruptIfRunning));
1127 >        }
1128 >
1129          checkCompletedWithWrappedCancellationException(g);
1130 <    }
1130 >        checkCancelled(f);
1131 >        r.assertNotInvoked();
1132 >    }}
1133  
1134      /**
1135 <     * thenCombine result completes normally after normal completion
947 <     * of sources
1135 >     * thenRun result completes exceptionally if action does
1136       */
1137 <    public void testThenCombine_normalCompletion1() {
1137 >    public void testThenRun_actionFailed() {
1138          for (ExecutionMode m : ExecutionMode.values())
1139 +        for (boolean createIncomplete : new boolean[] { true, false })
1140          for (Integer v1 : new Integer[] { 1, null })
1141 <        for (Integer v2 : new Integer[] { 2, null }) {
953 <
1141 >    {
1142          final CompletableFuture<Integer> f = new CompletableFuture<>();
1143 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1144 <        final SubtractFunction r = new SubtractFunction();
1145 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1146 <
1147 <        f.complete(v1);
1148 <        checkIncomplete(h);
961 <        assertEquals(r.invocationCount, 0);
962 <        g.complete(v2);
963 <
964 <        checkCompletedNormally(h, subtract(v1, v2));
965 <        checkCompletedNormally(f, v1);
966 <        checkCompletedNormally(g, v2);
967 <        assertEquals(r.invocationCount, 1);
1143 >        final FailingRunnable r = new FailingRunnable(m);
1144 >        if (!createIncomplete) f.complete(v1);
1145 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1146 >        if (createIncomplete) {
1147 >            checkIncomplete(g);
1148 >            f.complete(v1);
1149          }
969    }
970
971    public void testThenCombine_normalCompletion2() {
972        for (ExecutionMode m : ExecutionMode.values())
973        for (Integer v1 : new Integer[] { 1, null })
974        for (Integer v2 : new Integer[] { 2, null }) {
975
976        final CompletableFuture<Integer> f = new CompletableFuture<>();
977        final CompletableFuture<Integer> g = new CompletableFuture<>();
978        final SubtractFunction r = new SubtractFunction();
979        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1150  
1151 <        g.complete(v2);
982 <        checkIncomplete(h);
983 <        assertEquals(r.invocationCount, 0);
984 <        f.complete(v1);
985 <
986 <        checkCompletedNormally(h, subtract(v1, v2));
1151 >        checkCompletedWithWrappedCFException(g);
1152          checkCompletedNormally(f, v1);
1153 <        checkCompletedNormally(g, v2);
989 <        assertEquals(r.invocationCount, 1);
990 <        }
991 <    }
1153 >    }}
1154  
1155 <    public void testThenCombine_normalCompletion3() {
1155 >    /**
1156 >     * thenApply result completes normally after normal completion of source
1157 >     */
1158 >    public void testThenApply_normalCompletion() {
1159          for (ExecutionMode m : ExecutionMode.values())
1160 +        for (boolean createIncomplete : new boolean[] { true, false })
1161          for (Integer v1 : new Integer[] { 1, null })
1162 <        for (Integer v2 : new Integer[] { 2, null }) {
997 <
1162 >    {
1163          final CompletableFuture<Integer> f = new CompletableFuture<>();
1164 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1165 <        final SubtractFunction r = new SubtractFunction();
1166 <
1167 <        g.complete(v2);
1168 <        f.complete(v1);
1169 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1005 <
1006 <        checkCompletedNormally(h, subtract(v1, v2));
1007 <        checkCompletedNormally(f, v1);
1008 <        checkCompletedNormally(g, v2);
1009 <        assertEquals(r.invocationCount, 1);
1164 >        final IncFunction r = new IncFunction(m);
1165 >        if (!createIncomplete) f.complete(v1);
1166 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1167 >        if (createIncomplete) {
1168 >            checkIncomplete(g);
1169 >            f.complete(v1);
1170          }
1011    }
1171  
1172 <    public void testThenCombine_normalCompletion4() {
1014 <        for (ExecutionMode m : ExecutionMode.values())
1015 <        for (Integer v1 : new Integer[] { 1, null })
1016 <        for (Integer v2 : new Integer[] { 2, null }) {
1017 <
1018 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1019 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1020 <        final SubtractFunction r = new SubtractFunction();
1021 <
1022 <        f.complete(v1);
1023 <        g.complete(v2);
1024 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1025 <
1026 <        checkCompletedNormally(h, subtract(v1, v2));
1172 >        checkCompletedNormally(g, inc(v1));
1173          checkCompletedNormally(f, v1);
1174 <        checkCompletedNormally(g, v2);
1175 <        assertEquals(r.invocationCount, 1);
1030 <        }
1031 <    }
1174 >        r.assertInvoked();
1175 >    }}
1176  
1177      /**
1178 <     * thenCombine result completes exceptionally after exceptional
1179 <     * completion of either source
1178 >     * thenApply result completes exceptionally after exceptional
1179 >     * completion of source
1180       */
1181 <    public void testThenCombine_exceptionalCompletion1() {
1181 >    public void testThenApply_exceptionalCompletion() {
1182          for (ExecutionMode m : ExecutionMode.values())
1183 <        for (Integer v1 : new Integer[] { 1, null }) {
1184 <
1041 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1042 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1043 <        final SubtractFunction r = new SubtractFunction();
1044 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1183 >        for (boolean createIncomplete : new boolean[] { true, false })
1184 >    {
1185          final CFException ex = new CFException();
1046
1047        f.completeExceptionally(ex);
1048        checkIncomplete(h);
1049        g.complete(v1);
1050
1051        checkCompletedWithWrappedCFException(h, ex);
1052        checkCompletedWithWrappedCFException(f, ex);
1053        assertEquals(r.invocationCount, 0);
1054        checkCompletedNormally(g, v1);
1055        }
1056    }
1057
1058    public void testThenCombine_exceptionalCompletion2() {
1059        for (ExecutionMode m : ExecutionMode.values())
1060        for (Integer v1 : new Integer[] { 1, null }) {
1061
1186          final CompletableFuture<Integer> f = new CompletableFuture<>();
1187 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1188 <        final SubtractFunction r = new SubtractFunction();
1189 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1190 <        final CFException ex = new CFException();
1191 <
1192 <        g.completeExceptionally(ex);
1069 <        checkIncomplete(h);
1070 <        f.complete(v1);
1071 <
1072 <        checkCompletedWithWrappedCFException(h, ex);
1073 <        checkCompletedWithWrappedCFException(g, ex);
1074 <        assertEquals(r.invocationCount, 0);
1075 <        checkCompletedNormally(f, v1);
1187 >        final IncFunction r = new IncFunction(m);
1188 >        if (!createIncomplete) f.completeExceptionally(ex);
1189 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1190 >        if (createIncomplete) {
1191 >            checkIncomplete(g);
1192 >            f.completeExceptionally(ex);
1193          }
1077    }
1078
1079    public void testThenCombine_exceptionalCompletion3() {
1080        for (ExecutionMode m : ExecutionMode.values())
1081        for (Integer v1 : new Integer[] { 1, null }) {
1082
1083        final CompletableFuture<Integer> f = new CompletableFuture<>();
1084        final CompletableFuture<Integer> g = new CompletableFuture<>();
1085        final SubtractFunction r = new SubtractFunction();
1086        final CFException ex = new CFException();
1087
1088        g.completeExceptionally(ex);
1089        f.complete(v1);
1090        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1194  
1092        checkCompletedWithWrappedCFException(h, ex);
1195          checkCompletedWithWrappedCFException(g, ex);
1196 <        assertEquals(r.invocationCount, 0);
1197 <        checkCompletedNormally(f, v1);
1198 <        }
1097 <    }
1196 >        checkCompletedWithWrappedCFException(f, ex);
1197 >        r.assertNotInvoked();
1198 >    }}
1199  
1200 <    public void testThenCombine_exceptionalCompletion4() {
1200 >    /**
1201 >     * thenApply result completes exceptionally if source cancelled
1202 >     */
1203 >    public void testThenApply_sourceCancelled() {
1204          for (ExecutionMode m : ExecutionMode.values())
1205 <        for (Integer v1 : new Integer[] { 1, null }) {
1206 <
1205 >        for (boolean createIncomplete : new boolean[] { true, false })
1206 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1207 >    {
1208          final CompletableFuture<Integer> f = new CompletableFuture<>();
1209 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1210 <        final SubtractFunction r = new SubtractFunction();
1211 <        final CFException ex = new CFException();
1212 <
1213 <        f.completeExceptionally(ex);
1214 <        g.complete(v1);
1110 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1111 <
1112 <        checkCompletedWithWrappedCFException(h, ex);
1113 <        checkCompletedWithWrappedCFException(f, ex);
1114 <        assertEquals(r.invocationCount, 0);
1115 <        checkCompletedNormally(g, v1);
1209 >        final IncFunction r = new IncFunction(m);
1210 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1211 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1212 >        if (createIncomplete) {
1213 >            checkIncomplete(g);
1214 >            assertTrue(f.cancel(mayInterruptIfRunning));
1215          }
1216 <    }
1216 >
1217 >        checkCompletedWithWrappedCancellationException(g);
1218 >        checkCancelled(f);
1219 >        r.assertNotInvoked();
1220 >    }}
1221  
1222      /**
1223 <     * thenCombine result completes exceptionally if action does
1223 >     * thenApply result completes exceptionally if action does
1224       */
1225 <    public void testThenCombine_actionFailed1() {
1225 >    public void testThenApply_actionFailed() {
1226          for (ExecutionMode m : ExecutionMode.values())
1227 +        for (boolean createIncomplete : new boolean[] { true, false })
1228          for (Integer v1 : new Integer[] { 1, null })
1229 <        for (Integer v2 : new Integer[] { 2, null }) {
1126 <
1229 >    {
1230          final CompletableFuture<Integer> f = new CompletableFuture<>();
1231 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1232 <        final FailingBiFunction r = new FailingBiFunction();
1233 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1234 <
1235 <        f.complete(v1);
1236 <        checkIncomplete(h);
1237 <        g.complete(v2);
1231 >        final FailingFunction r = new FailingFunction(m);
1232 >        if (!createIncomplete) f.complete(v1);
1233 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1234 >        if (createIncomplete) {
1235 >            checkIncomplete(g);
1236 >            f.complete(v1);
1237 >        }
1238  
1239 <        checkCompletedWithWrappedCFException(h);
1239 >        checkCompletedWithWrappedCFException(g);
1240          checkCompletedNormally(f, v1);
1241 <        checkCompletedNormally(g, v2);
1139 <        }
1140 <    }
1241 >    }}
1242  
1243 <    public void testThenCombine_actionFailed2() {
1243 >    /**
1244 >     * thenAccept result completes normally after normal completion of source
1245 >     */
1246 >    public void testThenAccept_normalCompletion() {
1247          for (ExecutionMode m : ExecutionMode.values())
1248 +        for (boolean createIncomplete : new boolean[] { true, false })
1249          for (Integer v1 : new Integer[] { 1, null })
1250 <        for (Integer v2 : new Integer[] { 2, null }) {
1146 <
1250 >    {
1251          final CompletableFuture<Integer> f = new CompletableFuture<>();
1252 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1253 <        final FailingBiFunction r = new FailingBiFunction();
1254 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1255 <
1256 <        g.complete(v2);
1257 <        checkIncomplete(h);
1258 <        f.complete(v1);
1252 >        final IncAction r = new IncAction(m);
1253 >        if (!createIncomplete) f.complete(v1);
1254 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1255 >        if (createIncomplete) {
1256 >            checkIncomplete(g);
1257 >            f.complete(v1);
1258 >        }
1259  
1260 <        checkCompletedWithWrappedCFException(h);
1260 >        checkCompletedNormally(g, null);
1261          checkCompletedNormally(f, v1);
1262 <        checkCompletedNormally(g, v2);
1263 <        }
1264 <    }
1262 >        r.assertInvoked();
1263 >        r.assertValue(inc(v1));
1264 >    }}
1265  
1266      /**
1267 <     * thenCombine result completes exceptionally if either source cancelled
1267 >     * thenAccept result completes exceptionally after exceptional
1268 >     * completion of source
1269       */
1270 <    public void testThenCombine_sourceCancelled1() {
1270 >    public void testThenAccept_exceptionalCompletion() {
1271          for (ExecutionMode m : ExecutionMode.values())
1272 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1273 <        for (Integer v1 : new Integer[] { 1, null }) {
1274 <
1272 >        for (boolean createIncomplete : new boolean[] { true, false })
1273 >    {
1274 >        final CFException ex = new CFException();
1275          final CompletableFuture<Integer> f = new CompletableFuture<>();
1276 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1277 <        final SubtractFunction r = new SubtractFunction();
1278 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1279 <
1280 <        assertTrue(f.cancel(mayInterruptIfRunning));
1281 <        checkIncomplete(h);
1177 <        g.complete(v1);
1178 <
1179 <        checkCompletedWithWrappedCancellationException(h);
1180 <        checkCancelled(f);
1181 <        assertEquals(r.invocationCount, 0);
1182 <        checkCompletedNormally(g, v1);
1276 >        final IncAction r = new IncAction(m);
1277 >        if (!createIncomplete) f.completeExceptionally(ex);
1278 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1279 >        if (createIncomplete) {
1280 >            checkIncomplete(g);
1281 >            f.completeExceptionally(ex);
1282          }
1184    }
1185
1186    public void testThenCombine_sourceCancelled2() {
1187        for (ExecutionMode m : ExecutionMode.values())
1188        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1189        for (Integer v1 : new Integer[] { 1, null }) {
1190
1191        final CompletableFuture<Integer> f = new CompletableFuture<>();
1192        final CompletableFuture<Integer> g = new CompletableFuture<>();
1193        final SubtractFunction r = new SubtractFunction();
1194        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1195
1196        assertTrue(g.cancel(mayInterruptIfRunning));
1197        checkIncomplete(h);
1198        f.complete(v1);
1283  
1284 <        checkCompletedWithWrappedCancellationException(h);
1285 <        checkCancelled(g);
1286 <        assertEquals(r.invocationCount, 0);
1287 <        checkCompletedNormally(f, v1);
1204 <        }
1205 <    }
1284 >        checkCompletedWithWrappedCFException(g, ex);
1285 >        checkCompletedWithWrappedCFException(f, ex);
1286 >        r.assertNotInvoked();
1287 >    }}
1288  
1289 <    public void testThenCombine_sourceCancelled3() {
1289 >    /**
1290 >     * thenAccept result completes exceptionally if source cancelled
1291 >     */
1292 >    public void testThenAccept_sourceCancelled() {
1293          for (ExecutionMode m : ExecutionMode.values())
1294 +        for (boolean createIncomplete : new boolean[] { true, false })
1295          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1296 <        for (Integer v1 : new Integer[] { 1, null }) {
1211 <
1296 >    {
1297          final CompletableFuture<Integer> f = new CompletableFuture<>();
1298 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1299 <        final SubtractFunction r = new SubtractFunction();
1300 <
1301 <        assertTrue(g.cancel(mayInterruptIfRunning));
1302 <        f.complete(v1);
1303 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1219 <
1220 <        checkCompletedWithWrappedCancellationException(h);
1221 <        checkCancelled(g);
1222 <        assertEquals(r.invocationCount, 0);
1223 <        checkCompletedNormally(f, v1);
1298 >        final IncAction r = new IncAction(m);
1299 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1300 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1301 >        if (createIncomplete) {
1302 >            checkIncomplete(g);
1303 >            assertTrue(f.cancel(mayInterruptIfRunning));
1304          }
1225    }
1226
1227    public void testThenCombine_sourceCancelled4() {
1228        for (ExecutionMode m : ExecutionMode.values())
1229        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1230        for (Integer v1 : new Integer[] { 1, null }) {
1231
1232        final CompletableFuture<Integer> f = new CompletableFuture<>();
1233        final CompletableFuture<Integer> g = new CompletableFuture<>();
1234        final SubtractFunction r = new SubtractFunction();
1305  
1306 <        assertTrue(f.cancel(mayInterruptIfRunning));
1237 <        g.complete(v1);
1238 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1239 <
1240 <        checkCompletedWithWrappedCancellationException(h);
1306 >        checkCompletedWithWrappedCancellationException(g);
1307          checkCancelled(f);
1308 <        assertEquals(r.invocationCount, 0);
1309 <        checkCompletedNormally(g, v1);
1244 <        }
1245 <    }
1308 >        r.assertNotInvoked();
1309 >    }}
1310  
1311      /**
1312 <     * thenAcceptBoth result completes normally after normal
1249 <     * completion of sources
1312 >     * thenAccept result completes exceptionally if action does
1313       */
1314 <    public void testThenAcceptBoth_normalCompletion1() {
1314 >    public void testThenAccept_actionFailed() {
1315          for (ExecutionMode m : ExecutionMode.values())
1316 +        for (boolean createIncomplete : new boolean[] { true, false })
1317          for (Integer v1 : new Integer[] { 1, null })
1318 <        for (Integer v2 : new Integer[] { 2, null }) {
1255 <
1318 >    {
1319          final CompletableFuture<Integer> f = new CompletableFuture<>();
1320 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1321 <        final SubtractAction r = new SubtractAction();
1322 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1323 <
1324 <        f.complete(v1);
1325 <        checkIncomplete(h);
1263 <        assertFalse(r.ran());
1264 <        g.complete(v2);
1265 <
1266 <        checkCompletedNormally(h, null);
1267 <        assertEquals(r.value, subtract(v1, v2));
1268 <        checkCompletedNormally(f, v1);
1269 <        checkCompletedNormally(g, v2);
1320 >        final FailingConsumer r = new FailingConsumer(m);
1321 >        if (!createIncomplete) f.complete(v1);
1322 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1323 >        if (createIncomplete) {
1324 >            checkIncomplete(g);
1325 >            f.complete(v1);
1326          }
1271    }
1272
1273    public void testThenAcceptBoth_normalCompletion2() {
1274        for (ExecutionMode m : ExecutionMode.values())
1275        for (Integer v1 : new Integer[] { 1, null })
1276        for (Integer v2 : new Integer[] { 2, null }) {
1277
1278        final CompletableFuture<Integer> f = new CompletableFuture<>();
1279        final CompletableFuture<Integer> g = new CompletableFuture<>();
1280        final SubtractAction r = new SubtractAction();
1281        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1327  
1328 <        g.complete(v2);
1284 <        checkIncomplete(h);
1285 <        assertFalse(r.ran());
1286 <        f.complete(v1);
1287 <
1288 <        checkCompletedNormally(h, null);
1289 <        assertEquals(r.value, subtract(v1, v2));
1328 >        checkCompletedWithWrappedCFException(g);
1329          checkCompletedNormally(f, v1);
1330 <        checkCompletedNormally(g, v2);
1292 <        }
1293 <    }
1330 >    }}
1331  
1332 <    public void testThenAcceptBoth_normalCompletion3() {
1332 >    /**
1333 >     * thenCombine result completes normally after normal completion
1334 >     * of sources
1335 >     */
1336 >    public void testThenCombine_normalCompletion() {
1337          for (ExecutionMode m : ExecutionMode.values())
1338 +        for (boolean createIncomplete : new boolean[] { true, false })
1339 +        for (boolean fFirst : new boolean[] { true, false })
1340          for (Integer v1 : new Integer[] { 1, null })
1341 <        for (Integer v2 : new Integer[] { 2, null }) {
1342 <
1341 >        for (Integer v2 : new Integer[] { 2, null })
1342 >    {
1343          final CompletableFuture<Integer> f = new CompletableFuture<>();
1344          final CompletableFuture<Integer> g = new CompletableFuture<>();
1345 <        final SubtractAction r = new SubtractAction();
1345 >        final SubtractFunction r = new SubtractFunction(m);
1346  
1347 <        g.complete(v2);
1348 <        f.complete(v1);
1349 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1350 <
1351 <        checkCompletedNormally(h, null);
1352 <        assertEquals(r.value, subtract(v1, v2));
1353 <        checkCompletedNormally(f, v1);
1354 <        checkCompletedNormally(g, v2);
1347 >        if (fFirst) f.complete(v1); else g.complete(v2);
1348 >        if (!createIncomplete)
1349 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1350 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1351 >        if (createIncomplete) {
1352 >            checkIncomplete(h);
1353 >            r.assertNotInvoked();
1354 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1355          }
1313    }
1314
1315    public void testThenAcceptBoth_normalCompletion4() {
1316        for (ExecutionMode m : ExecutionMode.values())
1317        for (Integer v1 : new Integer[] { 1, null })
1318        for (Integer v2 : new Integer[] { 2, null }) {
1319
1320        final CompletableFuture<Integer> f = new CompletableFuture<>();
1321        final CompletableFuture<Integer> g = new CompletableFuture<>();
1322        final SubtractAction r = new SubtractAction();
1356  
1357 <        f.complete(v1);
1325 <        g.complete(v2);
1326 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1327 <
1328 <        checkCompletedNormally(h, null);
1329 <        assertEquals(r.value, subtract(v1, v2));
1357 >        checkCompletedNormally(h, subtract(v1, v2));
1358          checkCompletedNormally(f, v1);
1359          checkCompletedNormally(g, v2);
1360 <        }
1361 <    }
1360 >        r.assertInvoked();
1361 >    }}
1362  
1363      /**
1364 <     * thenAcceptBoth result completes exceptionally after exceptional
1364 >     * thenCombine result completes exceptionally after exceptional
1365       * completion of either source
1366       */
1367 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1367 >    public void testThenCombine_exceptionalCompletion() {
1368          for (ExecutionMode m : ExecutionMode.values())
1369 <        for (Integer v1 : new Integer[] { 1, null }) {
1370 <
1369 >        for (boolean createIncomplete : new boolean[] { true, false })
1370 >        for (boolean fFirst : new boolean[] { true, false })
1371 >        for (Integer v1 : new Integer[] { 1, null })
1372 >    {
1373          final CompletableFuture<Integer> f = new CompletableFuture<>();
1374          final CompletableFuture<Integer> g = new CompletableFuture<>();
1345        final SubtractAction r = new SubtractAction();
1346        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1375          final CFException ex = new CFException();
1376 +        final SubtractFunction r = new SubtractFunction(m);
1377  
1378 <        f.completeExceptionally(ex);
1379 <        checkIncomplete(h);
1380 <        g.complete(v1);
1381 <
1382 <        checkCompletedWithWrappedCFException(h, ex);
1383 <        checkCompletedWithWrappedCFException(f, ex);
1384 <        assertEquals(r.invocationCount, 0);
1356 <        checkCompletedNormally(g, v1);
1378 >        (fFirst ? f : g).complete(v1);
1379 >        if (!createIncomplete)
1380 >            (!fFirst ? f : g).completeExceptionally(ex);
1381 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1382 >        if (createIncomplete) {
1383 >            checkIncomplete(h);
1384 >            (!fFirst ? f : g).completeExceptionally(ex);
1385          }
1358    }
1359
1360    public void testThenAcceptBoth_exceptionalCompletion2() {
1361        for (ExecutionMode m : ExecutionMode.values())
1362        for (Integer v1 : new Integer[] { 1, null }) {
1363
1364        final CompletableFuture<Integer> f = new CompletableFuture<>();
1365        final CompletableFuture<Integer> g = new CompletableFuture<>();
1366        final SubtractAction r = new SubtractAction();
1367        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1368        final CFException ex = new CFException();
1369
1370        g.completeExceptionally(ex);
1371        checkIncomplete(h);
1372        f.complete(v1);
1386  
1387          checkCompletedWithWrappedCFException(h, ex);
1388 <        checkCompletedWithWrappedCFException(g, ex);
1389 <        assertEquals(r.invocationCount, 0);
1390 <        checkCompletedNormally(f, v1);
1391 <        }
1379 <    }
1388 >        r.assertNotInvoked();
1389 >        checkCompletedNormally(fFirst ? f : g, v1);
1390 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1391 >    }}
1392  
1393 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1393 >    /**
1394 >     * thenCombine result completes exceptionally if either source cancelled
1395 >     */
1396 >    public void testThenCombine_sourceCancelled() {
1397          for (ExecutionMode m : ExecutionMode.values())
1398 <        for (Integer v1 : new Integer[] { 1, null }) {
1399 <
1398 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1399 >        for (boolean createIncomplete : new boolean[] { true, false })
1400 >        for (boolean fFirst : new boolean[] { true, false })
1401 >        for (Integer v1 : new Integer[] { 1, null })
1402 >    {
1403          final CompletableFuture<Integer> f = new CompletableFuture<>();
1404          final CompletableFuture<Integer> g = new CompletableFuture<>();
1405 <        final SubtractAction r = new SubtractAction();
1388 <        final CFException ex = new CFException();
1405 >        final SubtractFunction r = new SubtractFunction(m);
1406  
1407 <        g.completeExceptionally(ex);
1408 <        f.complete(v1);
1409 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1410 <
1411 <        checkCompletedWithWrappedCFException(h, ex);
1412 <        checkCompletedWithWrappedCFException(g, ex);
1413 <        assertEquals(r.invocationCount, 0);
1397 <        checkCompletedNormally(f, v1);
1407 >        (fFirst ? f : g).complete(v1);
1408 >        if (!createIncomplete)
1409 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1410 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1411 >        if (createIncomplete) {
1412 >            checkIncomplete(h);
1413 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1414          }
1399    }
1400
1401    public void testThenAcceptBoth_exceptionalCompletion4() {
1402        for (ExecutionMode m : ExecutionMode.values())
1403        for (Integer v1 : new Integer[] { 1, null }) {
1404
1405        final CompletableFuture<Integer> f = new CompletableFuture<>();
1406        final CompletableFuture<Integer> g = new CompletableFuture<>();
1407        final SubtractAction r = new SubtractAction();
1408        final CFException ex = new CFException();
1415  
1416 <        f.completeExceptionally(ex);
1417 <        g.complete(v1);
1418 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1419 <
1420 <        checkCompletedWithWrappedCFException(h, ex);
1415 <        checkCompletedWithWrappedCFException(f, ex);
1416 <        assertFalse(r.ran());
1417 <        checkCompletedNormally(g, v1);
1418 <        }
1419 <    }
1416 >        checkCompletedWithWrappedCancellationException(h);
1417 >        checkCancelled(!fFirst ? f : g);
1418 >        r.assertNotInvoked();
1419 >        checkCompletedNormally(fFirst ? f : g, v1);
1420 >    }}
1421  
1422      /**
1423 <     * thenAcceptBoth result completes exceptionally if action does
1423 >     * thenCombine result completes exceptionally if action does
1424       */
1425 <    public void testThenAcceptBoth_actionFailed1() {
1425 >    public void testThenCombine_actionFailed() {
1426          for (ExecutionMode m : ExecutionMode.values())
1427 +        for (boolean fFirst : new boolean[] { true, false })
1428          for (Integer v1 : new Integer[] { 1, null })
1429 <        for (Integer v2 : new Integer[] { 2, null }) {
1430 <
1429 >        for (Integer v2 : new Integer[] { 2, null })
1430 >    {
1431          final CompletableFuture<Integer> f = new CompletableFuture<>();
1432          final CompletableFuture<Integer> g = new CompletableFuture<>();
1433 <        final FailingBiConsumer r = new FailingBiConsumer();
1434 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1433 >        final FailingBiFunction r = new FailingBiFunction(m);
1434 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1435  
1436 <        f.complete(v1);
1437 <        checkIncomplete(h);
1438 <        g.complete(v2);
1436 >        if (fFirst) {
1437 >            f.complete(v1);
1438 >            g.complete(v2);
1439 >        } else {
1440 >            g.complete(v2);
1441 >            f.complete(v1);
1442 >        }
1443  
1444          checkCompletedWithWrappedCFException(h);
1445          checkCompletedNormally(f, v1);
1446          checkCompletedNormally(g, v2);
1447 <        }
1442 <    }
1447 >    }}
1448  
1449 <    public void testThenAcceptBoth_actionFailed2() {
1449 >    /**
1450 >     * thenAcceptBoth result completes normally after normal
1451 >     * completion of sources
1452 >     */
1453 >    public void testThenAcceptBoth_normalCompletion() {
1454          for (ExecutionMode m : ExecutionMode.values())
1455 +        for (boolean createIncomplete : new boolean[] { true, false })
1456 +        for (boolean fFirst : new boolean[] { true, false })
1457          for (Integer v1 : new Integer[] { 1, null })
1458 <        for (Integer v2 : new Integer[] { 2, null }) {
1459 <
1458 >        for (Integer v2 : new Integer[] { 2, null })
1459 >    {
1460          final CompletableFuture<Integer> f = new CompletableFuture<>();
1461          final CompletableFuture<Integer> g = new CompletableFuture<>();
1462 <        final FailingBiConsumer r = new FailingBiConsumer();
1452 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1462 >        final SubtractAction r = new SubtractAction(m);
1463  
1464 <        g.complete(v2);
1465 <        checkIncomplete(h);
1466 <        f.complete(v1);
1464 >        if (fFirst) f.complete(v1); else g.complete(v2);
1465 >        if (!createIncomplete)
1466 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1467 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1468 >        if (createIncomplete) {
1469 >            checkIncomplete(h);
1470 >            r.assertNotInvoked();
1471 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1472 >        }
1473  
1474 <        checkCompletedWithWrappedCFException(h);
1474 >        checkCompletedNormally(h, null);
1475 >        r.assertValue(subtract(v1, v2));
1476          checkCompletedNormally(f, v1);
1477          checkCompletedNormally(g, v2);
1478 <        }
1462 <    }
1478 >    }}
1479  
1480      /**
1481 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1481 >     * thenAcceptBoth result completes exceptionally after exceptional
1482 >     * completion of either source
1483       */
1484 <    public void testThenAcceptBoth_sourceCancelled1() {
1484 >    public void testThenAcceptBoth_exceptionalCompletion() {
1485          for (ExecutionMode m : ExecutionMode.values())
1486 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1487 <        for (Integer v1 : new Integer[] { 1, null }) {
1488 <
1486 >        for (boolean createIncomplete : new boolean[] { true, false })
1487 >        for (boolean fFirst : new boolean[] { true, false })
1488 >        for (Integer v1 : new Integer[] { 1, null })
1489 >    {
1490          final CompletableFuture<Integer> f = new CompletableFuture<>();
1491          final CompletableFuture<Integer> g = new CompletableFuture<>();
1492 <        final SubtractAction r = new SubtractAction();
1493 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1476 <
1477 <        assertTrue(f.cancel(mayInterruptIfRunning));
1478 <        checkIncomplete(h);
1479 <        g.complete(v1);
1480 <
1481 <        checkCompletedWithWrappedCancellationException(h);
1482 <        checkCancelled(f);
1483 <        assertEquals(r.invocationCount, 0);
1484 <        checkCompletedNormally(g, v1);
1485 <        }
1486 <    }
1487 <
1488 <    public void testThenAcceptBoth_sourceCancelled2() {
1489 <        for (ExecutionMode m : ExecutionMode.values())
1490 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1491 <        for (Integer v1 : new Integer[] { 1, null }) {
1492 >        final CFException ex = new CFException();
1493 >        final SubtractAction r = new SubtractAction(m);
1494  
1495 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1496 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1497 <        final SubtractAction r = new SubtractAction();
1495 >        (fFirst ? f : g).complete(v1);
1496 >        if (!createIncomplete)
1497 >            (!fFirst ? f : g).completeExceptionally(ex);
1498          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1499 <
1500 <        assertTrue(g.cancel(mayInterruptIfRunning));
1501 <        checkIncomplete(h);
1500 <        f.complete(v1);
1501 <
1502 <        checkCompletedWithWrappedCancellationException(h);
1503 <        checkCancelled(g);
1504 <        assertEquals(r.invocationCount, 0);
1505 <        checkCompletedNormally(f, v1);
1499 >        if (createIncomplete) {
1500 >            checkIncomplete(h);
1501 >            (!fFirst ? f : g).completeExceptionally(ex);
1502          }
1507    }
1503  
1504 <    public void testThenAcceptBoth_sourceCancelled3() {
1505 <        for (ExecutionMode m : ExecutionMode.values())
1506 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1507 <        for (Integer v1 : new Integer[] { 1, null }) {
1508 <
1514 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1515 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1516 <        final SubtractAction r = new SubtractAction();
1517 <
1518 <        assertTrue(g.cancel(mayInterruptIfRunning));
1519 <        f.complete(v1);
1520 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1521 <
1522 <        checkCompletedWithWrappedCancellationException(h);
1523 <        checkCancelled(g);
1524 <        assertEquals(r.invocationCount, 0);
1525 <        checkCompletedNormally(f, v1);
1526 <        }
1527 <    }
1504 >        checkCompletedWithWrappedCFException(h, ex);
1505 >        r.assertNotInvoked();
1506 >        checkCompletedNormally(fFirst ? f : g, v1);
1507 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1508 >    }}
1509  
1510 <    public void testThenAcceptBoth_sourceCancelled4() {
1510 >    /**
1511 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1512 >     */
1513 >    public void testThenAcceptBoth_sourceCancelled() {
1514          for (ExecutionMode m : ExecutionMode.values())
1515          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1516 <        for (Integer v1 : new Integer[] { 1, null }) {
1517 <
1516 >        for (boolean createIncomplete : new boolean[] { true, false })
1517 >        for (boolean fFirst : new boolean[] { true, false })
1518 >        for (Integer v1 : new Integer[] { 1, null })
1519 >    {
1520          final CompletableFuture<Integer> f = new CompletableFuture<>();
1521          final CompletableFuture<Integer> g = new CompletableFuture<>();
1522 <        final SubtractAction r = new SubtractAction();
1522 >        final SubtractAction r = new SubtractAction(m);
1523  
1524 <        assertTrue(f.cancel(mayInterruptIfRunning));
1525 <        g.complete(v1);
1524 >        (fFirst ? f : g).complete(v1);
1525 >        if (!createIncomplete)
1526 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1527          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1528 +        if (createIncomplete) {
1529 +            checkIncomplete(h);
1530 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1531 +        }
1532  
1533          checkCompletedWithWrappedCancellationException(h);
1534 <        checkCancelled(f);
1535 <        assertEquals(r.invocationCount, 0);
1536 <        checkCompletedNormally(g, v1);
1537 <        }
1547 <    }
1534 >        checkCancelled(!fFirst ? f : g);
1535 >        r.assertNotInvoked();
1536 >        checkCompletedNormally(fFirst ? f : g, v1);
1537 >    }}
1538  
1539      /**
1540 <     * runAfterBoth result completes normally after normal
1551 <     * completion of sources
1540 >     * thenAcceptBoth result completes exceptionally if action does
1541       */
1542 <    public void testRunAfterBoth_normalCompletion1() {
1542 >    public void testThenAcceptBoth_actionFailed() {
1543          for (ExecutionMode m : ExecutionMode.values())
1544 +        for (boolean fFirst : new boolean[] { true, false })
1545          for (Integer v1 : new Integer[] { 1, null })
1546 <        for (Integer v2 : new Integer[] { 2, null }) {
1547 <
1546 >        for (Integer v2 : new Integer[] { 2, null })
1547 >    {
1548          final CompletableFuture<Integer> f = new CompletableFuture<>();
1549          final CompletableFuture<Integer> g = new CompletableFuture<>();
1550 <        final Noop r = new Noop();
1551 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1562 <
1563 <        f.complete(v1);
1564 <        checkIncomplete(h);
1565 <        assertFalse(r.ran);
1566 <        g.complete(v2);
1550 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1551 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1552  
1553 <        checkCompletedNormally(h, null);
1554 <        assertEquals(r.invocationCount, 1);
1555 <        checkCompletedNormally(f, v1);
1556 <        checkCompletedNormally(g, v2);
1553 >        if (fFirst) {
1554 >            f.complete(v1);
1555 >            g.complete(v2);
1556 >        } else {
1557 >            g.complete(v2);
1558 >            f.complete(v1);
1559          }
1573    }
1574
1575    public void testRunAfterBoth_normalCompletion2() {
1576        for (ExecutionMode m : ExecutionMode.values())
1577        for (Integer v1 : new Integer[] { 1, null })
1578        for (Integer v2 : new Integer[] { 2, null }) {
1560  
1561 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1581 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1582 <        final Noop r = new Noop();
1583 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 <
1585 <        g.complete(v2);
1586 <        checkIncomplete(h);
1587 <        assertFalse(r.ran);
1588 <        f.complete(v1);
1589 <
1590 <        checkCompletedNormally(h, null);
1591 <        assertEquals(r.invocationCount, 1);
1561 >        checkCompletedWithWrappedCFException(h);
1562          checkCompletedNormally(f, v1);
1563          checkCompletedNormally(g, v2);
1564 <        }
1595 <    }
1564 >    }}
1565  
1566 <    public void testRunAfterBoth_normalCompletion3() {
1566 >    /**
1567 >     * runAfterBoth result completes normally after normal
1568 >     * completion of sources
1569 >     */
1570 >    public void testRunAfterBoth_normalCompletion() {
1571          for (ExecutionMode m : ExecutionMode.values())
1572 +        for (boolean createIncomplete : new boolean[] { true, false })
1573 +        for (boolean fFirst : new boolean[] { true, false })
1574          for (Integer v1 : new Integer[] { 1, null })
1575 <        for (Integer v2 : new Integer[] { 2, null }) {
1576 <
1575 >        for (Integer v2 : new Integer[] { 2, null })
1576 >    {
1577          final CompletableFuture<Integer> f = new CompletableFuture<>();
1578          final CompletableFuture<Integer> g = new CompletableFuture<>();
1579 <        final Noop r = new Noop();
1579 >        final Noop r = new Noop(m);
1580  
1581 <        g.complete(v2);
1582 <        f.complete(v1);
1581 >        if (fFirst) f.complete(v1); else g.complete(v2);
1582 >        if (!createIncomplete)
1583 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1584          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1585 <
1586 <        checkCompletedNormally(h, null);
1587 <        assertTrue(r.ran);
1588 <        checkCompletedNormally(f, v1);
1613 <        checkCompletedNormally(g, v2);
1585 >        if (createIncomplete) {
1586 >            checkIncomplete(h);
1587 >            r.assertNotInvoked();
1588 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1589          }
1615    }
1616
1617    public void testRunAfterBoth_normalCompletion4() {
1618        for (ExecutionMode m : ExecutionMode.values())
1619        for (Integer v1 : new Integer[] { 1, null })
1620        for (Integer v2 : new Integer[] { 2, null }) {
1621
1622        final CompletableFuture<Integer> f = new CompletableFuture<>();
1623        final CompletableFuture<Integer> g = new CompletableFuture<>();
1624        final Noop r = new Noop();
1625
1626        f.complete(v1);
1627        g.complete(v2);
1628        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1590  
1591          checkCompletedNormally(h, null);
1592 <        assertEquals(r.invocationCount, 1);
1592 >        r.assertInvoked();
1593          checkCompletedNormally(f, v1);
1594          checkCompletedNormally(g, v2);
1595 <        }
1635 <    }
1595 >    }}
1596  
1597      /**
1598       * runAfterBoth result completes exceptionally after exceptional
1599       * completion of either source
1600       */
1601 <    public void testRunAfterBoth_exceptionalCompletion1() {
1601 >    public void testRunAfterBoth_exceptionalCompletion() {
1602          for (ExecutionMode m : ExecutionMode.values())
1603 <        for (Integer v1 : new Integer[] { 1, null }) {
1604 <
1605 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1606 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1647 <        final Noop r = new Noop();
1648 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1649 <        final CFException ex = new CFException();
1650 <
1651 <        f.completeExceptionally(ex);
1652 <        checkIncomplete(h);
1653 <        g.complete(v1);
1654 <
1655 <        checkCompletedWithWrappedCFException(h, ex);
1656 <        checkCompletedWithWrappedCFException(f, ex);
1657 <        assertEquals(r.invocationCount, 0);
1658 <        checkCompletedNormally(g, v1);
1659 <        }
1660 <    }
1661 <
1662 <    public void testRunAfterBoth_exceptionalCompletion2() {
1663 <        for (ExecutionMode m : ExecutionMode.values())
1664 <        for (Integer v1 : new Integer[] { 1, null }) {
1665 <
1666 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1667 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 <        final Noop r = new Noop();
1669 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670 <        final CFException ex = new CFException();
1671 <
1672 <        g.completeExceptionally(ex);
1673 <        checkIncomplete(h);
1674 <        f.complete(v1);
1675 <
1676 <        checkCompletedWithWrappedCFException(h, ex);
1677 <        checkCompletedWithWrappedCFException(g, ex);
1678 <        assertEquals(r.invocationCount, 0);
1679 <        checkCompletedNormally(f, v1);
1680 <        }
1681 <    }
1682 <
1683 <    public void testRunAfterBoth_exceptionalCompletion3() {
1684 <        for (ExecutionMode m : ExecutionMode.values())
1685 <        for (Integer v1 : new Integer[] { 1, null }) {
1686 <
1603 >        for (boolean createIncomplete : new boolean[] { true, false })
1604 >        for (boolean fFirst : new boolean[] { true, false })
1605 >        for (Integer v1 : new Integer[] { 1, null })
1606 >    {
1607          final CompletableFuture<Integer> f = new CompletableFuture<>();
1608          final CompletableFuture<Integer> g = new CompletableFuture<>();
1689        final Noop r = new Noop();
1609          final CFException ex = new CFException();
1610 +        final Noop r = new Noop(m);
1611  
1612 <        g.completeExceptionally(ex);
1613 <        f.complete(v1);
1612 >        (fFirst ? f : g).complete(v1);
1613 >        if (!createIncomplete)
1614 >            (!fFirst ? f : g).completeExceptionally(ex);
1615          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1616 <
1617 <        checkCompletedWithWrappedCFException(h, ex);
1618 <        checkCompletedWithWrappedCFException(g, ex);
1698 <        assertEquals(r.invocationCount, 0);
1699 <        checkCompletedNormally(f, v1);
1616 >        if (createIncomplete) {
1617 >            checkIncomplete(h);
1618 >            (!fFirst ? f : g).completeExceptionally(ex);
1619          }
1701    }
1702
1703    public void testRunAfterBoth_exceptionalCompletion4() {
1704        for (ExecutionMode m : ExecutionMode.values())
1705        for (Integer v1 : new Integer[] { 1, null }) {
1706
1707        final CompletableFuture<Integer> f = new CompletableFuture<>();
1708        final CompletableFuture<Integer> g = new CompletableFuture<>();
1709        final Noop r = new Noop();
1710        final CFException ex = new CFException();
1711
1712        f.completeExceptionally(ex);
1713        g.complete(v1);
1714        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1620  
1621          checkCompletedWithWrappedCFException(h, ex);
1622 <        checkCompletedWithWrappedCFException(f, ex);
1623 <        assertEquals(r.invocationCount, 0);
1624 <        checkCompletedNormally(g, v1);
1625 <        }
1721 <    }
1622 >        r.assertNotInvoked();
1623 >        checkCompletedNormally(fFirst ? f : g, v1);
1624 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1625 >    }}
1626  
1627      /**
1628 <     * runAfterBoth result completes exceptionally if action does
1628 >     * runAfterBoth result completes exceptionally if either source cancelled
1629       */
1630 <    public void testRunAfterBoth_actionFailed1() {
1630 >    public void testRunAfterBoth_sourceCancelled() {
1631          for (ExecutionMode m : ExecutionMode.values())
1632 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1633 +        for (boolean createIncomplete : new boolean[] { true, false })
1634 +        for (boolean fFirst : new boolean[] { true, false })
1635          for (Integer v1 : new Integer[] { 1, null })
1636 <        for (Integer v2 : new Integer[] { 2, null }) {
1730 <
1636 >    {
1637          final CompletableFuture<Integer> f = new CompletableFuture<>();
1638          final CompletableFuture<Integer> g = new CompletableFuture<>();
1639 <        final FailingNoop r = new FailingNoop();
1734 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1735 <
1736 <        f.complete(v1);
1737 <        checkIncomplete(h);
1738 <        g.complete(v2);
1739 <
1740 <        checkCompletedWithWrappedCFException(h);
1741 <        checkCompletedNormally(f, v1);
1742 <        checkCompletedNormally(g, v2);
1743 <        }
1744 <    }
1639 >        final Noop r = new Noop(m);
1640  
1746    public void testRunAfterBoth_actionFailed2() {
1747        for (ExecutionMode m : ExecutionMode.values())
1748        for (Integer v1 : new Integer[] { 1, null })
1749        for (Integer v2 : new Integer[] { 2, null }) {
1641  
1642 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1643 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1644 <        final FailingNoop r = new FailingNoop();
1642 >        (fFirst ? f : g).complete(v1);
1643 >        if (!createIncomplete)
1644 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1645          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1646 <
1647 <        g.complete(v2);
1648 <        checkIncomplete(h);
1758 <        f.complete(v1);
1759 <
1760 <        checkCompletedWithWrappedCFException(h);
1761 <        checkCompletedNormally(f, v1);
1762 <        checkCompletedNormally(g, v2);
1646 >        if (createIncomplete) {
1647 >            checkIncomplete(h);
1648 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1649          }
1764    }
1765
1766    /**
1767     * runAfterBoth result completes exceptionally if either source cancelled
1768     */
1769    public void testRunAfterBoth_sourceCancelled1() {
1770        for (ExecutionMode m : ExecutionMode.values())
1771        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1772        for (Integer v1 : new Integer[] { 1, null }) {
1773
1774        final CompletableFuture<Integer> f = new CompletableFuture<>();
1775        final CompletableFuture<Integer> g = new CompletableFuture<>();
1776        final Noop r = new Noop();
1777        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1778
1779        assertTrue(f.cancel(mayInterruptIfRunning));
1780        checkIncomplete(h);
1781        g.complete(v1);
1650  
1651          checkCompletedWithWrappedCancellationException(h);
1652 <        checkCancelled(f);
1653 <        assertEquals(r.invocationCount, 0);
1654 <        checkCompletedNormally(g, v1);
1655 <        }
1788 <    }
1652 >        checkCancelled(!fFirst ? f : g);
1653 >        r.assertNotInvoked();
1654 >        checkCompletedNormally(fFirst ? f : g, v1);
1655 >    }}
1656  
1657 <    public void testRunAfterBoth_sourceCancelled2() {
1657 >    /**
1658 >     * runAfterBoth result completes exceptionally if action does
1659 >     */
1660 >    public void testRunAfterBoth_actionFailed() {
1661          for (ExecutionMode m : ExecutionMode.values())
1662 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1663 <        for (Integer v1 : new Integer[] { 1, null }) {
1664 <
1662 >        for (boolean fFirst : new boolean[] { true, false })
1663 >        for (Integer v1 : new Integer[] { 1, null })
1664 >        for (Integer v2 : new Integer[] { 2, null })
1665 >    {
1666          final CompletableFuture<Integer> f = new CompletableFuture<>();
1667          final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 <        final Noop r = new Noop();
1669 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1668 >        final FailingRunnable r1 = new FailingRunnable(m);
1669 >        final FailingRunnable r2 = new FailingRunnable(m);
1670  
1671 <        assertTrue(g.cancel(mayInterruptIfRunning));
1672 <        checkIncomplete(h);
1673 <        f.complete(v1);
1674 <
1675 <        checkCompletedWithWrappedCancellationException(h);
1676 <        checkCancelled(g);
1677 <        assertEquals(r.invocationCount, 0);
1807 <        checkCompletedNormally(f, v1);
1671 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1672 >        if (fFirst) {
1673 >            f.complete(v1);
1674 >            g.complete(v2);
1675 >        } else {
1676 >            g.complete(v2);
1677 >            f.complete(v1);
1678          }
1679 <    }
1810 <
1811 <    public void testRunAfterBoth_sourceCancelled3() {
1812 <        for (ExecutionMode m : ExecutionMode.values())
1813 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1814 <        for (Integer v1 : new Integer[] { 1, null }) {
1815 <
1816 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1817 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1818 <        final Noop r = new Noop();
1679 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1680  
1681 <        assertTrue(g.cancel(mayInterruptIfRunning));
1682 <        f.complete(v1);
1822 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1823 <
1824 <        checkCompletedWithWrappedCancellationException(h);
1825 <        checkCancelled(g);
1826 <        assertEquals(r.invocationCount, 0);
1681 >        checkCompletedWithWrappedCFException(h1);
1682 >        checkCompletedWithWrappedCFException(h2);
1683          checkCompletedNormally(f, v1);
1684 <        }
1685 <    }
1830 <
1831 <    public void testRunAfterBoth_sourceCancelled4() {
1832 <        for (ExecutionMode m : ExecutionMode.values())
1833 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1834 <        for (Integer v1 : new Integer[] { 1, null }) {
1835 <
1836 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1837 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1838 <        final Noop r = new Noop();
1839 <
1840 <        assertTrue(f.cancel(mayInterruptIfRunning));
1841 <        g.complete(v1);
1842 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1843 <
1844 <        checkCompletedWithWrappedCancellationException(h);
1845 <        checkCancelled(f);
1846 <        assertEquals(r.invocationCount, 0);
1847 <        checkCompletedNormally(g, v1);
1848 <        }
1849 <    }
1684 >        checkCompletedNormally(g, v2);
1685 >    }}
1686  
1687      /**
1688       * applyToEither result completes normally after normal completion
1689       * of either source
1690       */
1691 <    public void testApplyToEither_normalCompletion1() {
1691 >    public void testApplyToEither_normalCompletion() {
1692          for (ExecutionMode m : ExecutionMode.values())
1693          for (Integer v1 : new Integer[] { 1, null })
1694 <        for (Integer v2 : new Integer[] { 2, null }) {
1695 <
1694 >        for (Integer v2 : new Integer[] { 2, null })
1695 >    {
1696          final CompletableFuture<Integer> f = new CompletableFuture<>();
1697          final CompletableFuture<Integer> g = new CompletableFuture<>();
1698 <        final IncFunction r = new IncFunction();
1699 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1698 >        final IncFunction[] rs = new IncFunction[6];
1699 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1700  
1701 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1702 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1703 +        checkIncomplete(h0);
1704 +        checkIncomplete(h1);
1705 +        rs[0].assertNotInvoked();
1706 +        rs[1].assertNotInvoked();
1707          f.complete(v1);
1708 <        checkCompletedNormally(h, inc(v1));
1709 <        g.complete(v2);
1710 <
1711 <        checkCompletedNormally(f, v1);
1712 <        checkCompletedNormally(g, v2);
1713 <        checkCompletedNormally(h, inc(v1));
1872 <        }
1873 <    }
1874 <
1875 <    public void testApplyToEither_normalCompletion2() {
1876 <        for (ExecutionMode m : ExecutionMode.values())
1877 <        for (Integer v1 : new Integer[] { 1, null })
1878 <        for (Integer v2 : new Integer[] { 2, null }) {
1879 <
1880 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1881 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1882 <        final IncFunction r = new IncFunction();
1883 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1884 <
1708 >        checkCompletedNormally(h0, inc(v1));
1709 >        checkCompletedNormally(h1, inc(v1));
1710 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1711 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1712 >        checkCompletedNormally(h2, inc(v1));
1713 >        checkCompletedNormally(h3, inc(v1));
1714          g.complete(v2);
1886        checkCompletedNormally(h, inc(v2));
1887        f.complete(v1);
1715  
1716 <        checkCompletedNormally(f, v1);
1717 <        checkCompletedNormally(g, v2);
1718 <        checkCompletedNormally(h, inc(v2));
1719 <        }
1720 <    }
1721 <    public void testApplyToEither_normalCompletion3() {
1722 <        for (ExecutionMode m : ExecutionMode.values())
1723 <        for (Integer v1 : new Integer[] { 1, null })
1724 <        for (Integer v2 : new Integer[] { 2, null }) {
1898 <
1899 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1900 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1901 <        final IncFunction r = new IncFunction();
1902 <
1903 <        f.complete(v1);
1904 <        g.complete(v2);
1905 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1716 >        // unspecified behavior - both source completions available
1717 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1718 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1719 >        rs[4].assertValue(h4.join());
1720 >        rs[5].assertValue(h5.join());
1721 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1722 >                   Objects.equals(inc(v2), h4.join()));
1723 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1724 >                   Objects.equals(inc(v2), h5.join()));
1725  
1726          checkCompletedNormally(f, v1);
1727          checkCompletedNormally(g, v2);
1728 <
1729 <        // unspecified behavior
1730 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1731 <                   Objects.equals(h.join(), inc(v2)));
1732 <        assertEquals(r.invocationCount, 1);
1733 <        }
1915 <    }
1728 >        checkCompletedNormally(h0, inc(v1));
1729 >        checkCompletedNormally(h1, inc(v1));
1730 >        checkCompletedNormally(h2, inc(v1));
1731 >        checkCompletedNormally(h3, inc(v1));
1732 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1733 >    }}
1734  
1735      /**
1736       * applyToEither result completes exceptionally after exceptional
1737       * completion of either source
1738       */
1739 <    public void testApplyToEither_exceptionalCompletion1() {
1739 >    public void testApplyToEither_exceptionalCompletion() {
1740          for (ExecutionMode m : ExecutionMode.values())
1741 <        for (Integer v1 : new Integer[] { 1, null }) {
1742 <
1741 >        for (Integer v1 : new Integer[] { 1, null })
1742 >    {
1743          final CompletableFuture<Integer> f = new CompletableFuture<>();
1744          final CompletableFuture<Integer> g = new CompletableFuture<>();
1927        final IncFunction r = new IncFunction();
1928        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1745          final CFException ex = new CFException();
1746 +        final IncFunction[] rs = new IncFunction[6];
1747 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1748  
1749 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1750 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1751 +        checkIncomplete(h0);
1752 +        checkIncomplete(h1);
1753 +        rs[0].assertNotInvoked();
1754 +        rs[1].assertNotInvoked();
1755          f.completeExceptionally(ex);
1756 <        checkCompletedWithWrappedCFException(h, ex);
1756 >        checkCompletedWithWrappedCFException(h0, ex);
1757 >        checkCompletedWithWrappedCFException(h1, ex);
1758 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1759 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1760 >        checkCompletedWithWrappedCFException(h2, ex);
1761 >        checkCompletedWithWrappedCFException(h3, ex);
1762          g.complete(v1);
1763  
1764 <        assertEquals(r.invocationCount, 0);
1765 <        checkCompletedNormally(g, v1);
1766 <        checkCompletedWithWrappedCFException(f, ex);
1938 <        checkCompletedWithWrappedCFException(h, ex);
1939 <        }
1940 <    }
1941 <
1942 <    public void testApplyToEither_exceptionalCompletion2() {
1943 <        for (ExecutionMode m : ExecutionMode.values())
1944 <        for (Integer v1 : new Integer[] { 1, null }) {
1945 <
1946 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1947 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1948 <        final IncFunction r = new IncFunction();
1949 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1950 <        final CFException ex = new CFException();
1951 <
1952 <        g.completeExceptionally(ex);
1953 <        checkCompletedWithWrappedCFException(h, ex);
1954 <        f.complete(v1);
1955 <
1956 <        assertEquals(r.invocationCount, 0);
1957 <        checkCompletedNormally(f, v1);
1958 <        checkCompletedWithWrappedCFException(g, ex);
1959 <        checkCompletedWithWrappedCFException(h, ex);
1960 <        }
1961 <    }
1962 <
1963 <    public void testApplyToEither_exceptionalCompletion3() {
1964 <        for (ExecutionMode m : ExecutionMode.values())
1965 <        for (Integer v1 : new Integer[] { 1, null }) {
1966 <
1967 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1968 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1969 <        final IncFunction r = new IncFunction();
1970 <        final CFException ex = new CFException();
1971 <
1972 <        g.completeExceptionally(ex);
1973 <        f.complete(v1);
1974 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1975 <
1976 <        // unspecified behavior
1977 <        Integer v;
1764 >        // unspecified behavior - both source completions available
1765 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1766 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1767          try {
1768 <            assertEquals(h.join(), inc(v1));
1769 <            assertEquals(r.invocationCount, 1);
1768 >            assertEquals(inc(v1), h4.join());
1769 >            rs[4].assertInvoked();
1770          } catch (CompletionException ok) {
1771 <            checkCompletedWithWrappedCFException(h, ex);
1772 <            assertEquals(r.invocationCount, 0);
1984 <        }
1985 <
1986 <        checkCompletedWithWrappedCFException(g, ex);
1987 <        checkCompletedNormally(f, v1);
1771 >            checkCompletedWithWrappedCFException(h4, ex);
1772 >            rs[4].assertNotInvoked();
1773          }
1989    }
1990
1991    public void testApplyToEither_exceptionalCompletion4() {
1992        for (ExecutionMode m : ExecutionMode.values())
1993        for (Integer v1 : new Integer[] { 1, null }) {
1994
1995        final CompletableFuture<Integer> f = new CompletableFuture<>();
1996        final CompletableFuture<Integer> g = new CompletableFuture<>();
1997        final IncFunction r = new IncFunction();
1998        final CFException ex = new CFException();
1999
2000        f.completeExceptionally(ex);
2001        g.complete(v1);
2002        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2003
2004        // unspecified behavior
2005        Integer v;
1774          try {
1775 <            assertEquals(h.join(), inc(v1));
1776 <            assertEquals(r.invocationCount, 1);
1775 >            assertEquals(inc(v1), h5.join());
1776 >            rs[5].assertInvoked();
1777          } catch (CompletionException ok) {
1778 <            checkCompletedWithWrappedCFException(h, ex);
1779 <            assertEquals(r.invocationCount, 0);
1778 >            checkCompletedWithWrappedCFException(h5, ex);
1779 >            rs[5].assertNotInvoked();
1780          }
1781  
1782          checkCompletedWithWrappedCFException(f, ex);
1783          checkCompletedNormally(g, v1);
1784 <        }
1785 <    }
1786 <
1787 <    /**
1788 <     * applyToEither result completes exceptionally if action does
1789 <     */
1790 <    public void testApplyToEither_actionFailed1() {
2023 <        for (ExecutionMode m : ExecutionMode.values())
2024 <        for (Integer v1 : new Integer[] { 1, null })
2025 <        for (Integer v2 : new Integer[] { 2, null }) {
2026 <
2027 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2028 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2029 <        final FailingFunction r = new FailingFunction();
2030 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2031 <
2032 <        f.complete(v1);
2033 <        checkCompletedWithWrappedCFException(h);
2034 <        g.complete(v2);
2035 <        checkCompletedNormally(f, v1);
2036 <        checkCompletedNormally(g, v2);
2037 <        }
2038 <    }
2039 <
2040 <    public void testApplyToEither_actionFailed2() {
2041 <        for (ExecutionMode m : ExecutionMode.values())
2042 <        for (Integer v1 : new Integer[] { 1, null })
2043 <        for (Integer v2 : new Integer[] { 2, null }) {
2044 <
2045 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2046 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2047 <        final FailingFunction r = new FailingFunction();
2048 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2049 <
2050 <        g.complete(v2);
2051 <        checkCompletedWithWrappedCFException(h);
2052 <        f.complete(v1);
2053 <        checkCompletedNormally(f, v1);
2054 <        checkCompletedNormally(g, v2);
2055 <        }
2056 <    }
1784 >        checkCompletedWithWrappedCFException(h0, ex);
1785 >        checkCompletedWithWrappedCFException(h1, ex);
1786 >        checkCompletedWithWrappedCFException(h2, ex);
1787 >        checkCompletedWithWrappedCFException(h3, ex);
1788 >        checkCompletedWithWrappedCFException(h4, ex);
1789 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1790 >    }}
1791  
1792      /**
1793       * applyToEither result completes exceptionally if either source cancelled
1794       */
1795 <    public void testApplyToEither_sourceCancelled1() {
1795 >    public void testApplyToEither_sourceCancelled() {
1796          for (ExecutionMode m : ExecutionMode.values())
1797          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1798 <        for (Integer v1 : new Integer[] { 1, null }) {
1799 <
1798 >        for (Integer v1 : new Integer[] { 1, null })
1799 >    {
1800          final CompletableFuture<Integer> f = new CompletableFuture<>();
1801          final CompletableFuture<Integer> g = new CompletableFuture<>();
1802 <        final IncFunction r = new IncFunction();
1803 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1802 >        final IncFunction[] rs = new IncFunction[6];
1803 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1804  
1805 <        assertTrue(f.cancel(mayInterruptIfRunning));
1806 <        checkCompletedWithWrappedCancellationException(h);
1805 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1806 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1807 >        checkIncomplete(h0);
1808 >        checkIncomplete(h1);
1809 >        rs[0].assertNotInvoked();
1810 >        rs[1].assertNotInvoked();
1811 >        f.cancel(mayInterruptIfRunning);
1812 >        checkCompletedWithWrappedCancellationException(h0);
1813 >        checkCompletedWithWrappedCancellationException(h1);
1814 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1815 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1816 >        checkCompletedWithWrappedCancellationException(h2);
1817 >        checkCompletedWithWrappedCancellationException(h3);
1818          g.complete(v1);
1819  
1820 <        checkCancelled(f);
1821 <        assertEquals(r.invocationCount, 0);
1822 <        checkCompletedNormally(g, v1);
2078 <        checkCompletedWithWrappedCancellationException(h);
2079 <        }
2080 <    }
2081 <
2082 <    public void testApplyToEither_sourceCancelled2() {
2083 <        for (ExecutionMode m : ExecutionMode.values())
2084 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2085 <        for (Integer v1 : new Integer[] { 1, null }) {
2086 <
2087 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2088 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2089 <        final IncFunction r = new IncFunction();
2090 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2091 <
2092 <        assertTrue(g.cancel(mayInterruptIfRunning));
2093 <        checkCompletedWithWrappedCancellationException(h);
2094 <        f.complete(v1);
2095 <
2096 <        checkCancelled(g);
2097 <        assertEquals(r.invocationCount, 0);
2098 <        checkCompletedNormally(f, v1);
2099 <        checkCompletedWithWrappedCancellationException(h);
2100 <        }
2101 <    }
2102 <
2103 <    public void testApplyToEither_sourceCancelled3() {
2104 <        for (ExecutionMode m : ExecutionMode.values())
2105 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2106 <        for (Integer v1 : new Integer[] { 1, null }) {
2107 <
2108 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2109 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2110 <        final IncFunction r = new IncFunction();
2111 <
2112 <        assertTrue(g.cancel(mayInterruptIfRunning));
2113 <        f.complete(v1);
2114 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2115 <
2116 <        // unspecified behavior
2117 <        Integer v;
1820 >        // unspecified behavior - both source completions available
1821 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1822 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1823          try {
1824 <            assertEquals(h.join(), inc(v1));
1825 <            assertEquals(r.invocationCount, 1);
1824 >            assertEquals(inc(v1), h4.join());
1825 >            rs[4].assertInvoked();
1826          } catch (CompletionException ok) {
1827 <            checkCompletedWithWrappedCancellationException(h);
1828 <            assertEquals(r.invocationCount, 0);
2124 <        }
2125 <
2126 <        checkCancelled(g);
2127 <        checkCompletedNormally(f, v1);
1827 >            checkCompletedWithWrappedCancellationException(h4);
1828 >            rs[4].assertNotInvoked();
1829          }
2129    }
2130
2131    public void testApplyToEither_sourceCancelled4() {
2132        for (ExecutionMode m : ExecutionMode.values())
2133        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2134        for (Integer v1 : new Integer[] { 1, null }) {
2135
2136        final CompletableFuture<Integer> f = new CompletableFuture<>();
2137        final CompletableFuture<Integer> g = new CompletableFuture<>();
2138        final IncFunction r = new IncFunction();
2139
2140        assertTrue(f.cancel(mayInterruptIfRunning));
2141        g.complete(v1);
2142        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2143
2144        // unspecified behavior
2145        Integer v;
1830          try {
1831 <            assertEquals(h.join(), inc(v1));
1832 <            assertEquals(r.invocationCount, 1);
1831 >            assertEquals(inc(v1), h5.join());
1832 >            rs[5].assertInvoked();
1833          } catch (CompletionException ok) {
1834 <            checkCompletedWithWrappedCancellationException(h);
1835 <            assertEquals(r.invocationCount, 0);
1834 >            checkCompletedWithWrappedCancellationException(h5);
1835 >            rs[5].assertNotInvoked();
1836          }
1837  
1838          checkCancelled(f);
1839          checkCompletedNormally(g, v1);
1840 <        }
1841 <    }
1840 >        checkCompletedWithWrappedCancellationException(h0);
1841 >        checkCompletedWithWrappedCancellationException(h1);
1842 >        checkCompletedWithWrappedCancellationException(h2);
1843 >        checkCompletedWithWrappedCancellationException(h3);
1844 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1845 >    }}
1846  
1847      /**
1848 <     * acceptEither result completes normally after normal completion
2161 <     * of either source
1848 >     * applyToEither result completes exceptionally if action does
1849       */
1850 <    public void testAcceptEither_normalCompletion1() {
1850 >    public void testApplyToEither_actionFailed() {
1851          for (ExecutionMode m : ExecutionMode.values())
1852          for (Integer v1 : new Integer[] { 1, null })
1853 <        for (Integer v2 : new Integer[] { 2, null }) {
1854 <
1853 >        for (Integer v2 : new Integer[] { 2, null })
1854 >    {
1855          final CompletableFuture<Integer> f = new CompletableFuture<>();
1856          final CompletableFuture<Integer> g = new CompletableFuture<>();
1857 <        final IncAction r = new IncAction();
1858 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1857 >        final FailingFunction[] rs = new FailingFunction[6];
1858 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1859  
1860 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1861 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1862          f.complete(v1);
1863 <        checkCompletedNormally(h, null);
1864 <        assertEquals(r.value, inc(v1));
1865 <        g.complete(v2);
1863 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1864 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1865 >        checkCompletedWithWrappedCFException(h0);
1866 >        checkCompletedWithWrappedCFException(h1);
1867 >        checkCompletedWithWrappedCFException(h2);
1868 >        checkCompletedWithWrappedCFException(h3);
1869 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1870  
1871 <        checkCompletedNormally(f, v1);
2179 <        checkCompletedNormally(g, v2);
2180 <        checkCompletedNormally(h, null);
2181 <        }
2182 <    }
2183 <
2184 <    public void testAcceptEither_normalCompletion2() {
2185 <        for (ExecutionMode m : ExecutionMode.values())
2186 <        for (Integer v1 : new Integer[] { 1, null })
2187 <        for (Integer v2 : new Integer[] { 2, null }) {
1871 >        g.complete(v2);
1872  
1873 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1874 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1875 <        final IncAction r = new IncAction();
2192 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1873 >        // unspecified behavior - both source completions available
1874 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1875 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1876  
1877 <        g.complete(v2);
1878 <        checkCompletedNormally(h, null);
1879 <        assertEquals(r.value, inc(v2));
1880 <        f.complete(v1);
1877 >        checkCompletedWithWrappedCFException(h4);
1878 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1879 >                   Objects.equals(v2, rs[4].value));
1880 >        checkCompletedWithWrappedCFException(h5);
1881 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1882 >                   Objects.equals(v2, rs[5].value));
1883  
1884          checkCompletedNormally(f, v1);
1885          checkCompletedNormally(g, v2);
1886 <        checkCompletedNormally(h, null);
1887 <        }
1888 <    }
1889 <    public void testAcceptEither_normalCompletion3() {
1886 >    }}
1887 >
1888 >    /**
1889 >     * acceptEither result completes normally after normal completion
1890 >     * of either source
1891 >     */
1892 >    public void testAcceptEither_normalCompletion() {
1893          for (ExecutionMode m : ExecutionMode.values())
1894          for (Integer v1 : new Integer[] { 1, null })
1895 <        for (Integer v2 : new Integer[] { 2, null }) {
1896 <
1895 >        for (Integer v2 : new Integer[] { 2, null })
1896 >    {
1897          final CompletableFuture<Integer> f = new CompletableFuture<>();
1898          final CompletableFuture<Integer> g = new CompletableFuture<>();
1899 <        final IncAction r = new IncAction();
1900 <
1901 <        f.complete(v1);
1902 <        g.complete(v2);
1903 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1899 >        final IncAction[] rs = new IncAction[6];
1900 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
1901 >
1902 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1903 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1904 >        checkIncomplete(h0);
1905 >        checkIncomplete(h1);
1906 >        rs[0].assertNotInvoked();
1907 >        rs[1].assertNotInvoked();
1908 >        f.complete(v1);
1909 >        checkCompletedNormally(h0, null);
1910 >        checkCompletedNormally(h1, null);
1911 >        rs[0].assertValue(inc(v1));
1912 >        rs[1].assertValue(inc(v1));
1913 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1914 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1915 >        checkCompletedNormally(h2, null);
1916 >        checkCompletedNormally(h3, null);
1917 >        rs[2].assertValue(inc(v1));
1918 >        rs[3].assertValue(inc(v1));
1919 >        g.complete(v2);
1920 >
1921 >        // unspecified behavior - both source completions available
1922 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1923 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1924 >        checkCompletedNormally(h4, null);
1925 >        checkCompletedNormally(h5, null);
1926 >        assertTrue(Objects.equals(inc(v1), rs[4].value) ||
1927 >                   Objects.equals(inc(v2), rs[4].value));
1928 >        assertTrue(Objects.equals(inc(v1), rs[5].value) ||
1929 >                   Objects.equals(inc(v2), rs[5].value));
1930  
2217        checkCompletedNormally(h, null);
1931          checkCompletedNormally(f, v1);
1932          checkCompletedNormally(g, v2);
1933 <
1934 <        // unspecified behavior
1935 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
1936 <                   Objects.equals(r.value, inc(v2)));
1937 <        }
1938 <    }
1933 >        checkCompletedNormally(h0, null);
1934 >        checkCompletedNormally(h1, null);
1935 >        checkCompletedNormally(h2, null);
1936 >        checkCompletedNormally(h3, null);
1937 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1938 >    }}
1939  
1940      /**
1941       * acceptEither result completes exceptionally after exceptional
1942       * completion of either source
1943       */
1944 <    public void testAcceptEither_exceptionalCompletion1() {
1944 >    public void testAcceptEither_exceptionalCompletion() {
1945          for (ExecutionMode m : ExecutionMode.values())
1946 <        for (Integer v1 : new Integer[] { 1, null }) {
1947 <
1946 >        for (Integer v1 : new Integer[] { 1, null })
1947 >    {
1948          final CompletableFuture<Integer> f = new CompletableFuture<>();
1949          final CompletableFuture<Integer> g = new CompletableFuture<>();
2237        final IncAction r = new IncAction();
2238        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1950          final CFException ex = new CFException();
1951 +        final IncAction[] rs = new IncAction[6];
1952 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
1953  
1954 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1955 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1956 +        checkIncomplete(h0);
1957 +        checkIncomplete(h1);
1958 +        rs[0].assertNotInvoked();
1959 +        rs[1].assertNotInvoked();
1960          f.completeExceptionally(ex);
1961 <        checkCompletedWithWrappedCFException(h, ex);
1962 <        g.complete(v1);
1963 <
1964 <        assertEquals(r.invocationCount, 0);
1965 <        checkCompletedNormally(g, v1);
1966 <        checkCompletedWithWrappedCFException(f, ex);
2248 <        checkCompletedWithWrappedCFException(h, ex);
2249 <        }
2250 <    }
2251 <
2252 <    public void testAcceptEither_exceptionalCompletion2() {
2253 <        for (ExecutionMode m : ExecutionMode.values())
2254 <        for (Integer v1 : new Integer[] { 1, null }) {
2255 <
2256 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2257 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2258 <        final IncAction r = new IncAction();
2259 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2260 <        final CFException ex = new CFException();
2261 <
2262 <        g.completeExceptionally(ex);
2263 <        checkCompletedWithWrappedCFException(h, ex);
2264 <        f.complete(v1);
2265 <
2266 <        assertEquals(r.invocationCount, 0);
2267 <        checkCompletedNormally(f, v1);
2268 <        checkCompletedWithWrappedCFException(g, ex);
2269 <        checkCompletedWithWrappedCFException(h, ex);
2270 <        }
2271 <    }
2272 <
2273 <    public void testAcceptEither_exceptionalCompletion3() {
2274 <        for (ExecutionMode m : ExecutionMode.values())
2275 <        for (Integer v1 : new Integer[] { 1, null }) {
2276 <
2277 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279 <        final IncAction r = new IncAction();
2280 <        final CFException ex = new CFException();
1961 >        checkCompletedWithWrappedCFException(h0, ex);
1962 >        checkCompletedWithWrappedCFException(h1, ex);
1963 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1964 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1965 >        checkCompletedWithWrappedCFException(h2, ex);
1966 >        checkCompletedWithWrappedCFException(h3, ex);
1967  
1968 <        g.completeExceptionally(ex);
2283 <        f.complete(v1);
2284 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1968 >        g.complete(v1);
1969  
1970 <        // unspecified behavior
1971 <        Integer v;
1970 >        // unspecified behavior - both source completions available
1971 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1972 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1973          try {
1974 <            assertEquals(h.join(), null);
1975 <            assertEquals(r.invocationCount, 1);
2291 <            assertEquals(inc(v1), r.value);
1974 >            assertNull(h4.join());
1975 >            rs[4].assertValue(inc(v1));
1976          } catch (CompletionException ok) {
1977 <            checkCompletedWithWrappedCFException(h, ex);
1978 <            assertEquals(r.invocationCount, 0);
2295 <        }
2296 <
2297 <        checkCompletedWithWrappedCFException(g, ex);
2298 <        checkCompletedNormally(f, v1);
1977 >            checkCompletedWithWrappedCFException(h4, ex);
1978 >            rs[4].assertNotInvoked();
1979          }
2300    }
2301
2302    public void testAcceptEither_exceptionalCompletion4() {
2303        for (ExecutionMode m : ExecutionMode.values())
2304        for (Integer v1 : new Integer[] { 1, null }) {
2305
2306        final CompletableFuture<Integer> f = new CompletableFuture<>();
2307        final CompletableFuture<Integer> g = new CompletableFuture<>();
2308        final IncAction r = new IncAction();
2309        final CFException ex = new CFException();
2310
2311        f.completeExceptionally(ex);
2312        g.complete(v1);
2313        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2314
2315        // unspecified behavior
2316        Integer v;
1980          try {
1981 <            assertEquals(h.join(), null);
1982 <            assertEquals(r.invocationCount, 1);
2320 <            assertEquals(inc(v1), r.value);
1981 >            assertNull(h5.join());
1982 >            rs[5].assertValue(inc(v1));
1983          } catch (CompletionException ok) {
1984 <            checkCompletedWithWrappedCFException(h, ex);
1985 <            assertEquals(r.invocationCount, 0);
1984 >            checkCompletedWithWrappedCFException(h5, ex);
1985 >            rs[5].assertNotInvoked();
1986          }
1987  
1988          checkCompletedWithWrappedCFException(f, ex);
1989          checkCompletedNormally(g, v1);
1990 <        }
1991 <    }
1990 >        checkCompletedWithWrappedCFException(h0, ex);
1991 >        checkCompletedWithWrappedCFException(h1, ex);
1992 >        checkCompletedWithWrappedCFException(h2, ex);
1993 >        checkCompletedWithWrappedCFException(h3, ex);
1994 >        checkCompletedWithWrappedCFException(h4, ex);
1995 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1996 >    }}
1997  
1998      /**
1999 <     * acceptEither result completes exceptionally if action does
1999 >     * acceptEither result completes exceptionally if either source cancelled
2000       */
2001 <    public void testAcceptEither_actionFailed1() {
2001 >    public void testAcceptEither_sourceCancelled() {
2002          for (ExecutionMode m : ExecutionMode.values())
2003 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2004          for (Integer v1 : new Integer[] { 1, null })
2005 <        for (Integer v2 : new Integer[] { 2, null }) {
2338 <
2005 >    {
2006          final CompletableFuture<Integer> f = new CompletableFuture<>();
2007          final CompletableFuture<Integer> g = new CompletableFuture<>();
2008 <        final FailingConsumer r = new FailingConsumer();
2009 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2008 >        final IncAction[] rs = new IncAction[6];
2009 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
2010  
2011 <        f.complete(v1);
2012 <        checkCompletedWithWrappedCFException(h);
2013 <        g.complete(v2);
2014 <        checkCompletedNormally(f, v1);
2015 <        checkCompletedNormally(g, v2);
2016 <        }
2017 <    }
2011 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2012 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2013 >        checkIncomplete(h0);
2014 >        checkIncomplete(h1);
2015 >        rs[0].assertNotInvoked();
2016 >        rs[1].assertNotInvoked();
2017 >        f.cancel(mayInterruptIfRunning);
2018 >        checkCompletedWithWrappedCancellationException(h0);
2019 >        checkCompletedWithWrappedCancellationException(h1);
2020 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2021 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2022 >        checkCompletedWithWrappedCancellationException(h2);
2023 >        checkCompletedWithWrappedCancellationException(h3);
2024  
2025 <    public void testAcceptEither_actionFailed2() {
2353 <        for (ExecutionMode m : ExecutionMode.values())
2354 <        for (Integer v1 : new Integer[] { 1, null })
2355 <        for (Integer v2 : new Integer[] { 2, null }) {
2356 <
2357 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2358 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2359 <        final FailingConsumer r = new FailingConsumer();
2360 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2025 >        g.complete(v1);
2026  
2027 <        g.complete(v2);
2028 <        checkCompletedWithWrappedCFException(h);
2029 <        f.complete(v1);
2030 <        checkCompletedNormally(f, v1);
2031 <        checkCompletedNormally(g, v2);
2027 >        // unspecified behavior - both source completions available
2028 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2029 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2030 >        try {
2031 >            assertNull(h4.join());
2032 >            rs[4].assertValue(inc(v1));
2033 >        } catch (CompletionException ok) {
2034 >            checkCompletedWithWrappedCancellationException(h4);
2035 >            rs[4].assertNotInvoked();
2036 >        }
2037 >        try {
2038 >            assertNull(h5.join());
2039 >            rs[5].assertValue(inc(v1));
2040 >        } catch (CompletionException ok) {
2041 >            checkCompletedWithWrappedCancellationException(h5);
2042 >            rs[5].assertNotInvoked();
2043          }
2368    }
2369
2370    /**
2371     * acceptEither result completes exceptionally if either source cancelled
2372     */
2373    public void testAcceptEither_sourceCancelled1() {
2374        for (ExecutionMode m : ExecutionMode.values())
2375        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2376        for (Integer v1 : new Integer[] { 1, null }) {
2377
2378        final CompletableFuture<Integer> f = new CompletableFuture<>();
2379        final CompletableFuture<Integer> g = new CompletableFuture<>();
2380        final IncAction r = new IncAction();
2381        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2382
2383        assertTrue(f.cancel(mayInterruptIfRunning));
2384        checkCompletedWithWrappedCancellationException(h);
2385        g.complete(v1);
2044  
2045          checkCancelled(f);
2388        assertEquals(r.invocationCount, 0);
2046          checkCompletedNormally(g, v1);
2047 <        checkCompletedWithWrappedCancellationException(h);
2048 <        }
2049 <    }
2047 >        checkCompletedWithWrappedCancellationException(h0);
2048 >        checkCompletedWithWrappedCancellationException(h1);
2049 >        checkCompletedWithWrappedCancellationException(h2);
2050 >        checkCompletedWithWrappedCancellationException(h3);
2051 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2052 >    }}
2053  
2054 <    public void testAcceptEither_sourceCancelled2() {
2054 >    /**
2055 >     * acceptEither result completes exceptionally if action does
2056 >     */
2057 >    public void testAcceptEither_actionFailed() {
2058          for (ExecutionMode m : ExecutionMode.values())
2059 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2060 <        for (Integer v1 : new Integer[] { 1, null }) {
2061 <
2059 >        for (Integer v1 : new Integer[] { 1, null })
2060 >        for (Integer v2 : new Integer[] { 2, null })
2061 >    {
2062          final CompletableFuture<Integer> f = new CompletableFuture<>();
2063          final CompletableFuture<Integer> g = new CompletableFuture<>();
2064 <        final IncAction r = new IncAction();
2065 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2064 >        final FailingConsumer[] rs = new FailingConsumer[6];
2065 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2066  
2067 <        assertTrue(g.cancel(mayInterruptIfRunning));
2068 <        checkCompletedWithWrappedCancellationException(h);
2067 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2068 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2069          f.complete(v1);
2070 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2071 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2072 +        checkCompletedWithWrappedCFException(h0);
2073 +        checkCompletedWithWrappedCFException(h1);
2074 +        checkCompletedWithWrappedCFException(h2);
2075 +        checkCompletedWithWrappedCFException(h3);
2076 +        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2077  
2078 <        checkCancelled(g);
2409 <        assertEquals(r.invocationCount, 0);
2410 <        checkCompletedNormally(f, v1);
2411 <        checkCompletedWithWrappedCancellationException(h);
2412 <        }
2413 <    }
2414 <
2415 <    public void testAcceptEither_sourceCancelled3() {
2416 <        for (ExecutionMode m : ExecutionMode.values())
2417 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2418 <        for (Integer v1 : new Integer[] { 1, null }) {
2078 >        g.complete(v2);
2079  
2080 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2081 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2082 <        final IncAction r = new IncAction();
2080 >        // unspecified behavior - both source completions available
2081 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2082 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2083  
2084 <        assertTrue(g.cancel(mayInterruptIfRunning));
2085 <        f.complete(v1);
2086 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2084 >        checkCompletedWithWrappedCFException(h4);
2085 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2086 >                   Objects.equals(v2, rs[4].value));
2087 >        checkCompletedWithWrappedCFException(h5);
2088 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2089 >                   Objects.equals(v2, rs[5].value));
2090  
2428        // unspecified behavior
2429        Integer v;
2430        try {
2431            assertEquals(h.join(), null);
2432            assertEquals(r.invocationCount, 1);
2433            assertEquals(inc(v1), r.value);
2434        } catch (CompletionException ok) {
2435            checkCompletedWithWrappedCancellationException(h);
2436            assertEquals(r.invocationCount, 0);
2437        }
2438
2439        checkCancelled(g);
2091          checkCompletedNormally(f, v1);
2092 <        }
2093 <    }
2443 <
2444 <    public void testAcceptEither_sourceCancelled4() {
2445 <        for (ExecutionMode m : ExecutionMode.values())
2446 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2447 <        for (Integer v1 : new Integer[] { 1, null }) {
2448 <
2449 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2450 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2451 <        final IncAction r = new IncAction();
2452 <
2453 <        assertTrue(f.cancel(mayInterruptIfRunning));
2454 <        g.complete(v1);
2455 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2456 <
2457 <        // unspecified behavior
2458 <        Integer v;
2459 <        try {
2460 <            assertEquals(h.join(), null);
2461 <            assertEquals(r.invocationCount, 1);
2462 <            assertEquals(inc(v1), r.value);
2463 <        } catch (CompletionException ok) {
2464 <            checkCompletedWithWrappedCancellationException(h);
2465 <            assertEquals(r.invocationCount, 0);
2466 <        }
2467 <
2468 <        checkCancelled(f);
2469 <        checkCompletedNormally(g, v1);
2470 <        }
2471 <    }
2092 >        checkCompletedNormally(g, v2);
2093 >    }}
2094  
2095      /**
2096       * runAfterEither result completes normally after normal completion
# Line 2477 | Line 2099 | public class CompletableFutureTest exten
2099      public void testRunAfterEither_normalCompletion1() {
2100          for (ExecutionMode m : ExecutionMode.values())
2101          for (Integer v1 : new Integer[] { 1, null })
2102 <        for (Integer v2 : new Integer[] { 2, null }) {
2103 <
2102 >        for (Integer v2 : new Integer[] { 2, null })
2103 >    {
2104          final CompletableFuture<Integer> f = new CompletableFuture<>();
2105          final CompletableFuture<Integer> g = new CompletableFuture<>();
2106 <        final Noop r = new Noop();
2106 >        final Noop r = new Noop(m);
2107          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2108  
2109          f.complete(v1);
2110          checkCompletedNormally(h, null);
2111 <        assertEquals(r.invocationCount, 1);
2111 >        r.assertInvoked();
2112          g.complete(v2);
2113  
2114          checkCompletedNormally(f, v1);
2115          checkCompletedNormally(g, v2);
2116          checkCompletedNormally(h, null);
2117 <        assertEquals(r.invocationCount, 1);
2118 <        }
2497 <    }
2117 >        r.assertInvoked();
2118 >    }}
2119  
2120      public void testRunAfterEither_normalCompletion2() {
2121          for (ExecutionMode m : ExecutionMode.values())
2122          for (Integer v1 : new Integer[] { 1, null })
2123 <        for (Integer v2 : new Integer[] { 2, null }) {
2124 <
2123 >        for (Integer v2 : new Integer[] { 2, null })
2124 >    {
2125          final CompletableFuture<Integer> f = new CompletableFuture<>();
2126          final CompletableFuture<Integer> g = new CompletableFuture<>();
2127 <        final Noop r = new Noop();
2127 >        final Noop r = new Noop(m);
2128          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2129  
2130          g.complete(v2);
2131          checkCompletedNormally(h, null);
2132 <        assertEquals(r.invocationCount, 1);
2132 >        r.assertInvoked();
2133          f.complete(v1);
2134  
2135          checkCompletedNormally(f, v1);
2136          checkCompletedNormally(g, v2);
2137          checkCompletedNormally(h, null);
2138 <        assertEquals(r.invocationCount, 1);
2139 <        }
2140 <    }
2138 >        r.assertInvoked();
2139 >        }}
2140 >
2141      public void testRunAfterEither_normalCompletion3() {
2142          for (ExecutionMode m : ExecutionMode.values())
2143          for (Integer v1 : new Integer[] { 1, null })
2144 <        for (Integer v2 : new Integer[] { 2, null }) {
2145 <
2144 >        for (Integer v2 : new Integer[] { 2, null })
2145 >    {
2146          final CompletableFuture<Integer> f = new CompletableFuture<>();
2147          final CompletableFuture<Integer> g = new CompletableFuture<>();
2148 <        final Noop r = new Noop();
2148 >        final Noop r = new Noop(m);
2149  
2150          f.complete(v1);
2151          g.complete(v2);
# Line 2533 | Line 2154 | public class CompletableFutureTest exten
2154          checkCompletedNormally(h, null);
2155          checkCompletedNormally(f, v1);
2156          checkCompletedNormally(g, v2);
2157 <        assertEquals(r.invocationCount, 1);
2158 <        }
2538 <    }
2157 >        r.assertInvoked();
2158 >    }}
2159  
2160      /**
2161       * runAfterEither result completes exceptionally after exceptional
# Line 2543 | Line 2163 | public class CompletableFutureTest exten
2163       */
2164      public void testRunAfterEither_exceptionalCompletion1() {
2165          for (ExecutionMode m : ExecutionMode.values())
2166 <        for (Integer v1 : new Integer[] { 1, null }) {
2167 <
2166 >        for (Integer v1 : new Integer[] { 1, null })
2167 >    {
2168          final CompletableFuture<Integer> f = new CompletableFuture<>();
2169          final CompletableFuture<Integer> g = new CompletableFuture<>();
2170 <        final Noop r = new Noop();
2170 >        final Noop r = new Noop(m);
2171          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2172          final CFException ex = new CFException();
2173  
# Line 2555 | Line 2175 | public class CompletableFutureTest exten
2175          checkCompletedWithWrappedCFException(h, ex);
2176          g.complete(v1);
2177  
2178 <        assertEquals(r.invocationCount, 0);
2178 >        r.assertNotInvoked();
2179          checkCompletedNormally(g, v1);
2180          checkCompletedWithWrappedCFException(f, ex);
2181          checkCompletedWithWrappedCFException(h, ex);
2182 <        }
2563 <    }
2182 >    }}
2183  
2184      public void testRunAfterEither_exceptionalCompletion2() {
2185          for (ExecutionMode m : ExecutionMode.values())
2186 <        for (Integer v1 : new Integer[] { 1, null }) {
2187 <
2186 >        for (Integer v1 : new Integer[] { 1, null })
2187 >    {
2188          final CompletableFuture<Integer> f = new CompletableFuture<>();
2189          final CompletableFuture<Integer> g = new CompletableFuture<>();
2190 <        final Noop r = new Noop();
2190 >        final Noop r = new Noop(m);
2191          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2192          final CFException ex = new CFException();
2193  
# Line 2576 | Line 2195 | public class CompletableFutureTest exten
2195          checkCompletedWithWrappedCFException(h, ex);
2196          f.complete(v1);
2197  
2198 <        assertEquals(r.invocationCount, 0);
2198 >        r.assertNotInvoked();
2199          checkCompletedNormally(f, v1);
2200          checkCompletedWithWrappedCFException(g, ex);
2201          checkCompletedWithWrappedCFException(h, ex);
2202 <        }
2584 <    }
2202 >    }}
2203  
2204      public void testRunAfterEither_exceptionalCompletion3() {
2205          for (ExecutionMode m : ExecutionMode.values())
2206 <        for (Integer v1 : new Integer[] { 1, null }) {
2207 <
2206 >        for (Integer v1 : new Integer[] { 1, null })
2207 >    {
2208          final CompletableFuture<Integer> f = new CompletableFuture<>();
2209          final CompletableFuture<Integer> g = new CompletableFuture<>();
2210 <        final Noop r = new Noop();
2210 >        final Noop r = new Noop(m);
2211          final CFException ex = new CFException();
2212  
2213          g.completeExceptionally(ex);
# Line 2599 | Line 2217 | public class CompletableFutureTest exten
2217          // unspecified behavior
2218          Integer v;
2219          try {
2220 <            assertEquals(h.join(), null);
2221 <            assertEquals(r.invocationCount, 1);
2220 >            assertNull(h.join());
2221 >            r.assertInvoked();
2222          } catch (CompletionException ok) {
2223              checkCompletedWithWrappedCFException(h, ex);
2224 <            assertEquals(r.invocationCount, 0);
2224 >            r.assertNotInvoked();
2225          }
2226  
2227          checkCompletedWithWrappedCFException(g, ex);
2228          checkCompletedNormally(f, v1);
2229 <        }
2612 <    }
2229 >    }}
2230  
2231      public void testRunAfterEither_exceptionalCompletion4() {
2232          for (ExecutionMode m : ExecutionMode.values())
2233 <        for (Integer v1 : new Integer[] { 1, null }) {
2234 <
2233 >        for (Integer v1 : new Integer[] { 1, null })
2234 >    {
2235          final CompletableFuture<Integer> f = new CompletableFuture<>();
2236          final CompletableFuture<Integer> g = new CompletableFuture<>();
2237 <        final Noop r = new Noop();
2237 >        final Noop r = new Noop(m);
2238          final CFException ex = new CFException();
2239  
2240          f.completeExceptionally(ex);
# Line 2627 | Line 2244 | public class CompletableFutureTest exten
2244          // unspecified behavior
2245          Integer v;
2246          try {
2247 <            assertEquals(h.join(), null);
2248 <            assertEquals(r.invocationCount, 1);
2247 >            assertNull(h.join());
2248 >            r.assertInvoked();
2249          } catch (CompletionException ok) {
2250              checkCompletedWithWrappedCFException(h, ex);
2251 <            assertEquals(r.invocationCount, 0);
2251 >            r.assertNotInvoked();
2252          }
2253  
2254          checkCompletedWithWrappedCFException(f, ex);
2255          checkCompletedNormally(g, v1);
2256 <        }
2640 <    }
2256 >    }}
2257  
2258      /**
2259       * runAfterEither result completes exceptionally if action does
# Line 2645 | Line 2261 | public class CompletableFutureTest exten
2261      public void testRunAfterEither_actionFailed1() {
2262          for (ExecutionMode m : ExecutionMode.values())
2263          for (Integer v1 : new Integer[] { 1, null })
2264 <        for (Integer v2 : new Integer[] { 2, null }) {
2265 <
2264 >        for (Integer v2 : new Integer[] { 2, null })
2265 >    {
2266          final CompletableFuture<Integer> f = new CompletableFuture<>();
2267          final CompletableFuture<Integer> g = new CompletableFuture<>();
2268 <        final FailingNoop r = new FailingNoop();
2268 >        final FailingRunnable r = new FailingRunnable(m);
2269          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2270  
2271          f.complete(v1);
# Line 2657 | Line 2273 | public class CompletableFutureTest exten
2273          g.complete(v2);
2274          checkCompletedNormally(f, v1);
2275          checkCompletedNormally(g, v2);
2276 <        }
2661 <    }
2276 >    }}
2277  
2278      public void testRunAfterEither_actionFailed2() {
2279          for (ExecutionMode m : ExecutionMode.values())
2280          for (Integer v1 : new Integer[] { 1, null })
2281 <        for (Integer v2 : new Integer[] { 2, null }) {
2282 <
2281 >        for (Integer v2 : new Integer[] { 2, null })
2282 >    {
2283          final CompletableFuture<Integer> f = new CompletableFuture<>();
2284          final CompletableFuture<Integer> g = new CompletableFuture<>();
2285 <        final FailingNoop r = new FailingNoop();
2285 >        final FailingRunnable r = new FailingRunnable(m);
2286          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2287  
2288          g.complete(v2);
# Line 2675 | Line 2290 | public class CompletableFutureTest exten
2290          f.complete(v1);
2291          checkCompletedNormally(f, v1);
2292          checkCompletedNormally(g, v2);
2293 <        }
2679 <    }
2293 >    }}
2294  
2295      /**
2296       * runAfterEither result completes exceptionally if either source cancelled
# Line 2684 | Line 2298 | public class CompletableFutureTest exten
2298      public void testRunAfterEither_sourceCancelled1() {
2299          for (ExecutionMode m : ExecutionMode.values())
2300          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2301 <        for (Integer v1 : new Integer[] { 1, null }) {
2302 <
2301 >        for (Integer v1 : new Integer[] { 1, null })
2302 >    {
2303          final CompletableFuture<Integer> f = new CompletableFuture<>();
2304          final CompletableFuture<Integer> g = new CompletableFuture<>();
2305 <        final Noop r = new Noop();
2305 >        final Noop r = new Noop(m);
2306          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2307  
2308          assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2696 | Line 2310 | public class CompletableFutureTest exten
2310          g.complete(v1);
2311  
2312          checkCancelled(f);
2313 <        assertEquals(r.invocationCount, 0);
2313 >        r.assertNotInvoked();
2314          checkCompletedNormally(g, v1);
2315          checkCompletedWithWrappedCancellationException(h);
2316 <        }
2703 <    }
2316 >    }}
2317  
2318      public void testRunAfterEither_sourceCancelled2() {
2319          for (ExecutionMode m : ExecutionMode.values())
2320          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2321 <        for (Integer v1 : new Integer[] { 1, null }) {
2322 <
2321 >        for (Integer v1 : new Integer[] { 1, null })
2322 >    {
2323          final CompletableFuture<Integer> f = new CompletableFuture<>();
2324          final CompletableFuture<Integer> g = new CompletableFuture<>();
2325 <        final Noop r = new Noop();
2325 >        final Noop r = new Noop(m);
2326          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2327  
2328          assertTrue(g.cancel(mayInterruptIfRunning));
# Line 2717 | Line 2330 | public class CompletableFutureTest exten
2330          f.complete(v1);
2331  
2332          checkCancelled(g);
2333 <        assertEquals(r.invocationCount, 0);
2333 >        r.assertNotInvoked();
2334          checkCompletedNormally(f, v1);
2335          checkCompletedWithWrappedCancellationException(h);
2336 <        }
2724 <    }
2336 >    }}
2337  
2338      public void testRunAfterEither_sourceCancelled3() {
2339          for (ExecutionMode m : ExecutionMode.values())
2340          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2341 <        for (Integer v1 : new Integer[] { 1, null }) {
2342 <
2341 >        for (Integer v1 : new Integer[] { 1, null })
2342 >    {
2343          final CompletableFuture<Integer> f = new CompletableFuture<>();
2344          final CompletableFuture<Integer> g = new CompletableFuture<>();
2345 <        final Noop r = new Noop();
2345 >        final Noop r = new Noop(m);
2346  
2347          assertTrue(g.cancel(mayInterruptIfRunning));
2348          f.complete(v1);
# Line 2739 | Line 2351 | public class CompletableFutureTest exten
2351          // unspecified behavior
2352          Integer v;
2353          try {
2354 <            assertEquals(h.join(), null);
2355 <            assertEquals(r.invocationCount, 1);
2354 >            assertNull(h.join());
2355 >            r.assertInvoked();
2356          } catch (CompletionException ok) {
2357              checkCompletedWithWrappedCancellationException(h);
2358 <            assertEquals(r.invocationCount, 0);
2358 >            r.assertNotInvoked();
2359          }
2360  
2361          checkCancelled(g);
2362          checkCompletedNormally(f, v1);
2363 <        }
2752 <    }
2363 >    }}
2364  
2365      public void testRunAfterEither_sourceCancelled4() {
2366          for (ExecutionMode m : ExecutionMode.values())
2367          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2368 <        for (Integer v1 : new Integer[] { 1, null }) {
2369 <
2368 >        for (Integer v1 : new Integer[] { 1, null })
2369 >    {
2370          final CompletableFuture<Integer> f = new CompletableFuture<>();
2371          final CompletableFuture<Integer> g = new CompletableFuture<>();
2372 <        final Noop r = new Noop();
2372 >        final Noop r = new Noop(m);
2373  
2374          assertTrue(f.cancel(mayInterruptIfRunning));
2375          g.complete(v1);
# Line 2767 | Line 2378 | public class CompletableFutureTest exten
2378          // unspecified behavior
2379          Integer v;
2380          try {
2381 <            assertEquals(h.join(), null);
2382 <            assertEquals(r.invocationCount, 1);
2381 >            assertNull(h.join());
2382 >            r.assertInvoked();
2383          } catch (CompletionException ok) {
2384              checkCompletedWithWrappedCancellationException(h);
2385 <            assertEquals(r.invocationCount, 0);
2385 >            r.assertNotInvoked();
2386          }
2387  
2388          checkCancelled(f);
2389          checkCompletedNormally(g, v1);
2390 <        }
2780 <    }
2390 >    }}
2391  
2392      /**
2393       * thenCompose result completes normally after normal completion of source
2394       */
2395 <    public void testThenCompose() {
2396 <        CompletableFuture<Integer> f, g;
2397 <        CompletableFutureInc r;
2398 <
2399 <        f = new CompletableFuture<>();
2400 <        g = f.thenCompose(r = new CompletableFutureInc());
2401 <        f.complete(one);
2402 <        checkCompletedNormally(g, two);
2403 <        assertTrue(r.ran);
2395 >    public void testThenCompose_normalCompletion() {
2396 >        for (ExecutionMode m : ExecutionMode.values())
2397 >        for (boolean createIncomplete : new boolean[] { true, false })
2398 >        for (Integer v1 : new Integer[] { 1, null })
2399 >    {
2400 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2401 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2402 >        if (!createIncomplete) f.complete(v1);
2403 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2404 >        if (createIncomplete) f.complete(v1);
2405  
2406 <        f = new CompletableFuture<>();
2407 <        f.complete(one);
2408 <        g = f.thenCompose(r = new CompletableFutureInc());
2409 <        checkCompletedNormally(g, two);
2799 <        assertTrue(r.ran);
2800 <    }
2406 >        checkCompletedNormally(g, inc(v1));
2407 >        checkCompletedNormally(f, v1);
2408 >        r.assertInvoked();
2409 >    }}
2410  
2411      /**
2412       * thenCompose result completes exceptionally after exceptional
2413       * completion of source
2414       */
2415 <    public void testThenCompose2() {
2416 <        CompletableFuture<Integer> f, g;
2417 <        CompletableFutureInc r;
2418 <
2419 <        f = new CompletableFuture<>();
2420 <        g = f.thenCompose(r = new CompletableFutureInc());
2421 <        f.completeExceptionally(new CFException());
2422 <        checkCompletedWithWrappedCFException(g);
2415 >    public void testThenCompose_exceptionalCompletion() {
2416 >        for (ExecutionMode m : ExecutionMode.values())
2417 >        for (boolean createIncomplete : new boolean[] { true, false })
2418 >    {
2419 >        final CFException ex = new CFException();
2420 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2421 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2422 >        if (!createIncomplete) f.completeExceptionally(ex);
2423 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2424 >        if (createIncomplete) f.completeExceptionally(ex);
2425  
2426 <        f = new CompletableFuture<>();
2427 <        f.completeExceptionally(new CFException());
2428 <        g = f.thenCompose(r = new CompletableFutureInc());
2429 <        checkCompletedWithWrappedCFException(g);
2819 <    }
2426 >        checkCompletedWithWrappedCFException(g, ex);
2427 >        checkCompletedWithWrappedCFException(f, ex);
2428 >        r.assertNotInvoked();
2429 >    }}
2430  
2431      /**
2432       * thenCompose result completes exceptionally if action does
2433       */
2434 <    public void testThenCompose3() {
2435 <        CompletableFuture<Integer> f, g;
2436 <        FailingCompletableFutureFunction r;
2437 <
2438 <        f = new CompletableFuture<>();
2439 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2440 <        f.complete(one);
2441 <        checkCompletedWithWrappedCFException(g);
2434 >    public void testThenCompose_actionFailed() {
2435 >        for (ExecutionMode m : ExecutionMode.values())
2436 >        for (boolean createIncomplete : new boolean[] { true, false })
2437 >        for (Integer v1 : new Integer[] { 1, null })
2438 >    {
2439 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2440 >        final FailingCompletableFutureFunction r
2441 >            = new FailingCompletableFutureFunction(m);
2442 >        if (!createIncomplete) f.complete(v1);
2443 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2444 >        if (createIncomplete) f.complete(v1);
2445  
2833        f = new CompletableFuture<>();
2834        f.complete(one);
2835        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2446          checkCompletedWithWrappedCFException(g);
2447 <    }
2447 >        checkCompletedNormally(f, v1);
2448 >    }}
2449  
2450      /**
2451       * thenCompose result completes exceptionally if source cancelled
2452       */
2453 <    public void testThenCompose4() {
2454 <        CompletableFuture<Integer> f, g;
2455 <        CompletableFutureInc r;
2456 <
2457 <        f = new CompletableFuture<>();
2458 <        g = f.thenCompose(r = new CompletableFutureInc());
2459 <        assertTrue(f.cancel(true));
2460 <        checkCompletedWithWrappedCancellationException(g);
2461 <
2462 <        f = new CompletableFuture<>();
2463 <        assertTrue(f.cancel(true));
2464 <        g = f.thenCompose(r = new CompletableFutureInc());
2465 <        checkCompletedWithWrappedCancellationException(g);
2855 <    }
2856 <
2857 <    // asyncs
2858 <
2859 <    /**
2860 <     * thenRunAsync result completes normally after normal completion of source
2861 <     */
2862 <    public void testThenRunAsync() {
2863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2864 <        Noop r = new Noop();
2865 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2866 <        f.complete(null);
2867 <        checkCompletedNormally(g, null);
2868 <
2869 <        // reordered version
2870 <        f = new CompletableFuture<>();
2871 <        f.complete(null);
2872 <        r = new Noop();
2873 <        g = f.thenRunAsync(r);
2874 <        checkCompletedNormally(g, null);
2875 <    }
2876 <
2877 <    /**
2878 <     * thenRunAsync result completes exceptionally after exceptional
2879 <     * completion of source
2880 <     */
2881 <    public void testThenRunAsync2() {
2882 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2883 <        Noop r = new Noop();
2884 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2885 <        f.completeExceptionally(new CFException());
2886 <        try {
2887 <            g.join();
2888 <            shouldThrow();
2889 <        } catch (CompletionException success) {}
2890 <        checkCompletedWithWrappedCFException(g);
2891 <    }
2892 <
2893 <    /**
2894 <     * thenRunAsync result completes exceptionally if action does
2895 <     */
2896 <    public void testThenRunAsync3() {
2897 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2898 <        FailingNoop r = new FailingNoop();
2899 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2900 <        f.complete(null);
2901 <        checkCompletedWithWrappedCFException(g);
2902 <    }
2903 <
2904 <    /**
2905 <     * thenRunAsync result completes exceptionally if source cancelled
2906 <     */
2907 <    public void testThenRunAsync4() {
2908 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2909 <        Noop r = new Noop();
2910 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2911 <        assertTrue(f.cancel(true));
2912 <        checkCompletedWithWrappedCancellationException(g);
2913 <    }
2914 <
2915 <    /**
2916 <     * thenApplyAsync result completes normally after normal completion of source
2917 <     */
2918 <    public void testThenApplyAsync() {
2919 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2920 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2921 <        f.complete(one);
2922 <        checkCompletedNormally(g, two);
2923 <    }
2924 <
2925 <    /**
2926 <     * thenApplyAsync result completes exceptionally after exceptional
2927 <     * completion of source
2928 <     */
2929 <    public void testThenApplyAsync2() {
2930 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2931 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2932 <        f.completeExceptionally(new CFException());
2933 <        checkCompletedWithWrappedCFException(g);
2934 <    }
2935 <
2936 <    /**
2937 <     * thenApplyAsync result completes exceptionally if action does
2938 <     */
2939 <    public void testThenApplyAsync3() {
2940 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2941 <        FailingFunction r = new FailingFunction();
2942 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2943 <        f.complete(null);
2944 <        checkCompletedWithWrappedCFException(g);
2945 <    }
2946 <
2947 <    /**
2948 <     * thenApplyAsync result completes exceptionally if source cancelled
2949 <     */
2950 <    public void testThenApplyAsync4() {
2951 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2952 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2953 <        assertTrue(f.cancel(true));
2954 <        checkCompletedWithWrappedCancellationException(g);
2955 <    }
2956 <
2957 <    /**
2958 <     * thenAcceptAsync result completes normally after normal
2959 <     * completion of source
2960 <     */
2961 <    public void testThenAcceptAsync() {
2962 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2963 <        IncAction r = new IncAction();
2964 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2965 <        f.complete(one);
2966 <        checkCompletedNormally(g, null);
2967 <        assertEquals(r.value, (Integer) 2);
2968 <    }
2969 <
2970 <    /**
2971 <     * thenAcceptAsync result completes exceptionally after exceptional
2972 <     * completion of source
2973 <     */
2974 <    public void testThenAcceptAsync2() {
2975 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2976 <        IncAction r = new IncAction();
2977 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2978 <        f.completeExceptionally(new CFException());
2979 <        checkCompletedWithWrappedCFException(g);
2980 <    }
2981 <
2982 <    /**
2983 <     * thenAcceptAsync result completes exceptionally if action does
2984 <     */
2985 <    public void testThenAcceptAsync3() {
2986 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2987 <        FailingConsumer r = new FailingConsumer();
2988 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2989 <        f.complete(null);
2990 <        checkCompletedWithWrappedCFException(g);
2991 <    }
2992 <
2993 <    /**
2994 <     * thenAcceptAsync result completes exceptionally if source cancelled
2995 <     */
2996 <    public void testThenAcceptAsync4() {
2997 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2998 <        IncAction r = new IncAction();
2999 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3000 <        assertTrue(f.cancel(true));
3001 <        checkCompletedWithWrappedCancellationException(g);
3002 <    }
3003 <
3004 <    /**
3005 <     * thenComposeAsync result completes normally after normal
3006 <     * completion of source
3007 <     */
3008 <    public void testThenComposeAsync() {
3009 <        CompletableFuture<Integer> f, g;
3010 <        CompletableFutureInc r;
3011 <
3012 <        f = new CompletableFuture<>();
3013 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3014 <        f.complete(one);
3015 <        checkCompletedNormally(g, two);
3016 <
3017 <        f = new CompletableFuture<>();
3018 <        f.complete(one);
3019 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3020 <        checkCompletedNormally(g, two);
3021 <    }
3022 <
3023 <    /**
3024 <     * thenComposeAsync result completes exceptionally after
3025 <     * exceptional completion of source
3026 <     */
3027 <    public void testThenComposeAsync2() {
3028 <        CompletableFuture<Integer> f, g;
3029 <        CompletableFutureInc r;
3030 <
3031 <        f = new CompletableFuture<>();
3032 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3033 <        f.completeExceptionally(new CFException());
3034 <        checkCompletedWithWrappedCFException(g);
3035 <        assertFalse(r.ran);
3036 <
3037 <        f = new CompletableFuture<>();
3038 <        f.completeExceptionally(new CFException());
3039 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3040 <        checkCompletedWithWrappedCFException(g);
3041 <        assertFalse(r.ran);
3042 <    }
3043 <
3044 <    /**
3045 <     * thenComposeAsync result completes exceptionally if action does
3046 <     */
3047 <    public void testThenComposeAsync3() {
3048 <        CompletableFuture<Integer> f, g;
3049 <        FailingCompletableFutureFunction r;
3050 <
3051 <        f = new CompletableFuture<>();
3052 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3053 <        f.complete(one);
3054 <        checkCompletedWithWrappedCFException(g);
3055 <
3056 <        f = new CompletableFuture<>();
3057 <        f.complete(one);
3058 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3059 <        checkCompletedWithWrappedCFException(g);
3060 <    }
3061 <
3062 <    /**
3063 <     * thenComposeAsync result completes exceptionally if source cancelled
3064 <     */
3065 <    public void testThenComposeAsync4() {
3066 <        CompletableFuture<Integer> f, g;
3067 <        CompletableFutureInc r;
3068 <
3069 <        f = new CompletableFuture<>();
3070 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3071 <        assertTrue(f.cancel(true));
3072 <        checkCompletedWithWrappedCancellationException(g);
3073 <
3074 <        f = new CompletableFuture<>();
3075 <        assertTrue(f.cancel(true));
3076 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3077 <        checkCompletedWithWrappedCancellationException(g);
3078 <    }
3079 <
3080 <    // async with explicit executors
3081 <
3082 <    /**
3083 <     * thenRunAsync result completes normally after normal completion of source
3084 <     */
3085 <    public void testThenRunAsyncE() {
3086 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3087 <        Noop r = new Noop();
3088 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3089 <        f.complete(null);
3090 <        checkCompletedNormally(g, null);
3091 <
3092 <        // reordered version
3093 <        f = new CompletableFuture<>();
3094 <        f.complete(null);
3095 <        r = new Noop();
3096 <        g = f.thenRunAsync(r, new ThreadExecutor());
3097 <        checkCompletedNormally(g, null);
3098 <    }
3099 <
3100 <    /**
3101 <     * thenRunAsync result completes exceptionally after exceptional
3102 <     * completion of source
3103 <     */
3104 <    public void testThenRunAsync2E() {
3105 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3106 <        Noop r = new Noop();
3107 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3108 <        f.completeExceptionally(new CFException());
3109 <        try {
3110 <            g.join();
3111 <            shouldThrow();
3112 <        } catch (CompletionException success) {}
3113 <        checkCompletedWithWrappedCFException(g);
3114 <    }
3115 <
3116 <    /**
3117 <     * thenRunAsync result completes exceptionally if action does
3118 <     */
3119 <    public void testThenRunAsync3E() {
3120 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3121 <        FailingNoop r = new FailingNoop();
3122 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3123 <        f.complete(null);
3124 <        checkCompletedWithWrappedCFException(g);
3125 <    }
3126 <
3127 <    /**
3128 <     * thenRunAsync result completes exceptionally if source cancelled
3129 <     */
3130 <    public void testThenRunAsync4E() {
3131 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3132 <        Noop r = new Noop();
3133 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3134 <        assertTrue(f.cancel(true));
3135 <        checkCompletedWithWrappedCancellationException(g);
3136 <    }
3137 <
3138 <    /**
3139 <     * thenApplyAsync result completes normally after normal completion of source
3140 <     */
3141 <    public void testThenApplyAsyncE() {
3142 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3143 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3144 <        f.complete(one);
3145 <        checkCompletedNormally(g, two);
3146 <    }
3147 <
3148 <    /**
3149 <     * thenApplyAsync result completes exceptionally after exceptional
3150 <     * completion of source
3151 <     */
3152 <    public void testThenApplyAsync2E() {
3153 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3154 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3155 <        f.completeExceptionally(new CFException());
3156 <        checkCompletedWithWrappedCFException(g);
3157 <    }
3158 <
3159 <    /**
3160 <     * thenApplyAsync result completes exceptionally if action does
3161 <     */
3162 <    public void testThenApplyAsync3E() {
3163 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3164 <        FailingFunction r = new FailingFunction();
3165 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3166 <        f.complete(null);
3167 <        checkCompletedWithWrappedCFException(g);
3168 <    }
3169 <
3170 <    /**
3171 <     * thenApplyAsync result completes exceptionally if source cancelled
3172 <     */
3173 <    public void testThenApplyAsync4E() {
3174 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3175 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3176 <        assertTrue(f.cancel(true));
3177 <        checkCompletedWithWrappedCancellationException(g);
3178 <    }
3179 <
3180 <    /**
3181 <     * thenAcceptAsync result completes normally after normal
3182 <     * completion of source
3183 <     */
3184 <    public void testThenAcceptAsyncE() {
3185 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3186 <        IncAction r = new IncAction();
3187 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3188 <        f.complete(one);
3189 <        checkCompletedNormally(g, null);
3190 <        assertEquals(r.value, (Integer) 2);
3191 <    }
3192 <
3193 <    /**
3194 <     * thenAcceptAsync result completes exceptionally after exceptional
3195 <     * completion of source
3196 <     */
3197 <    public void testThenAcceptAsync2E() {
3198 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3199 <        IncAction r = new IncAction();
3200 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3201 <        f.completeExceptionally(new CFException());
3202 <        checkCompletedWithWrappedCFException(g);
3203 <    }
3204 <
3205 <    /**
3206 <     * thenAcceptAsync result completes exceptionally if action does
3207 <     */
3208 <    public void testThenAcceptAsync3E() {
3209 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3210 <        FailingConsumer r = new FailingConsumer();
3211 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3212 <        f.complete(null);
3213 <        checkCompletedWithWrappedCFException(g);
3214 <    }
3215 <
3216 <    /**
3217 <     * thenAcceptAsync result completes exceptionally if source cancelled
3218 <     */
3219 <    public void testThenAcceptAsync4E() {
3220 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3221 <        IncAction r = new IncAction();
3222 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3223 <        assertTrue(f.cancel(true));
3224 <        checkCompletedWithWrappedCancellationException(g);
3225 <    }
3226 <
3227 <    /**
3228 <     * thenComposeAsync result completes normally after normal
3229 <     * completion of source
3230 <     */
3231 <    public void testThenComposeAsyncE() {
3232 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3233 <        CompletableFutureInc r = new CompletableFutureInc();
3234 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3235 <        f.complete(one);
3236 <        checkCompletedNormally(g, two);
3237 <    }
3238 <
3239 <    /**
3240 <     * thenComposeAsync result completes exceptionally after
3241 <     * exceptional completion of source
3242 <     */
3243 <    public void testThenComposeAsync2E() {
3244 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3245 <        CompletableFutureInc r = new CompletableFutureInc();
3246 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3247 <        f.completeExceptionally(new CFException());
3248 <        checkCompletedWithWrappedCFException(g);
3249 <    }
3250 <
3251 <    /**
3252 <     * thenComposeAsync result completes exceptionally if action does
3253 <     */
3254 <    public void testThenComposeAsync3E() {
3255 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3256 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3257 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3258 <        f.complete(one);
3259 <        checkCompletedWithWrappedCFException(g);
3260 <    }
2453 >    public void testThenCompose_sourceCancelled() {
2454 >        for (ExecutionMode m : ExecutionMode.values())
2455 >        for (boolean createIncomplete : new boolean[] { true, false })
2456 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2457 >    {
2458 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2459 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2460 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2461 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2462 >        if (createIncomplete) {
2463 >            checkIncomplete(g);
2464 >            assertTrue(f.cancel(mayInterruptIfRunning));
2465 >        }
2466  
3262    /**
3263     * thenComposeAsync result completes exceptionally if source cancelled
3264     */
3265    public void testThenComposeAsync4E() {
3266        CompletableFuture<Integer> f = new CompletableFuture<>();
3267        CompletableFutureInc r = new CompletableFutureInc();
3268        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3269        assertTrue(f.cancel(true));
2467          checkCompletedWithWrappedCancellationException(g);
2468 <    }
2468 >        checkCancelled(f);
2469 >    }}
2470  
2471      // other static methods
2472  
# Line 3287 | Line 2485 | public class CompletableFutureTest exten
2485       */
2486      public void testAllOf_normal() throws Exception {
2487          for (int k = 1; k < 20; ++k) {
2488 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2488 >            CompletableFuture<Integer>[] fs
2489 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2490              for (int i = 0; i < k; ++i)
2491                  fs[i] = new CompletableFuture<>();
2492              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3301 | Line 2500 | public class CompletableFutureTest exten
2500          }
2501      }
2502  
2503 +    public void testAllOf_backwards() throws Exception {
2504 +        for (int k = 1; k < 20; ++k) {
2505 +            CompletableFuture<Integer>[] fs
2506 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2507 +            for (int i = 0; i < k; ++i)
2508 +                fs[i] = new CompletableFuture<>();
2509 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2510 +            for (int i = k - 1; i >= 0; i--) {
2511 +                checkIncomplete(f);
2512 +                checkIncomplete(CompletableFuture.allOf(fs));
2513 +                fs[i].complete(one);
2514 +            }
2515 +            checkCompletedNormally(f, null);
2516 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2517 +        }
2518 +    }
2519 +
2520      /**
2521       * anyOf(no component futures) returns an incomplete future
2522       */
# Line 3359 | Line 2575 | public class CompletableFutureTest exten
2575          Runnable[] throwingActions = {
2576              () -> CompletableFuture.supplyAsync(null),
2577              () -> CompletableFuture.supplyAsync(null, exec),
2578 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2578 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2579  
2580              () -> CompletableFuture.runAsync(null),
2581              () -> CompletableFuture.runAsync(null, exec),
# Line 3432 | Line 2648 | public class CompletableFutureTest exten
2648  
2649              () -> f.thenCompose(null),
2650              () -> f.thenComposeAsync(null),
2651 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2651 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2652              () -> f.thenComposeAsync(null, exec),
2653  
2654              () -> f.exceptionally(null),
# Line 3470 | Line 2686 | public class CompletableFutureTest exten
2686       */
2687      public void testWhenComplete_normalCompletion1() {
2688          for (ExecutionMode m : ExecutionMode.values())
2689 <        for (Integer v1 : new Integer[] { 1, null }) {
2690 <
2691 <        final AtomicInteger a = new AtomicInteger();
2689 >        for (boolean createIncomplete : new boolean[] { true, false })
2690 >        for (Integer v1 : new Integer[] { 1, null })
2691 >    {
2692 >        final AtomicInteger a = new AtomicInteger(0);
2693          final CompletableFuture<Integer> f = new CompletableFuture<>();
2694 <        final CompletableFuture<Integer> g =
2695 <            m.whenComplete(f,
2696 <                           (Integer x, Throwable t) -> {
2697 <                               threadAssertSame(x, v1);
2698 <                               threadAssertNull(t);
2699 <                               a.getAndIncrement();
2700 <                           });
2701 <        f.complete(v1);
2702 <        checkCompletedNormally(f, v1);
2694 >        if (!createIncomplete) f.complete(v1);
2695 >        final CompletableFuture<Integer> g = m.whenComplete
2696 >            (f,
2697 >             (Integer x, Throwable t) -> {
2698 >                threadAssertSame(x, v1);
2699 >                threadAssertNull(t);
2700 >                a.getAndIncrement();
2701 >            });
2702 >        if (createIncomplete) f.complete(v1);
2703 >
2704          checkCompletedNormally(g, v1);
2705 <        assertEquals(a.get(), 1);
2706 <        }
2707 <    }
2705 >        checkCompletedNormally(f, v1);
2706 >        assertEquals(1, a.get());
2707 >    }}
2708  
2709      /**
2710       * whenComplete action executes on exceptional completion, propagating
# Line 3494 | Line 2712 | public class CompletableFutureTest exten
2712       */
2713      public void testWhenComplete_exceptionalCompletion() {
2714          for (ExecutionMode m : ExecutionMode.values())
2715 <        for (Integer v1 : new Integer[] { 1, null }) {
2716 <
2717 <        final AtomicInteger a = new AtomicInteger();
2715 >        for (boolean createIncomplete : new boolean[] { true, false })
2716 >        for (Integer v1 : new Integer[] { 1, null })
2717 >    {
2718 >        final AtomicInteger a = new AtomicInteger(0);
2719          final CFException ex = new CFException();
2720          final CompletableFuture<Integer> f = new CompletableFuture<>();
2721 +        if (!createIncomplete) f.completeExceptionally(ex);
2722          final CompletableFuture<Integer> g = m.whenComplete
2723              (f,
2724               (Integer x, Throwable t) -> {
# Line 3506 | Line 2726 | public class CompletableFutureTest exten
2726                  threadAssertSame(t, ex);
2727                  a.getAndIncrement();
2728              });
2729 <        f.completeExceptionally(ex);
2729 >        if (createIncomplete) f.completeExceptionally(ex);
2730          checkCompletedWithWrappedCFException(f, ex);
2731          checkCompletedWithWrappedCFException(g, ex);
2732 <        assertEquals(a.get(), 1);
2733 <        }
2734 <    }
2732 >        assertEquals(1, a.get());
2733 >    }}
2734 >
2735 >    /**
2736 >     * whenComplete action executes on cancelled source, propagating
2737 >     * CancellationException.
2738 >     */
2739 >    public void testWhenComplete_sourceCancelled() {
2740 >        for (ExecutionMode m : ExecutionMode.values())
2741 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2742 >        for (boolean createIncomplete : new boolean[] { true, false })
2743 >    {
2744 >        final AtomicInteger a = new AtomicInteger(0);
2745 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2746 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2747 >        final CompletableFuture<Integer> g = m.whenComplete
2748 >            (f,
2749 >             (Integer x, Throwable t) -> {
2750 >                threadAssertNull(x);
2751 >                threadAssertTrue(t instanceof CancellationException);
2752 >                a.getAndIncrement();
2753 >            });
2754 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2755 >
2756 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2757 >        checkCompletedWithWrappedCancellationException(g);
2758 >        checkCancelled(f);
2759 >        assertEquals(1, a.get());
2760 >    }}
2761  
2762      /**
2763       * If a whenComplete action throws an exception when triggered by
2764       * a normal completion, it completes exceptionally
2765       */
2766      public void testWhenComplete_actionFailed() {
2767 +        for (boolean createIncomplete : new boolean[] { true, false })
2768          for (ExecutionMode m : ExecutionMode.values())
2769 <        for (Integer v1 : new Integer[] { 1, null }) {
2770 <
2769 >        for (Integer v1 : new Integer[] { 1, null })
2770 >    {
2771 >        final AtomicInteger a = new AtomicInteger(0);
2772          final CFException ex = new CFException();
2773          final CompletableFuture<Integer> f = new CompletableFuture<>();
2774 +        if (!createIncomplete) f.complete(v1);
2775          final CompletableFuture<Integer> g = m.whenComplete
2776              (f,
2777               (Integer x, Throwable t) -> {
2778                  threadAssertSame(x, v1);
2779                  threadAssertNull(t);
2780 +                a.getAndIncrement();
2781                  throw ex;
2782              });
2783 <        f.complete(v1);
2783 >        if (createIncomplete) f.complete(v1);
2784          checkCompletedNormally(f, v1);
2785          checkCompletedWithWrappedCFException(g, ex);
2786 <        }
2787 <    }
2786 >        assertEquals(1, a.get());
2787 >    }}
2788  
2789      /**
2790       * If a whenComplete action throws an exception when triggered by
# Line 3542 | Line 2792 | public class CompletableFutureTest exten
2792       * exception takes precedence.
2793       */
2794      public void testWhenComplete_actionFailedSourceFailed() {
2795 +        for (boolean createIncomplete : new boolean[] { true, false })
2796          for (ExecutionMode m : ExecutionMode.values())
2797 <        for (Integer v1 : new Integer[] { 1, null }) {
2798 <
2797 >        for (Integer v1 : new Integer[] { 1, null })
2798 >    {
2799 >        final AtomicInteger a = new AtomicInteger(0);
2800          final CFException ex1 = new CFException();
2801          final CFException ex2 = new CFException();
2802          final CompletableFuture<Integer> f = new CompletableFuture<>();
2803 +
2804 +        if (!createIncomplete) f.completeExceptionally(ex1);
2805          final CompletableFuture<Integer> g = m.whenComplete
2806              (f,
2807               (Integer x, Throwable t) -> {
2808                  threadAssertSame(t, ex1);
2809                  threadAssertNull(x);
2810 +                a.getAndIncrement();
2811                  throw ex2;
2812              });
2813 <        f.completeExceptionally(ex1);
2813 >        if (createIncomplete) f.completeExceptionally(ex1);
2814 >
2815          checkCompletedWithWrappedCFException(f, ex1);
2816          checkCompletedWithWrappedCFException(g, ex1);
2817 <        }
2818 <    }
3563 <
3564 <    /**
3565 <     * handleAsync action completes normally with function value on
3566 <     * either normal or exceptional completion of source
3567 <     */
3568 <    public void testHandleAsync() {
3569 <        CompletableFuture<Integer> f, g;
3570 <        IntegerHandler r;
3571 <
3572 <        f = new CompletableFuture<>();
3573 <        g = f.handleAsync(r = new IntegerHandler());
3574 <        assertFalse(r.ran);
3575 <        f.completeExceptionally(new CFException());
3576 <        checkCompletedWithWrappedCFException(f);
3577 <        checkCompletedNormally(g, three);
3578 <        assertTrue(r.ran);
3579 <
3580 <        f = new CompletableFuture<>();
3581 <        g = f.handleAsync(r = new IntegerHandler());
3582 <        assertFalse(r.ran);
3583 <        f.completeExceptionally(new CFException());
3584 <        checkCompletedWithWrappedCFException(f);
3585 <        checkCompletedNormally(g, three);
3586 <        assertTrue(r.ran);
3587 <
3588 <        f = new CompletableFuture<>();
3589 <        g = f.handleAsync(r = new IntegerHandler());
3590 <        assertFalse(r.ran);
3591 <        f.complete(one);
3592 <        checkCompletedNormally(f, one);
3593 <        checkCompletedNormally(g, two);
3594 <        assertTrue(r.ran);
3595 <
3596 <        f = new CompletableFuture<>();
3597 <        g = f.handleAsync(r = new IntegerHandler());
3598 <        assertFalse(r.ran);
3599 <        f.complete(one);
3600 <        checkCompletedNormally(f, one);
3601 <        checkCompletedNormally(g, two);
3602 <        assertTrue(r.ran);
3603 <    }
3604 <
3605 <    /**
3606 <     * handleAsync action with Executor completes normally with
3607 <     * function value on either normal or exceptional completion of
3608 <     * source
3609 <     */
3610 <    public void testHandleAsync2() {
3611 <        CompletableFuture<Integer> f, g;
3612 <        ThreadExecutor exec = new ThreadExecutor();
3613 <        IntegerHandler r;
3614 <
3615 <        f = new CompletableFuture<>();
3616 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3617 <        assertFalse(r.ran);
3618 <        f.completeExceptionally(new CFException());
3619 <        checkCompletedWithWrappedCFException(f);
3620 <        checkCompletedNormally(g, three);
3621 <        assertTrue(r.ran);
3622 <
3623 <        f = new CompletableFuture<>();
3624 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3625 <        assertFalse(r.ran);
3626 <        f.completeExceptionally(new CFException());
3627 <        checkCompletedWithWrappedCFException(f);
3628 <        checkCompletedNormally(g, three);
3629 <        assertTrue(r.ran);
3630 <
3631 <        f = new CompletableFuture<>();
3632 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3633 <        assertFalse(r.ran);
3634 <        f.complete(one);
3635 <        checkCompletedNormally(f, one);
3636 <        checkCompletedNormally(g, two);
3637 <        assertTrue(r.ran);
3638 <
3639 <        f = new CompletableFuture<>();
3640 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3641 <        assertFalse(r.ran);
3642 <        f.complete(one);
3643 <        checkCompletedNormally(f, one);
3644 <        checkCompletedNormally(g, two);
3645 <        assertTrue(r.ran);
3646 <    }
2817 >        assertEquals(1, a.get());
2818 >    }}
2819  
2820   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines