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.43 by jsr166, Mon Jun 2 04:13:54 2014 UTC vs.
Revision 1.64 by jsr166, Fri Jun 6 17:08:48 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 NoopConsumer extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        NoopConsumer(ExecutionMode m) { super(m); }
367          public void accept(Integer x) {
368 <            invocationCount++;
369 <            value = inc(x);
368 >            invoked();
369 >            value = 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);
783 >             CompletionStage<? extends T> g,
784 >             Function<? super T,U> a);
785 >    }
786  
787 +    /**
788 +     * exceptionally action is not invoked when source completes
789 +     * normally, and source result is propagated
790 +     */
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  
655    }
811  
812      /**
813       * exceptionally action completes with function value on source
814 <     * exception; otherwise with source value
814 >     * exception
815       */
816 <    public void testExceptionally() {
817 <        CompletableFuture<Integer> f = new CompletableFuture<>();
818 <        ExceptionToInteger r = new ExceptionToInteger();
819 <        CompletableFuture<Integer> g = f.exceptionally(r);
820 <        f.completeExceptionally(new CFException());
821 <        checkCompletedNormally(g, three);
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 <        r = new ExceptionToInteger();
835 <        g = f.exceptionally(r);
836 <        f.complete(one);
837 <        checkCompletedNormally(g, one);
838 <    }
833 >        checkCompletedNormally(g, v1);
834 >        assertEquals(1, a.get());
835 >    }}
836 >
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 >        checkCompletedWithWrappedCFException(g, ex2);
856 >        assertEquals(1, a.get());
857 >    }}
858  
859      /**
860 <     * handle action completes normally with function value on either
861 <     * normal or exceptional completion of source
860 >     * handle action completes normally with function value on normal
861 >     * completion of source
862       */
863 <    public void testHandle() {
864 <        CompletableFuture<Integer> f, g;
865 <        IntegerHandler r;
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 <        f = new CompletableFuture<>();
883 <        f.completeExceptionally(new CFException());
884 <        g = f.handle(r = new IntegerHandler());
885 <        assertTrue(r.ran);
687 <        checkCompletedNormally(g, three);
882 >        checkCompletedNormally(g, inc(v1));
883 >        checkCompletedNormally(f, v1);
884 >        assertEquals(1, a.get());
885 >    }}
886  
887 <        f = new CompletableFuture<>();
888 <        g = f.handle(r = new IntegerHandler());
889 <        assertFalse(r.ran);
890 <        f.completeExceptionally(new CFException());
891 <        checkCompletedNormally(g, three);
892 <        assertTrue(r.ran);
887 >    /**
888 >     * handle action completes normally with function value on
889 >     * exceptional completion of source
890 >     */
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 <        f = new CompletableFuture<>();
912 <        f.complete(one);
913 <        g = f.handle(r = new IntegerHandler());
914 <        assertTrue(r.ran);
700 <        checkCompletedNormally(g, two);
911 >        checkCompletedNormally(g, v1);
912 >        checkCompletedWithWrappedCFException(f, ex);
913 >        assertEquals(1, a.get());
914 >    }}
915  
916 <        f = new CompletableFuture<>();
917 <        g = f.handle(r = new IntegerHandler());
918 <        assertFalse(r.ran);
919 <        f.complete(one);
920 <        assertTrue(r.ran);
921 <        checkCompletedNormally(g, two);
922 <    }
916 >    /**
917 >     * handle action completes normally with function value on
918 >     * cancelled source
919 >     */
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 >        checkCompletedNormally(g, v1);
941 >        checkCancelled(f);
942 >        assertEquals(1, a.get());
943 >    }}
944  
945      /**
946 <     * runAsync completes after running Runnable
946 >     * handle result completes exceptionally if action does
947       */
948 <    public void testRunAsync() {
949 <        Noop r = new Noop();
950 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
951 <        assertNull(f.join());
952 <        assertTrue(r.ran);
953 <        checkCompletedNormally(f, null);
954 <    }
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 >        checkCompletedWithWrappedCFException(g, ex2);
969 >        checkCompletedWithWrappedCFException(f, ex1);
970 >        assertEquals(1, a.get());
971 >    }}
972 >
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 >        checkCompletedWithWrappedCFException(g, ex);
994 >        checkCompletedNormally(f, v1);
995 >        assertEquals(1, a.get());
996 >    }}
997  
998      /**
999 <     * runAsync with executor completes after running Runnable
999 >     * runAsync completes after running Runnable
1000       */
1001 <    public void testRunAsync2() {
1002 <        Noop r = new Noop();
1003 <        ThreadExecutor exec = new ThreadExecutor();
1004 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
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());
729        assertTrue(r.ran);
1011          checkCompletedNormally(f, null);
1012 <        assertEquals(1, exec.count.get());
1013 <    }
1012 >        r.assertInvoked();
1013 >    }}
1014  
1015      /**
1016       * failing runAsync completes exceptionally after running Runnable
1017       */
1018 <    public void testRunAsync3() {
1019 <        FailingNoop r = new FailingNoop();
1020 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
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 <        assertTrue(r.ran);
1029 <    }
1028 >        r.assertInvoked();
1029 >    }}
1030  
1031      /**
1032       * supplyAsync completes with result of supplier
1033       */
1034 <    public void testSupplyAsync() {
1035 <        CompletableFuture<Integer> f;
1036 <        f = CompletableFuture.supplyAsync(supplyOne);
1037 <        assertEquals(f.join(), one);
1038 <        checkCompletedNormally(f, one);
1039 <    }
1040 <
1041 <    /**
1042 <     * supplyAsync with executor completes with result of supplier
1043 <     */
1044 <    public void testSupplyAsync2() {
1045 <        CompletableFuture<Integer> f;
1046 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1047 <        assertEquals(f.join(), one);
761 <        checkCompletedNormally(f, one);
762 <    }
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       * Failing supplyAsync completes exceptionally
1051       */
1052 <    public void testSupplyAsync3() {
1053 <        FailingSupplier r = new FailingSupplier();
1054 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
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 <        assertTrue(r.ran);
1063 <    }
1062 >        r.assertInvoked();
1063 >    }}
1064  
1065      // seq completion methods
1066  
1067      /**
1068       * thenRun result completes normally after normal completion of source
1069       */
1070 <    public void testThenRun() {
1071 <        CompletableFuture<Integer> f;
1072 <        CompletableFuture<Void> g;
1073 <        Noop r;
1074 <
1075 <        f = new CompletableFuture<>();
1076 <        g = f.thenRun(r = new Noop());
1077 <        f.complete(null);
1078 <        checkCompletedNormally(g, null);
1079 <        assertTrue(r.ran);
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  
790        f = new CompletableFuture<>();
791        f.complete(null);
792        g = f.thenRun(r = new Noop());
1084          checkCompletedNormally(g, null);
1085 <        assertTrue(r.ran);
1086 <    }
1085 >        checkCompletedNormally(f, v1);
1086 >        r.assertInvoked();
1087 >    }}
1088  
1089      /**
1090       * thenRun result completes exceptionally after exceptional
1091       * completion of source
1092       */
1093 <    public void testThenRun2() {
1094 <        CompletableFuture<Integer> f;
1095 <        CompletableFuture<Void> g;
1096 <        Noop r;
1097 <
1098 <        f = new CompletableFuture<>();
1099 <        g = f.thenRun(r = new Noop());
1100 <        f.completeExceptionally(new CFException());
1101 <        checkCompletedWithWrappedCFException(g);
1102 <        assertFalse(r.ran);
1103 <
1104 <        f = new CompletableFuture<>();
1105 <        f.completeExceptionally(new CFException());
814 <        g = f.thenRun(r = new Noop());
815 <        checkCompletedWithWrappedCFException(g);
816 <        assertFalse(r.ran);
817 <    }
818 <
819 <    /**
820 <     * thenRun result completes exceptionally if action does
821 <     */
822 <    public void testThenRun3() {
823 <        CompletableFuture<Integer> f;
824 <        CompletableFuture<Void> g;
825 <        FailingNoop r;
826 <
827 <        f = new CompletableFuture<>();
828 <        g = f.thenRun(r = new FailingNoop());
829 <        f.complete(null);
830 <        checkCompletedWithWrappedCFException(g);
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 <        f = new CompletableFuture<>();
1108 <        f.complete(null);
1109 <        g = f.thenRun(r = new FailingNoop());
1110 <        checkCompletedWithWrappedCFException(g);
836 <    }
1107 >        checkCompletedWithWrappedCFException(g, ex);
1108 >        checkCompletedWithWrappedCFException(f, ex);
1109 >        r.assertNotInvoked();
1110 >    }}
1111  
1112      /**
1113       * thenRun result completes exceptionally if source cancelled
1114       */
1115 <    public void testThenRun4() {
1116 <        CompletableFuture<Integer> f;
1117 <        CompletableFuture<Void> g;
1118 <        Noop r;
1119 <
1120 <        f = new CompletableFuture<>();
1121 <        g = f.thenRun(r = new Noop());
1122 <        assertTrue(f.cancel(true));
1123 <        checkCompletedWithWrappedCancellationException(g);
1124 <
1125 <        f = new CompletableFuture<>();
1126 <        assertTrue(f.cancel(true));
1127 <        g = f.thenRun(r = new Noop());
854 <        checkCompletedWithWrappedCancellationException(g);
855 <    }
856 <
857 <    /**
858 <     * thenApply result completes normally after normal completion of source
859 <     */
860 <    public void testThenApply() {
861 <        CompletableFuture<Integer> f = new CompletableFuture<>();
862 <        CompletableFuture<Integer> g = f.thenApply(inc);
863 <        f.complete(one);
864 <        checkCompletedNormally(g, two);
865 <    }
866 <
867 <    /**
868 <     * thenApply result completes exceptionally after exceptional
869 <     * completion of source
870 <     */
871 <    public void testThenApply2() {
872 <        CompletableFuture<Integer> f = new CompletableFuture<>();
873 <        CompletableFuture<Integer> g = f.thenApply(inc);
874 <        f.completeExceptionally(new CFException());
875 <        checkCompletedWithWrappedCFException(g);
876 <    }
877 <
878 <    /**
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 <    }
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  
888    /**
889     * thenApply result completes exceptionally if source cancelled
890     */
891    public void testThenApply4() {
892        CompletableFuture<Integer> f = new CompletableFuture<>();
893        CompletableFuture<Integer> g = f.thenApply(inc);
894        assertTrue(f.cancel(true));
1129          checkCompletedWithWrappedCancellationException(g);
1130 <    }
1131 <
1132 <    /**
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);
906 <        checkCompletedNormally(g, null);
907 <        assertEquals(r.value, (Integer) 2);
908 <    }
1130 >        checkCancelled(f);
1131 >        r.assertNotInvoked();
1132 >    }}
1133  
1134      /**
1135 <     * thenAccept result completes exceptionally after exceptional
912 <     * completion of source
1135 >     * thenRun result completes exceptionally if action does
1136       */
1137 <    public void testThenAccept2() {
1138 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1139 <        IncAction r = new IncAction();
1140 <        CompletableFuture<Void> g = f.thenAccept(r);
1141 <        f.completeExceptionally(new CFException());
1142 <        checkCompletedWithWrappedCFException(g);
1143 <    }
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 >    {
1142 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
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 >        }
1150  
922    /**
923     * thenAccept result completes exceptionally if action does
924     */
925    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);
1151          checkCompletedWithWrappedCFException(g);
1152 <        assertTrue(r.ran);
1153 <    }
933 <
934 <    /**
935 <     * thenAccept result completes exceptionally if source cancelled
936 <     */
937 <    public void testThenAccept4() {
938 <        CompletableFuture<Integer> f = new CompletableFuture<>();
939 <        IncAction r = new IncAction();
940 <        CompletableFuture<Void> g = f.thenAccept(r);
941 <        assertTrue(f.cancel(true));
942 <        checkCompletedWithWrappedCancellationException(g);
943 <    }
1152 >        checkCompletedNormally(f, v1);
1153 >    }}
1154  
1155      /**
1156 <     * thenCombine result completes normally after normal completion
947 <     * of sources
1156 >     * thenApply result completes normally after normal completion of source
1157       */
1158 <    public void testThenCombine_normalCompletion1() {
950 <        for (boolean createdIncomplete : new boolean[] { true, false })
951 <        for (boolean fFirst : new boolean[] { true, false })
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 }) {
955 <
1162 >    {
1163          final CompletableFuture<Integer> f = new CompletableFuture<>();
1164 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1165 <        final SubtractFunction r = new SubtractFunction();
1166 <        CompletableFuture<Integer> h = null;
1167 <        if (createdIncomplete) h = m.thenCombine(f, g, r);
1168 <
962 <        if (fFirst)
963 <            f.complete(v1);
964 <        else
965 <            g.complete(v2);
966 <        if (createdIncomplete) checkIncomplete(h);
967 <        assertEquals(r.invocationCount, 0);
968 <        if (!fFirst)
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 <        else
971 <            g.complete(v2);
972 <        if (!createdIncomplete) h = m.thenCombine(f, g, r);
1170 >        }
1171  
1172 <        checkCompletedNormally(h, subtract(v1, v2));
1172 >        checkCompletedNormally(g, inc(v1));
1173          checkCompletedNormally(f, v1);
1174 <        checkCompletedNormally(g, v2);
1175 <        assertEquals(r.invocationCount, 1);
978 <        }
979 <    }
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 <
989 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
990 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
991 <        final SubtractFunction r = new SubtractFunction();
992 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1183 >        for (boolean createIncomplete : new boolean[] { true, false })
1184 >    {
1185          final CFException ex = new CFException();
994
995        f.completeExceptionally(ex);
996        checkIncomplete(h);
997        g.complete(v1);
998
999        checkCompletedWithWrappedCFException(h, ex);
1000        checkCompletedWithWrappedCFException(f, ex);
1001        assertEquals(r.invocationCount, 0);
1002        checkCompletedNormally(g, v1);
1003        }
1004    }
1005
1006    public void testThenCombine_exceptionalCompletion2() {
1007        for (ExecutionMode m : ExecutionMode.values())
1008        for (Integer v1 : new Integer[] { 1, null }) {
1009
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);
1017 <        checkIncomplete(h);
1018 <        f.complete(v1);
1019 <
1020 <        checkCompletedWithWrappedCFException(h, ex);
1021 <        checkCompletedWithWrappedCFException(g, ex);
1022 <        assertEquals(r.invocationCount, 0);
1023 <        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          }
1025    }
1026
1027    public void testThenCombine_exceptionalCompletion3() {
1028        for (ExecutionMode m : ExecutionMode.values())
1029        for (Integer v1 : new Integer[] { 1, null }) {
1030
1031        final CompletableFuture<Integer> f = new CompletableFuture<>();
1032        final CompletableFuture<Integer> g = new CompletableFuture<>();
1033        final SubtractFunction r = new SubtractFunction();
1034        final CFException ex = new CFException();
1194  
1036        g.completeExceptionally(ex);
1037        f.complete(v1);
1038        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1039
1040        checkCompletedWithWrappedCFException(h, ex);
1195          checkCompletedWithWrappedCFException(g, ex);
1196 <        assertEquals(r.invocationCount, 0);
1197 <        checkCompletedNormally(f, v1);
1198 <        }
1045 <    }
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);
1058 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1059 <
1060 <        checkCompletedWithWrappedCFException(h, ex);
1061 <        checkCompletedWithWrappedCFException(f, ex);
1062 <        assertEquals(r.invocationCount, 0);
1063 <        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 }) {
1074 <
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);
1087 <        }
1088 <    }
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 }) {
1094 <
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 NoopConsumer r = new NoopConsumer(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 >        r.assertValue(v1);
1262          checkCompletedNormally(f, v1);
1263 <        checkCompletedNormally(g, v2);
1107 <        }
1108 <    }
1263 >    }}
1264  
1265      /**
1266 <     * thenCombine result completes exceptionally if either source cancelled
1266 >     * thenAccept result completes exceptionally after exceptional
1267 >     * completion of source
1268       */
1269 <    public void testThenCombine_sourceCancelled1() {
1269 >    public void testThenAccept_exceptionalCompletion() {
1270          for (ExecutionMode m : ExecutionMode.values())
1271 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1272 <        for (Integer v1 : new Integer[] { 1, null }) {
1273 <
1271 >        for (boolean createIncomplete : new boolean[] { true, false })
1272 >    {
1273 >        final CFException ex = new CFException();
1274          final CompletableFuture<Integer> f = new CompletableFuture<>();
1275 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1276 <        final SubtractFunction r = new SubtractFunction();
1277 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1278 <
1279 <        assertTrue(f.cancel(mayInterruptIfRunning));
1280 <        checkIncomplete(h);
1125 <        g.complete(v1);
1126 <
1127 <        checkCompletedWithWrappedCancellationException(h);
1128 <        checkCancelled(f);
1129 <        assertEquals(r.invocationCount, 0);
1130 <        checkCompletedNormally(g, v1);
1275 >        final NoopConsumer r = new NoopConsumer(m);
1276 >        if (!createIncomplete) f.completeExceptionally(ex);
1277 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1278 >        if (createIncomplete) {
1279 >            checkIncomplete(g);
1280 >            f.completeExceptionally(ex);
1281          }
1132    }
1133
1134    public void testThenCombine_sourceCancelled2() {
1135        for (ExecutionMode m : ExecutionMode.values())
1136        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1137        for (Integer v1 : new Integer[] { 1, null }) {
1282  
1283 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1284 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1285 <        final SubtractFunction r = new SubtractFunction();
1286 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1143 <
1144 <        assertTrue(g.cancel(mayInterruptIfRunning));
1145 <        checkIncomplete(h);
1146 <        f.complete(v1);
1147 <
1148 <        checkCompletedWithWrappedCancellationException(h);
1149 <        checkCancelled(g);
1150 <        assertEquals(r.invocationCount, 0);
1151 <        checkCompletedNormally(f, v1);
1152 <        }
1153 <    }
1283 >        checkCompletedWithWrappedCFException(g, ex);
1284 >        checkCompletedWithWrappedCFException(f, ex);
1285 >        r.assertNotInvoked();
1286 >    }}
1287  
1288 <    public void testThenCombine_sourceCancelled3() {
1288 >    /**
1289 >     * thenAccept result completes exceptionally if source cancelled
1290 >     */
1291 >    public void testThenAccept_sourceCancelled() {
1292          for (ExecutionMode m : ExecutionMode.values())
1293 +        for (boolean createIncomplete : new boolean[] { true, false })
1294          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1295 <        for (Integer v1 : new Integer[] { 1, null }) {
1159 <
1295 >    {
1296          final CompletableFuture<Integer> f = new CompletableFuture<>();
1297 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1298 <        final SubtractFunction r = new SubtractFunction();
1299 <
1300 <        assertTrue(g.cancel(mayInterruptIfRunning));
1301 <        f.complete(v1);
1302 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1167 <
1168 <        checkCompletedWithWrappedCancellationException(h);
1169 <        checkCancelled(g);
1170 <        assertEquals(r.invocationCount, 0);
1171 <        checkCompletedNormally(f, v1);
1297 >        final NoopConsumer r = new NoopConsumer(m);
1298 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1299 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1300 >        if (createIncomplete) {
1301 >            checkIncomplete(g);
1302 >            assertTrue(f.cancel(mayInterruptIfRunning));
1303          }
1173    }
1304  
1305 <    public void testThenCombine_sourceCancelled4() {
1176 <        for (ExecutionMode m : ExecutionMode.values())
1177 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1178 <        for (Integer v1 : new Integer[] { 1, null }) {
1179 <
1180 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1181 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1182 <        final SubtractFunction r = new SubtractFunction();
1183 <
1184 <        assertTrue(f.cancel(mayInterruptIfRunning));
1185 <        g.complete(v1);
1186 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1187 <
1188 <        checkCompletedWithWrappedCancellationException(h);
1305 >        checkCompletedWithWrappedCancellationException(g);
1306          checkCancelled(f);
1307 <        assertEquals(r.invocationCount, 0);
1308 <        checkCompletedNormally(g, v1);
1192 <        }
1193 <    }
1307 >        r.assertNotInvoked();
1308 >    }}
1309  
1310      /**
1311 <     * thenAcceptBoth result completes normally after normal
1197 <     * completion of sources
1311 >     * thenAccept result completes exceptionally if action does
1312       */
1313 <    public void testThenAcceptBoth_normalCompletion1() {
1313 >    public void testThenAccept_actionFailed() {
1314          for (ExecutionMode m : ExecutionMode.values())
1315 +        for (boolean createIncomplete : new boolean[] { true, false })
1316          for (Integer v1 : new Integer[] { 1, null })
1317 <        for (Integer v2 : new Integer[] { 2, null }) {
1203 <
1317 >    {
1318          final CompletableFuture<Integer> f = new CompletableFuture<>();
1319 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1320 <        final SubtractAction r = new SubtractAction();
1321 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1322 <
1323 <        f.complete(v1);
1324 <        checkIncomplete(h);
1211 <        assertFalse(r.ran());
1212 <        g.complete(v2);
1213 <
1214 <        checkCompletedNormally(h, null);
1215 <        assertEquals(r.value, subtract(v1, v2));
1216 <        checkCompletedNormally(f, v1);
1217 <        checkCompletedNormally(g, v2);
1319 >        final FailingConsumer r = new FailingConsumer(m);
1320 >        if (!createIncomplete) f.complete(v1);
1321 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1322 >        if (createIncomplete) {
1323 >            checkIncomplete(g);
1324 >            f.complete(v1);
1325          }
1219    }
1326  
1327 <    public void testThenAcceptBoth_normalCompletion2() {
1222 <        for (ExecutionMode m : ExecutionMode.values())
1223 <        for (Integer v1 : new Integer[] { 1, null })
1224 <        for (Integer v2 : new Integer[] { 2, null }) {
1225 <
1226 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1227 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1228 <        final SubtractAction r = new SubtractAction();
1229 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1230 <
1231 <        g.complete(v2);
1232 <        checkIncomplete(h);
1233 <        assertFalse(r.ran());
1234 <        f.complete(v1);
1235 <
1236 <        checkCompletedNormally(h, null);
1237 <        assertEquals(r.value, subtract(v1, v2));
1327 >        checkCompletedWithWrappedCFException(g);
1328          checkCompletedNormally(f, v1);
1329 <        checkCompletedNormally(g, v2);
1240 <        }
1241 <    }
1329 >    }}
1330  
1331 <    public void testThenAcceptBoth_normalCompletion3() {
1331 >    /**
1332 >     * thenCombine result completes normally after normal completion
1333 >     * of sources
1334 >     */
1335 >    public void testThenCombine_normalCompletion() {
1336          for (ExecutionMode m : ExecutionMode.values())
1337 +        for (boolean createIncomplete : new boolean[] { true, false })
1338 +        for (boolean fFirst : new boolean[] { true, false })
1339          for (Integer v1 : new Integer[] { 1, null })
1340 <        for (Integer v2 : new Integer[] { 2, null }) {
1341 <
1340 >        for (Integer v2 : new Integer[] { 2, null })
1341 >    {
1342          final CompletableFuture<Integer> f = new CompletableFuture<>();
1343          final CompletableFuture<Integer> g = new CompletableFuture<>();
1344 <        final SubtractAction r = new SubtractAction();
1344 >        final SubtractFunction r = new SubtractFunction(m);
1345  
1346 <        g.complete(v2);
1347 <        f.complete(v1);
1348 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1349 <
1350 <        checkCompletedNormally(h, null);
1351 <        assertEquals(r.value, subtract(v1, v2));
1352 <        checkCompletedNormally(f, v1);
1353 <        checkCompletedNormally(g, v2);
1346 >        if (fFirst) f.complete(v1); else g.complete(v2);
1347 >        if (!createIncomplete)
1348 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1349 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1350 >        if (createIncomplete) {
1351 >            checkIncomplete(h);
1352 >            r.assertNotInvoked();
1353 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1354          }
1261    }
1262
1263    public void testThenAcceptBoth_normalCompletion4() {
1264        for (ExecutionMode m : ExecutionMode.values())
1265        for (Integer v1 : new Integer[] { 1, null })
1266        for (Integer v2 : new Integer[] { 2, null }) {
1267
1268        final CompletableFuture<Integer> f = new CompletableFuture<>();
1269        final CompletableFuture<Integer> g = new CompletableFuture<>();
1270        final SubtractAction r = new SubtractAction();
1355  
1356 <        f.complete(v1);
1273 <        g.complete(v2);
1274 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1275 <
1276 <        checkCompletedNormally(h, null);
1277 <        assertEquals(r.value, subtract(v1, v2));
1356 >        checkCompletedNormally(h, subtract(v1, v2));
1357          checkCompletedNormally(f, v1);
1358          checkCompletedNormally(g, v2);
1359 <        }
1360 <    }
1359 >        r.assertInvoked();
1360 >    }}
1361  
1362      /**
1363 <     * thenAcceptBoth result completes exceptionally after exceptional
1363 >     * thenCombine result completes exceptionally after exceptional
1364       * completion of either source
1365       */
1366 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1366 >    public void testThenCombine_exceptionalCompletion() {
1367          for (ExecutionMode m : ExecutionMode.values())
1368 <        for (Integer v1 : new Integer[] { 1, null }) {
1369 <
1368 >        for (boolean createIncomplete : new boolean[] { true, false })
1369 >        for (boolean fFirst : new boolean[] { true, false })
1370 >        for (Integer v1 : new Integer[] { 1, null })
1371 >    {
1372          final CompletableFuture<Integer> f = new CompletableFuture<>();
1373          final CompletableFuture<Integer> g = new CompletableFuture<>();
1293        final SubtractAction r = new SubtractAction();
1294        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1374          final CFException ex = new CFException();
1375 +        final SubtractFunction r = new SubtractFunction(m);
1376  
1377 <        f.completeExceptionally(ex);
1378 <        checkIncomplete(h);
1379 <        g.complete(v1);
1380 <
1381 <        checkCompletedWithWrappedCFException(h, ex);
1382 <        checkCompletedWithWrappedCFException(f, ex);
1383 <        assertEquals(r.invocationCount, 0);
1304 <        checkCompletedNormally(g, v1);
1377 >        (fFirst ? f : g).complete(v1);
1378 >        if (!createIncomplete)
1379 >            (!fFirst ? f : g).completeExceptionally(ex);
1380 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1381 >        if (createIncomplete) {
1382 >            checkIncomplete(h);
1383 >            (!fFirst ? f : g).completeExceptionally(ex);
1384          }
1306    }
1307
1308    public void testThenAcceptBoth_exceptionalCompletion2() {
1309        for (ExecutionMode m : ExecutionMode.values())
1310        for (Integer v1 : new Integer[] { 1, null }) {
1311
1312        final CompletableFuture<Integer> f = new CompletableFuture<>();
1313        final CompletableFuture<Integer> g = new CompletableFuture<>();
1314        final SubtractAction r = new SubtractAction();
1315        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1316        final CFException ex = new CFException();
1317
1318        g.completeExceptionally(ex);
1319        checkIncomplete(h);
1320        f.complete(v1);
1385  
1386          checkCompletedWithWrappedCFException(h, ex);
1387 <        checkCompletedWithWrappedCFException(g, ex);
1388 <        assertEquals(r.invocationCount, 0);
1389 <        checkCompletedNormally(f, v1);
1390 <        }
1327 <    }
1387 >        r.assertNotInvoked();
1388 >        checkCompletedNormally(fFirst ? f : g, v1);
1389 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1390 >    }}
1391  
1392 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1392 >    /**
1393 >     * thenCombine result completes exceptionally if either source cancelled
1394 >     */
1395 >    public void testThenCombine_sourceCancelled() {
1396          for (ExecutionMode m : ExecutionMode.values())
1397 <        for (Integer v1 : new Integer[] { 1, null }) {
1398 <
1397 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398 >        for (boolean createIncomplete : new boolean[] { true, false })
1399 >        for (boolean fFirst : new boolean[] { true, false })
1400 >        for (Integer v1 : new Integer[] { 1, null })
1401 >    {
1402          final CompletableFuture<Integer> f = new CompletableFuture<>();
1403          final CompletableFuture<Integer> g = new CompletableFuture<>();
1404 <        final SubtractAction r = new SubtractAction();
1336 <        final CFException ex = new CFException();
1404 >        final SubtractFunction r = new SubtractFunction(m);
1405  
1406 <        g.completeExceptionally(ex);
1407 <        f.complete(v1);
1408 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1409 <
1410 <        checkCompletedWithWrappedCFException(h, ex);
1411 <        checkCompletedWithWrappedCFException(g, ex);
1412 <        assertEquals(r.invocationCount, 0);
1345 <        checkCompletedNormally(f, v1);
1406 >        (fFirst ? f : g).complete(v1);
1407 >        if (!createIncomplete)
1408 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1409 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1410 >        if (createIncomplete) {
1411 >            checkIncomplete(h);
1412 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1413          }
1347    }
1348
1349    public void testThenAcceptBoth_exceptionalCompletion4() {
1350        for (ExecutionMode m : ExecutionMode.values())
1351        for (Integer v1 : new Integer[] { 1, null }) {
1352
1353        final CompletableFuture<Integer> f = new CompletableFuture<>();
1354        final CompletableFuture<Integer> g = new CompletableFuture<>();
1355        final SubtractAction r = new SubtractAction();
1356        final CFException ex = new CFException();
1414  
1415 <        f.completeExceptionally(ex);
1416 <        g.complete(v1);
1417 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1418 <
1419 <        checkCompletedWithWrappedCFException(h, ex);
1363 <        checkCompletedWithWrappedCFException(f, ex);
1364 <        assertFalse(r.ran());
1365 <        checkCompletedNormally(g, v1);
1366 <        }
1367 <    }
1415 >        checkCompletedWithWrappedCancellationException(h);
1416 >        checkCancelled(!fFirst ? f : g);
1417 >        r.assertNotInvoked();
1418 >        checkCompletedNormally(fFirst ? f : g, v1);
1419 >    }}
1420  
1421      /**
1422 <     * thenAcceptBoth result completes exceptionally if action does
1422 >     * thenCombine result completes exceptionally if action does
1423       */
1424 <    public void testThenAcceptBoth_actionFailed1() {
1424 >    public void testThenCombine_actionFailed() {
1425          for (ExecutionMode m : ExecutionMode.values())
1426 +        for (boolean fFirst : new boolean[] { true, false })
1427          for (Integer v1 : new Integer[] { 1, null })
1428 <        for (Integer v2 : new Integer[] { 2, null }) {
1429 <
1428 >        for (Integer v2 : new Integer[] { 2, null })
1429 >    {
1430          final CompletableFuture<Integer> f = new CompletableFuture<>();
1431          final CompletableFuture<Integer> g = new CompletableFuture<>();
1432 <        final FailingBiConsumer r = new FailingBiConsumer();
1433 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1432 >        final FailingBiFunction r = new FailingBiFunction(m);
1433 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1434  
1435 <        f.complete(v1);
1436 <        checkIncomplete(h);
1437 <        g.complete(v2);
1435 >        if (fFirst) {
1436 >            f.complete(v1);
1437 >            g.complete(v2);
1438 >        } else {
1439 >            g.complete(v2);
1440 >            f.complete(v1);
1441 >        }
1442  
1443          checkCompletedWithWrappedCFException(h);
1444          checkCompletedNormally(f, v1);
1445          checkCompletedNormally(g, v2);
1446 <        }
1390 <    }
1446 >    }}
1447  
1448 <    public void testThenAcceptBoth_actionFailed2() {
1448 >    /**
1449 >     * thenAcceptBoth result completes normally after normal
1450 >     * completion of sources
1451 >     */
1452 >    public void testThenAcceptBoth_normalCompletion() {
1453          for (ExecutionMode m : ExecutionMode.values())
1454 +        for (boolean createIncomplete : new boolean[] { true, false })
1455 +        for (boolean fFirst : new boolean[] { true, false })
1456          for (Integer v1 : new Integer[] { 1, null })
1457 <        for (Integer v2 : new Integer[] { 2, null }) {
1458 <
1457 >        for (Integer v2 : new Integer[] { 2, null })
1458 >    {
1459          final CompletableFuture<Integer> f = new CompletableFuture<>();
1460          final CompletableFuture<Integer> g = new CompletableFuture<>();
1461 <        final FailingBiConsumer r = new FailingBiConsumer();
1400 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1461 >        final SubtractAction r = new SubtractAction(m);
1462  
1463 <        g.complete(v2);
1464 <        checkIncomplete(h);
1465 <        f.complete(v1);
1463 >        if (fFirst) f.complete(v1); else g.complete(v2);
1464 >        if (!createIncomplete)
1465 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1466 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1467 >        if (createIncomplete) {
1468 >            checkIncomplete(h);
1469 >            r.assertNotInvoked();
1470 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1471 >        }
1472  
1473 <        checkCompletedWithWrappedCFException(h);
1473 >        checkCompletedNormally(h, null);
1474 >        r.assertValue(subtract(v1, v2));
1475          checkCompletedNormally(f, v1);
1476          checkCompletedNormally(g, v2);
1477 <        }
1410 <    }
1477 >    }}
1478  
1479      /**
1480 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1480 >     * thenAcceptBoth result completes exceptionally after exceptional
1481 >     * completion of either source
1482       */
1483 <    public void testThenAcceptBoth_sourceCancelled1() {
1483 >    public void testThenAcceptBoth_exceptionalCompletion() {
1484          for (ExecutionMode m : ExecutionMode.values())
1485 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1486 <        for (Integer v1 : new Integer[] { 1, null }) {
1487 <
1485 >        for (boolean createIncomplete : new boolean[] { true, false })
1486 >        for (boolean fFirst : new boolean[] { true, false })
1487 >        for (Integer v1 : new Integer[] { 1, null })
1488 >    {
1489          final CompletableFuture<Integer> f = new CompletableFuture<>();
1490          final CompletableFuture<Integer> g = new CompletableFuture<>();
1491 <        final SubtractAction r = new SubtractAction();
1492 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1424 <
1425 <        assertTrue(f.cancel(mayInterruptIfRunning));
1426 <        checkIncomplete(h);
1427 <        g.complete(v1);
1428 <
1429 <        checkCompletedWithWrappedCancellationException(h);
1430 <        checkCancelled(f);
1431 <        assertEquals(r.invocationCount, 0);
1432 <        checkCompletedNormally(g, v1);
1433 <        }
1434 <    }
1435 <
1436 <    public void testThenAcceptBoth_sourceCancelled2() {
1437 <        for (ExecutionMode m : ExecutionMode.values())
1438 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1439 <        for (Integer v1 : new Integer[] { 1, null }) {
1491 >        final CFException ex = new CFException();
1492 >        final SubtractAction r = new SubtractAction(m);
1493  
1494 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1495 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1496 <        final SubtractAction r = new SubtractAction();
1494 >        (fFirst ? f : g).complete(v1);
1495 >        if (!createIncomplete)
1496 >            (!fFirst ? f : g).completeExceptionally(ex);
1497          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1498 <
1499 <        assertTrue(g.cancel(mayInterruptIfRunning));
1500 <        checkIncomplete(h);
1448 <        f.complete(v1);
1449 <
1450 <        checkCompletedWithWrappedCancellationException(h);
1451 <        checkCancelled(g);
1452 <        assertEquals(r.invocationCount, 0);
1453 <        checkCompletedNormally(f, v1);
1498 >        if (createIncomplete) {
1499 >            checkIncomplete(h);
1500 >            (!fFirst ? f : g).completeExceptionally(ex);
1501          }
1455    }
1456
1457    public void testThenAcceptBoth_sourceCancelled3() {
1458        for (ExecutionMode m : ExecutionMode.values())
1459        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1460        for (Integer v1 : new Integer[] { 1, null }) {
1461
1462        final CompletableFuture<Integer> f = new CompletableFuture<>();
1463        final CompletableFuture<Integer> g = new CompletableFuture<>();
1464        final SubtractAction r = new SubtractAction();
1502  
1503 <        assertTrue(g.cancel(mayInterruptIfRunning));
1504 <        f.complete(v1);
1505 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1506 <
1507 <        checkCompletedWithWrappedCancellationException(h);
1471 <        checkCancelled(g);
1472 <        assertEquals(r.invocationCount, 0);
1473 <        checkCompletedNormally(f, v1);
1474 <        }
1475 <    }
1503 >        checkCompletedWithWrappedCFException(h, ex);
1504 >        r.assertNotInvoked();
1505 >        checkCompletedNormally(fFirst ? f : g, v1);
1506 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1507 >    }}
1508  
1509 <    public void testThenAcceptBoth_sourceCancelled4() {
1509 >    /**
1510 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1511 >     */
1512 >    public void testThenAcceptBoth_sourceCancelled() {
1513          for (ExecutionMode m : ExecutionMode.values())
1514          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515 <        for (Integer v1 : new Integer[] { 1, null }) {
1516 <
1515 >        for (boolean createIncomplete : new boolean[] { true, false })
1516 >        for (boolean fFirst : new boolean[] { true, false })
1517 >        for (Integer v1 : new Integer[] { 1, null })
1518 >    {
1519          final CompletableFuture<Integer> f = new CompletableFuture<>();
1520          final CompletableFuture<Integer> g = new CompletableFuture<>();
1521 <        final SubtractAction r = new SubtractAction();
1521 >        final SubtractAction r = new SubtractAction(m);
1522  
1523 <        assertTrue(f.cancel(mayInterruptIfRunning));
1524 <        g.complete(v1);
1523 >        (fFirst ? f : g).complete(v1);
1524 >        if (!createIncomplete)
1525 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1526          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1527 +        if (createIncomplete) {
1528 +            checkIncomplete(h);
1529 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1530 +        }
1531  
1532          checkCompletedWithWrappedCancellationException(h);
1533 <        checkCancelled(f);
1534 <        assertEquals(r.invocationCount, 0);
1535 <        checkCompletedNormally(g, v1);
1536 <        }
1495 <    }
1533 >        checkCancelled(!fFirst ? f : g);
1534 >        r.assertNotInvoked();
1535 >        checkCompletedNormally(fFirst ? f : g, v1);
1536 >    }}
1537  
1538      /**
1539 <     * runAfterBoth result completes normally after normal
1499 <     * completion of sources
1539 >     * thenAcceptBoth result completes exceptionally if action does
1540       */
1541 <    public void testRunAfterBoth_normalCompletion1() {
1541 >    public void testThenAcceptBoth_actionFailed() {
1542          for (ExecutionMode m : ExecutionMode.values())
1543 +        for (boolean fFirst : new boolean[] { true, false })
1544          for (Integer v1 : new Integer[] { 1, null })
1545 <        for (Integer v2 : new Integer[] { 2, null }) {
1546 <
1545 >        for (Integer v2 : new Integer[] { 2, null })
1546 >    {
1547          final CompletableFuture<Integer> f = new CompletableFuture<>();
1548          final CompletableFuture<Integer> g = new CompletableFuture<>();
1549 <        final Noop r = new Noop();
1550 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1510 <
1511 <        f.complete(v1);
1512 <        checkIncomplete(h);
1513 <        assertFalse(r.ran);
1514 <        g.complete(v2);
1549 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1550 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1551  
1552 <        checkCompletedNormally(h, null);
1553 <        assertEquals(r.invocationCount, 1);
1554 <        checkCompletedNormally(f, v1);
1555 <        checkCompletedNormally(g, v2);
1552 >        if (fFirst) {
1553 >            f.complete(v1);
1554 >            g.complete(v2);
1555 >        } else {
1556 >            g.complete(v2);
1557 >            f.complete(v1);
1558          }
1521    }
1522
1523    public void testRunAfterBoth_normalCompletion2() {
1524        for (ExecutionMode m : ExecutionMode.values())
1525        for (Integer v1 : new Integer[] { 1, null })
1526        for (Integer v2 : new Integer[] { 2, null }) {
1527
1528        final CompletableFuture<Integer> f = new CompletableFuture<>();
1529        final CompletableFuture<Integer> g = new CompletableFuture<>();
1530        final Noop r = new Noop();
1531        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1532
1533        g.complete(v2);
1534        checkIncomplete(h);
1535        assertFalse(r.ran);
1536        f.complete(v1);
1559  
1560 <        checkCompletedNormally(h, null);
1539 <        assertEquals(r.invocationCount, 1);
1560 >        checkCompletedWithWrappedCFException(h);
1561          checkCompletedNormally(f, v1);
1562          checkCompletedNormally(g, v2);
1563 <        }
1543 <    }
1563 >    }}
1564  
1565 <    public void testRunAfterBoth_normalCompletion3() {
1565 >    /**
1566 >     * runAfterBoth result completes normally after normal
1567 >     * completion of sources
1568 >     */
1569 >    public void testRunAfterBoth_normalCompletion() {
1570          for (ExecutionMode m : ExecutionMode.values())
1571 +        for (boolean createIncomplete : new boolean[] { true, false })
1572 +        for (boolean fFirst : new boolean[] { true, false })
1573          for (Integer v1 : new Integer[] { 1, null })
1574 <        for (Integer v2 : new Integer[] { 2, null }) {
1575 <
1574 >        for (Integer v2 : new Integer[] { 2, null })
1575 >    {
1576          final CompletableFuture<Integer> f = new CompletableFuture<>();
1577          final CompletableFuture<Integer> g = new CompletableFuture<>();
1578 <        final Noop r = new Noop();
1578 >        final Noop r = new Noop(m);
1579  
1580 <        g.complete(v2);
1581 <        f.complete(v1);
1580 >        if (fFirst) f.complete(v1); else g.complete(v2);
1581 >        if (!createIncomplete)
1582 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1583          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 <
1585 <        checkCompletedNormally(h, null);
1586 <        assertTrue(r.ran);
1587 <        checkCompletedNormally(f, v1);
1561 <        checkCompletedNormally(g, v2);
1584 >        if (createIncomplete) {
1585 >            checkIncomplete(h);
1586 >            r.assertNotInvoked();
1587 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1588          }
1563    }
1564
1565    public void testRunAfterBoth_normalCompletion4() {
1566        for (ExecutionMode m : ExecutionMode.values())
1567        for (Integer v1 : new Integer[] { 1, null })
1568        for (Integer v2 : new Integer[] { 2, null }) {
1569
1570        final CompletableFuture<Integer> f = new CompletableFuture<>();
1571        final CompletableFuture<Integer> g = new CompletableFuture<>();
1572        final Noop r = new Noop();
1573
1574        f.complete(v1);
1575        g.complete(v2);
1576        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1589  
1590          checkCompletedNormally(h, null);
1591 <        assertEquals(r.invocationCount, 1);
1591 >        r.assertInvoked();
1592          checkCompletedNormally(f, v1);
1593          checkCompletedNormally(g, v2);
1594 <        }
1583 <    }
1594 >    }}
1595  
1596      /**
1597       * runAfterBoth result completes exceptionally after exceptional
1598       * completion of either source
1599       */
1600 <    public void testRunAfterBoth_exceptionalCompletion1() {
1600 >    public void testRunAfterBoth_exceptionalCompletion() {
1601          for (ExecutionMode m : ExecutionMode.values())
1602 <        for (Integer v1 : new Integer[] { 1, null }) {
1603 <
1604 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1605 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1595 <        final Noop r = new Noop();
1596 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1597 <        final CFException ex = new CFException();
1598 <
1599 <        f.completeExceptionally(ex);
1600 <        checkIncomplete(h);
1601 <        g.complete(v1);
1602 <
1603 <        checkCompletedWithWrappedCFException(h, ex);
1604 <        checkCompletedWithWrappedCFException(f, ex);
1605 <        assertEquals(r.invocationCount, 0);
1606 <        checkCompletedNormally(g, v1);
1607 <        }
1608 <    }
1609 <
1610 <    public void testRunAfterBoth_exceptionalCompletion2() {
1611 <        for (ExecutionMode m : ExecutionMode.values())
1612 <        for (Integer v1 : new Integer[] { 1, null }) {
1613 <
1614 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1615 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1616 <        final Noop r = new Noop();
1617 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1618 <        final CFException ex = new CFException();
1619 <
1620 <        g.completeExceptionally(ex);
1621 <        checkIncomplete(h);
1622 <        f.complete(v1);
1623 <
1624 <        checkCompletedWithWrappedCFException(h, ex);
1625 <        checkCompletedWithWrappedCFException(g, ex);
1626 <        assertEquals(r.invocationCount, 0);
1627 <        checkCompletedNormally(f, v1);
1628 <        }
1629 <    }
1630 <
1631 <    public void testRunAfterBoth_exceptionalCompletion3() {
1632 <        for (ExecutionMode m : ExecutionMode.values())
1633 <        for (Integer v1 : new Integer[] { 1, null }) {
1634 <
1602 >        for (boolean createIncomplete : new boolean[] { true, false })
1603 >        for (boolean fFirst : new boolean[] { true, false })
1604 >        for (Integer v1 : new Integer[] { 1, null })
1605 >    {
1606          final CompletableFuture<Integer> f = new CompletableFuture<>();
1607          final CompletableFuture<Integer> g = new CompletableFuture<>();
1637        final Noop r = new Noop();
1608          final CFException ex = new CFException();
1609 +        final Noop r = new Noop(m);
1610  
1611 <        g.completeExceptionally(ex);
1612 <        f.complete(v1);
1611 >        (fFirst ? f : g).complete(v1);
1612 >        if (!createIncomplete)
1613 >            (!fFirst ? f : g).completeExceptionally(ex);
1614          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1615 <
1616 <        checkCompletedWithWrappedCFException(h, ex);
1617 <        checkCompletedWithWrappedCFException(g, ex);
1646 <        assertEquals(r.invocationCount, 0);
1647 <        checkCompletedNormally(f, v1);
1615 >        if (createIncomplete) {
1616 >            checkIncomplete(h);
1617 >            (!fFirst ? f : g).completeExceptionally(ex);
1618          }
1649    }
1650
1651    public void testRunAfterBoth_exceptionalCompletion4() {
1652        for (ExecutionMode m : ExecutionMode.values())
1653        for (Integer v1 : new Integer[] { 1, null }) {
1654
1655        final CompletableFuture<Integer> f = new CompletableFuture<>();
1656        final CompletableFuture<Integer> g = new CompletableFuture<>();
1657        final Noop r = new Noop();
1658        final CFException ex = new CFException();
1659
1660        f.completeExceptionally(ex);
1661        g.complete(v1);
1662        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1619  
1620          checkCompletedWithWrappedCFException(h, ex);
1621 <        checkCompletedWithWrappedCFException(f, ex);
1622 <        assertEquals(r.invocationCount, 0);
1623 <        checkCompletedNormally(g, v1);
1624 <        }
1669 <    }
1621 >        r.assertNotInvoked();
1622 >        checkCompletedNormally(fFirst ? f : g, v1);
1623 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1624 >    }}
1625  
1626      /**
1627 <     * runAfterBoth result completes exceptionally if action does
1627 >     * runAfterBoth result completes exceptionally if either source cancelled
1628       */
1629 <    public void testRunAfterBoth_actionFailed1() {
1629 >    public void testRunAfterBoth_sourceCancelled() {
1630          for (ExecutionMode m : ExecutionMode.values())
1631 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632 +        for (boolean createIncomplete : new boolean[] { true, false })
1633 +        for (boolean fFirst : new boolean[] { true, false })
1634          for (Integer v1 : new Integer[] { 1, null })
1635 <        for (Integer v2 : new Integer[] { 2, null }) {
1678 <
1635 >    {
1636          final CompletableFuture<Integer> f = new CompletableFuture<>();
1637          final CompletableFuture<Integer> g = new CompletableFuture<>();
1638 <        final FailingNoop r = new FailingNoop();
1682 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1638 >        final Noop r = new Noop(m);
1639  
1684        f.complete(v1);
1685        checkIncomplete(h);
1686        g.complete(v2);
1640  
1641 <        checkCompletedWithWrappedCFException(h);
1642 <        checkCompletedNormally(f, v1);
1643 <        checkCompletedNormally(g, v2);
1691 <        }
1692 <    }
1693 <
1694 <    public void testRunAfterBoth_actionFailed2() {
1695 <        for (ExecutionMode m : ExecutionMode.values())
1696 <        for (Integer v1 : new Integer[] { 1, null })
1697 <        for (Integer v2 : new Integer[] { 2, null }) {
1698 <
1699 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1700 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1701 <        final FailingNoop r = new FailingNoop();
1641 >        (fFirst ? f : g).complete(v1);
1642 >        if (!createIncomplete)
1643 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1644          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1645 <
1646 <        g.complete(v2);
1647 <        checkIncomplete(h);
1706 <        f.complete(v1);
1707 <
1708 <        checkCompletedWithWrappedCFException(h);
1709 <        checkCompletedNormally(f, v1);
1710 <        checkCompletedNormally(g, v2);
1645 >        if (createIncomplete) {
1646 >            checkIncomplete(h);
1647 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1648          }
1712    }
1713
1714    /**
1715     * runAfterBoth result completes exceptionally if either source cancelled
1716     */
1717    public void testRunAfterBoth_sourceCancelled1() {
1718        for (ExecutionMode m : ExecutionMode.values())
1719        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1720        for (Integer v1 : new Integer[] { 1, null }) {
1721
1722        final CompletableFuture<Integer> f = new CompletableFuture<>();
1723        final CompletableFuture<Integer> g = new CompletableFuture<>();
1724        final Noop r = new Noop();
1725        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1726
1727        assertTrue(f.cancel(mayInterruptIfRunning));
1728        checkIncomplete(h);
1729        g.complete(v1);
1649  
1650          checkCompletedWithWrappedCancellationException(h);
1651 <        checkCancelled(f);
1652 <        assertEquals(r.invocationCount, 0);
1653 <        checkCompletedNormally(g, v1);
1654 <        }
1736 <    }
1651 >        checkCancelled(!fFirst ? f : g);
1652 >        r.assertNotInvoked();
1653 >        checkCompletedNormally(fFirst ? f : g, v1);
1654 >    }}
1655  
1656 <    public void testRunAfterBoth_sourceCancelled2() {
1656 >    /**
1657 >     * runAfterBoth result completes exceptionally if action does
1658 >     */
1659 >    public void testRunAfterBoth_actionFailed() {
1660          for (ExecutionMode m : ExecutionMode.values())
1661 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1662 <        for (Integer v1 : new Integer[] { 1, null }) {
1663 <
1661 >        for (boolean fFirst : new boolean[] { true, false })
1662 >        for (Integer v1 : new Integer[] { 1, null })
1663 >        for (Integer v2 : new Integer[] { 2, null })
1664 >    {
1665          final CompletableFuture<Integer> f = new CompletableFuture<>();
1666          final CompletableFuture<Integer> g = new CompletableFuture<>();
1667 <        final Noop r = new Noop();
1668 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1747 <
1748 <        assertTrue(g.cancel(mayInterruptIfRunning));
1749 <        checkIncomplete(h);
1750 <        f.complete(v1);
1667 >        final FailingRunnable r1 = new FailingRunnable(m);
1668 >        final FailingRunnable r2 = new FailingRunnable(m);
1669  
1670 <        checkCompletedWithWrappedCancellationException(h);
1671 <        checkCancelled(g);
1672 <        assertEquals(r.invocationCount, 0);
1673 <        checkCompletedNormally(f, v1);
1670 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1671 >        if (fFirst) {
1672 >            f.complete(v1);
1673 >            g.complete(v2);
1674 >        } else {
1675 >            g.complete(v2);
1676 >            f.complete(v1);
1677          }
1678 <    }
1758 <
1759 <    public void testRunAfterBoth_sourceCancelled3() {
1760 <        for (ExecutionMode m : ExecutionMode.values())
1761 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1762 <        for (Integer v1 : new Integer[] { 1, null }) {
1678 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1679  
1680 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1681 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1766 <        final Noop r = new Noop();
1767 <
1768 <        assertTrue(g.cancel(mayInterruptIfRunning));
1769 <        f.complete(v1);
1770 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1771 <
1772 <        checkCompletedWithWrappedCancellationException(h);
1773 <        checkCancelled(g);
1774 <        assertEquals(r.invocationCount, 0);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682          checkCompletedNormally(f, v1);
1683 <        }
1684 <    }
1778 <
1779 <    public void testRunAfterBoth_sourceCancelled4() {
1780 <        for (ExecutionMode m : ExecutionMode.values())
1781 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1782 <        for (Integer v1 : new Integer[] { 1, null }) {
1783 <
1784 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1785 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1786 <        final Noop r = new Noop();
1787 <
1788 <        assertTrue(f.cancel(mayInterruptIfRunning));
1789 <        g.complete(v1);
1790 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1791 <
1792 <        checkCompletedWithWrappedCancellationException(h);
1793 <        checkCancelled(f);
1794 <        assertEquals(r.invocationCount, 0);
1795 <        checkCompletedNormally(g, v1);
1796 <        }
1797 <    }
1683 >        checkCompletedNormally(g, v2);
1684 >    }}
1685  
1686      /**
1687       * applyToEither result completes normally after normal completion
1688       * of either source
1689       */
1690 <    public void testApplyToEither_normalCompletion1() {
1690 >    public void testApplyToEither_normalCompletion() {
1691          for (ExecutionMode m : ExecutionMode.values())
1692          for (Integer v1 : new Integer[] { 1, null })
1693 <        for (Integer v2 : new Integer[] { 2, null }) {
1694 <
1693 >        for (Integer v2 : new Integer[] { 2, null })
1694 >    {
1695          final CompletableFuture<Integer> f = new CompletableFuture<>();
1696          final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 <        final IncFunction r = new IncFunction();
1698 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1697 >        final IncFunction[] rs = new IncFunction[6];
1698 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1699  
1700 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1701 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1702 +        checkIncomplete(h0);
1703 +        checkIncomplete(h1);
1704 +        rs[0].assertNotInvoked();
1705 +        rs[1].assertNotInvoked();
1706          f.complete(v1);
1707 <        checkCompletedNormally(h, inc(v1));
1707 >        checkCompletedNormally(h0, inc(v1));
1708 >        checkCompletedNormally(h1, inc(v1));
1709 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1710 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1711 >        checkCompletedNormally(h2, inc(v1));
1712 >        checkCompletedNormally(h3, inc(v1));
1713          g.complete(v2);
1714  
1715 <        checkCompletedNormally(f, v1);
1716 <        checkCompletedNormally(g, v2);
1717 <        checkCompletedNormally(h, inc(v1));
1718 <        }
1719 <    }
1720 <
1721 <    public void testApplyToEither_normalCompletion2() {
1722 <        for (ExecutionMode m : ExecutionMode.values())
1723 <        for (Integer v1 : new Integer[] { 1, null })
1826 <        for (Integer v2 : new Integer[] { 2, null }) {
1827 <
1828 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1829 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1830 <        final IncFunction r = new IncFunction();
1831 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1832 <
1833 <        g.complete(v2);
1834 <        checkCompletedNormally(h, inc(v2));
1835 <        f.complete(v1);
1715 >        // unspecified behavior - both source completions available
1716 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1717 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1718 >        rs[4].assertValue(h4.join());
1719 >        rs[5].assertValue(h5.join());
1720 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1721 >                   Objects.equals(inc(v2), h4.join()));
1722 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1723 >                   Objects.equals(inc(v2), h5.join()));
1724  
1725          checkCompletedNormally(f, v1);
1726          checkCompletedNormally(g, v2);
1727 <        checkCompletedNormally(h, inc(v2));
1728 <        }
1729 <    }
1730 <    public void testApplyToEither_normalCompletion3() {
1731 <        for (ExecutionMode m : ExecutionMode.values())
1732 <        for (Integer v1 : new Integer[] { 1, null })
1845 <        for (Integer v2 : new Integer[] { 2, null }) {
1846 <
1847 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1848 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1849 <        final IncFunction r = new IncFunction();
1850 <
1851 <        f.complete(v1);
1852 <        g.complete(v2);
1853 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1854 <
1855 <        checkCompletedNormally(f, v1);
1856 <        checkCompletedNormally(g, v2);
1857 <
1858 <        // unspecified behavior
1859 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1860 <                   Objects.equals(h.join(), inc(v2)));
1861 <        assertEquals(r.invocationCount, 1);
1862 <        }
1863 <    }
1727 >        checkCompletedNormally(h0, inc(v1));
1728 >        checkCompletedNormally(h1, inc(v1));
1729 >        checkCompletedNormally(h2, inc(v1));
1730 >        checkCompletedNormally(h3, inc(v1));
1731 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1732 >    }}
1733  
1734      /**
1735       * applyToEither result completes exceptionally after exceptional
1736       * completion of either source
1737       */
1738 <    public void testApplyToEither_exceptionalCompletion1() {
1738 >    public void testApplyToEither_exceptionalCompletion() {
1739          for (ExecutionMode m : ExecutionMode.values())
1740 <        for (Integer v1 : new Integer[] { 1, null }) {
1741 <
1740 >        for (Integer v1 : new Integer[] { 1, null })
1741 >    {
1742          final CompletableFuture<Integer> f = new CompletableFuture<>();
1743          final CompletableFuture<Integer> g = new CompletableFuture<>();
1875        final IncFunction r = new IncFunction();
1876        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1744          final CFException ex = new CFException();
1745 +        final IncFunction[] rs = new IncFunction[6];
1746 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1747  
1748 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1749 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1750 +        checkIncomplete(h0);
1751 +        checkIncomplete(h1);
1752 +        rs[0].assertNotInvoked();
1753 +        rs[1].assertNotInvoked();
1754          f.completeExceptionally(ex);
1755 <        checkCompletedWithWrappedCFException(h, ex);
1755 >        checkCompletedWithWrappedCFException(h0, ex);
1756 >        checkCompletedWithWrappedCFException(h1, ex);
1757 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1758 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1759 >        checkCompletedWithWrappedCFException(h2, ex);
1760 >        checkCompletedWithWrappedCFException(h3, ex);
1761          g.complete(v1);
1762  
1763 <        assertEquals(r.invocationCount, 0);
1764 <        checkCompletedNormally(g, v1);
1765 <        checkCompletedWithWrappedCFException(f, ex);
1886 <        checkCompletedWithWrappedCFException(h, ex);
1887 <        }
1888 <    }
1889 <
1890 <    public void testApplyToEither_exceptionalCompletion2() {
1891 <        for (ExecutionMode m : ExecutionMode.values())
1892 <        for (Integer v1 : new Integer[] { 1, null }) {
1893 <
1894 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1895 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1896 <        final IncFunction r = new IncFunction();
1897 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1898 <        final CFException ex = new CFException();
1899 <
1900 <        g.completeExceptionally(ex);
1901 <        checkCompletedWithWrappedCFException(h, ex);
1902 <        f.complete(v1);
1903 <
1904 <        assertEquals(r.invocationCount, 0);
1905 <        checkCompletedNormally(f, v1);
1906 <        checkCompletedWithWrappedCFException(g, ex);
1907 <        checkCompletedWithWrappedCFException(h, ex);
1908 <        }
1909 <    }
1910 <
1911 <    public void testApplyToEither_exceptionalCompletion3() {
1912 <        for (ExecutionMode m : ExecutionMode.values())
1913 <        for (Integer v1 : new Integer[] { 1, null }) {
1914 <
1915 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1916 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1917 <        final IncFunction r = new IncFunction();
1918 <        final CFException ex = new CFException();
1919 <
1920 <        g.completeExceptionally(ex);
1921 <        f.complete(v1);
1922 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1923 <
1924 <        // unspecified behavior
1925 <        Integer v;
1763 >        // unspecified behavior - both source completions available
1764 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1765 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1766          try {
1767 <            assertEquals(h.join(), inc(v1));
1768 <            assertEquals(r.invocationCount, 1);
1767 >            assertEquals(inc(v1), h4.join());
1768 >            rs[4].assertInvoked();
1769          } catch (CompletionException ok) {
1770 <            checkCompletedWithWrappedCFException(h, ex);
1771 <            assertEquals(r.invocationCount, 0);
1770 >            checkCompletedWithWrappedCFException(h4, ex);
1771 >            rs[4].assertNotInvoked();
1772          }
1933
1934        checkCompletedWithWrappedCFException(g, ex);
1935        checkCompletedNormally(f, v1);
1936        }
1937    }
1938
1939    public void testApplyToEither_exceptionalCompletion4() {
1940        for (ExecutionMode m : ExecutionMode.values())
1941        for (Integer v1 : new Integer[] { 1, null }) {
1942
1943        final CompletableFuture<Integer> f = new CompletableFuture<>();
1944        final CompletableFuture<Integer> g = new CompletableFuture<>();
1945        final IncFunction r = new IncFunction();
1946        final CFException ex = new CFException();
1947
1948        f.completeExceptionally(ex);
1949        g.complete(v1);
1950        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1951
1952        // unspecified behavior
1953        Integer v;
1773          try {
1774 <            assertEquals(h.join(), inc(v1));
1775 <            assertEquals(r.invocationCount, 1);
1774 >            assertEquals(inc(v1), h5.join());
1775 >            rs[5].assertInvoked();
1776          } catch (CompletionException ok) {
1777 <            checkCompletedWithWrappedCFException(h, ex);
1778 <            assertEquals(r.invocationCount, 0);
1777 >            checkCompletedWithWrappedCFException(h5, ex);
1778 >            rs[5].assertNotInvoked();
1779          }
1780  
1781          checkCompletedWithWrappedCFException(f, ex);
1782          checkCompletedNormally(g, v1);
1783 <        }
1784 <    }
1785 <
1786 <    /**
1787 <     * applyToEither result completes exceptionally if action does
1788 <     */
1789 <    public void testApplyToEither_actionFailed1() {
1971 <        for (ExecutionMode m : ExecutionMode.values())
1972 <        for (Integer v1 : new Integer[] { 1, null })
1973 <        for (Integer v2 : new Integer[] { 2, null }) {
1974 <
1975 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1976 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1977 <        final FailingFunction r = new FailingFunction();
1978 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1979 <
1980 <        f.complete(v1);
1981 <        checkCompletedWithWrappedCFException(h);
1982 <        g.complete(v2);
1983 <        checkCompletedNormally(f, v1);
1984 <        checkCompletedNormally(g, v2);
1985 <        }
1986 <    }
1987 <
1988 <    public void testApplyToEither_actionFailed2() {
1989 <        for (ExecutionMode m : ExecutionMode.values())
1990 <        for (Integer v1 : new Integer[] { 1, null })
1991 <        for (Integer v2 : new Integer[] { 2, null }) {
1992 <
1993 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1994 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1995 <        final FailingFunction r = new FailingFunction();
1996 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1997 <
1998 <        g.complete(v2);
1999 <        checkCompletedWithWrappedCFException(h);
2000 <        f.complete(v1);
2001 <        checkCompletedNormally(f, v1);
2002 <        checkCompletedNormally(g, v2);
2003 <        }
2004 <    }
1783 >        checkCompletedWithWrappedCFException(h0, ex);
1784 >        checkCompletedWithWrappedCFException(h1, ex);
1785 >        checkCompletedWithWrappedCFException(h2, ex);
1786 >        checkCompletedWithWrappedCFException(h3, ex);
1787 >        checkCompletedWithWrappedCFException(h4, ex);
1788 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1789 >    }}
1790  
1791      /**
1792       * applyToEither result completes exceptionally if either source cancelled
1793       */
1794 <    public void testApplyToEither_sourceCancelled1() {
1794 >    public void testApplyToEither_sourceCancelled() {
1795          for (ExecutionMode m : ExecutionMode.values())
1796          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1797 <        for (Integer v1 : new Integer[] { 1, null }) {
1798 <
1797 >        for (Integer v1 : new Integer[] { 1, null })
1798 >    {
1799          final CompletableFuture<Integer> f = new CompletableFuture<>();
1800          final CompletableFuture<Integer> g = new CompletableFuture<>();
1801 <        final IncFunction r = new IncFunction();
1802 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1801 >        final IncFunction[] rs = new IncFunction[6];
1802 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1803  
1804 <        assertTrue(f.cancel(mayInterruptIfRunning));
1805 <        checkCompletedWithWrappedCancellationException(h);
1804 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1805 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1806 >        checkIncomplete(h0);
1807 >        checkIncomplete(h1);
1808 >        rs[0].assertNotInvoked();
1809 >        rs[1].assertNotInvoked();
1810 >        f.cancel(mayInterruptIfRunning);
1811 >        checkCompletedWithWrappedCancellationException(h0);
1812 >        checkCompletedWithWrappedCancellationException(h1);
1813 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1814 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1815 >        checkCompletedWithWrappedCancellationException(h2);
1816 >        checkCompletedWithWrappedCancellationException(h3);
1817          g.complete(v1);
1818  
1819 <        checkCancelled(f);
1820 <        assertEquals(r.invocationCount, 0);
1821 <        checkCompletedNormally(g, v1);
2026 <        checkCompletedWithWrappedCancellationException(h);
2027 <        }
2028 <    }
2029 <
2030 <    public void testApplyToEither_sourceCancelled2() {
2031 <        for (ExecutionMode m : ExecutionMode.values())
2032 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2033 <        for (Integer v1 : new Integer[] { 1, null }) {
2034 <
2035 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2036 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2037 <        final IncFunction r = new IncFunction();
2038 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2039 <
2040 <        assertTrue(g.cancel(mayInterruptIfRunning));
2041 <        checkCompletedWithWrappedCancellationException(h);
2042 <        f.complete(v1);
2043 <
2044 <        checkCancelled(g);
2045 <        assertEquals(r.invocationCount, 0);
2046 <        checkCompletedNormally(f, v1);
2047 <        checkCompletedWithWrappedCancellationException(h);
2048 <        }
2049 <    }
2050 <
2051 <    public void testApplyToEither_sourceCancelled3() {
2052 <        for (ExecutionMode m : ExecutionMode.values())
2053 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2054 <        for (Integer v1 : new Integer[] { 1, null }) {
2055 <
2056 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2057 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2058 <        final IncFunction r = new IncFunction();
2059 <
2060 <        assertTrue(g.cancel(mayInterruptIfRunning));
2061 <        f.complete(v1);
2062 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2063 <
2064 <        // unspecified behavior
2065 <        Integer v;
1819 >        // unspecified behavior - both source completions available
1820 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1821 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1822          try {
1823 <            assertEquals(h.join(), inc(v1));
1824 <            assertEquals(r.invocationCount, 1);
1823 >            assertEquals(inc(v1), h4.join());
1824 >            rs[4].assertInvoked();
1825          } catch (CompletionException ok) {
1826 <            checkCompletedWithWrappedCancellationException(h);
1827 <            assertEquals(r.invocationCount, 0);
2072 <        }
2073 <
2074 <        checkCancelled(g);
2075 <        checkCompletedNormally(f, v1);
1826 >            checkCompletedWithWrappedCancellationException(h4);
1827 >            rs[4].assertNotInvoked();
1828          }
2077    }
2078
2079    public void testApplyToEither_sourceCancelled4() {
2080        for (ExecutionMode m : ExecutionMode.values())
2081        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2082        for (Integer v1 : new Integer[] { 1, null }) {
2083
2084        final CompletableFuture<Integer> f = new CompletableFuture<>();
2085        final CompletableFuture<Integer> g = new CompletableFuture<>();
2086        final IncFunction r = new IncFunction();
2087
2088        assertTrue(f.cancel(mayInterruptIfRunning));
2089        g.complete(v1);
2090        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2091
2092        // unspecified behavior
2093        Integer v;
1829          try {
1830 <            assertEquals(h.join(), inc(v1));
1831 <            assertEquals(r.invocationCount, 1);
1830 >            assertEquals(inc(v1), h5.join());
1831 >            rs[5].assertInvoked();
1832          } catch (CompletionException ok) {
1833 <            checkCompletedWithWrappedCancellationException(h);
1834 <            assertEquals(r.invocationCount, 0);
1833 >            checkCompletedWithWrappedCancellationException(h5);
1834 >            rs[5].assertNotInvoked();
1835          }
1836  
1837          checkCancelled(f);
1838          checkCompletedNormally(g, v1);
1839 <        }
1840 <    }
1839 >        checkCompletedWithWrappedCancellationException(h0);
1840 >        checkCompletedWithWrappedCancellationException(h1);
1841 >        checkCompletedWithWrappedCancellationException(h2);
1842 >        checkCompletedWithWrappedCancellationException(h3);
1843 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1844 >    }}
1845  
1846      /**
1847 <     * acceptEither result completes normally after normal completion
2109 <     * of either source
1847 >     * applyToEither result completes exceptionally if action does
1848       */
1849 <    public void testAcceptEither_normalCompletion1() {
1849 >    public void testApplyToEither_actionFailed() {
1850          for (ExecutionMode m : ExecutionMode.values())
1851          for (Integer v1 : new Integer[] { 1, null })
1852 <        for (Integer v2 : new Integer[] { 2, null }) {
1853 <
1852 >        for (Integer v2 : new Integer[] { 2, null })
1853 >    {
1854          final CompletableFuture<Integer> f = new CompletableFuture<>();
1855          final CompletableFuture<Integer> g = new CompletableFuture<>();
1856 <        final IncAction r = new IncAction();
1857 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1856 >        final FailingFunction[] rs = new FailingFunction[6];
1857 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1858  
1859 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1860 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1861          f.complete(v1);
1862 <        checkCompletedNormally(h, null);
1863 <        assertEquals(r.value, inc(v1));
1864 <        g.complete(v2);
1862 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1863 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1864 >        checkCompletedWithWrappedCFException(h0);
1865 >        checkCompletedWithWrappedCFException(h1);
1866 >        checkCompletedWithWrappedCFException(h2);
1867 >        checkCompletedWithWrappedCFException(h3);
1868 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1869  
1870 <        checkCompletedNormally(f, v1);
2127 <        checkCompletedNormally(g, v2);
2128 <        checkCompletedNormally(h, null);
2129 <        }
2130 <    }
1870 >        g.complete(v2);
1871  
1872 <    public void testAcceptEither_normalCompletion2() {
1873 <        for (ExecutionMode m : ExecutionMode.values())
1874 <        for (Integer v1 : new Integer[] { 1, null })
2135 <        for (Integer v2 : new Integer[] { 2, null }) {
1872 >        // unspecified behavior - both source completions available
1873 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1874 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1875  
1876 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1877 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1878 <        final IncAction r = new IncAction();
1879 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1880 <
1881 <        g.complete(v2);
2143 <        checkCompletedNormally(h, null);
2144 <        assertEquals(r.value, inc(v2));
2145 <        f.complete(v1);
1876 >        checkCompletedWithWrappedCFException(h4);
1877 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1878 >                   Objects.equals(v2, rs[4].value));
1879 >        checkCompletedWithWrappedCFException(h5);
1880 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1881 >                   Objects.equals(v2, rs[5].value));
1882  
1883          checkCompletedNormally(f, v1);
1884          checkCompletedNormally(g, v2);
1885 <        checkCompletedNormally(h, null);
1886 <        }
1887 <    }
1888 <    public void testAcceptEither_normalCompletion3() {
1885 >    }}
1886 >
1887 >    /**
1888 >     * acceptEither result completes normally after normal completion
1889 >     * of either source
1890 >     */
1891 >    public void testAcceptEither_normalCompletion() {
1892          for (ExecutionMode m : ExecutionMode.values())
1893          for (Integer v1 : new Integer[] { 1, null })
1894 <        for (Integer v2 : new Integer[] { 2, null }) {
1895 <
1894 >        for (Integer v2 : new Integer[] { 2, null })
1895 >    {
1896          final CompletableFuture<Integer> f = new CompletableFuture<>();
1897          final CompletableFuture<Integer> g = new CompletableFuture<>();
1898 <        final IncAction r = new IncAction();
1898 >        final NoopConsumer[] rs = new NoopConsumer[6];
1899 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1900 >
1901 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1902 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1903 >        checkIncomplete(h0);
1904 >        checkIncomplete(h1);
1905 >        rs[0].assertNotInvoked();
1906 >        rs[1].assertNotInvoked();
1907 >        f.complete(v1);
1908 >        checkCompletedNormally(h0, null);
1909 >        checkCompletedNormally(h1, null);
1910 >        rs[0].assertValue(v1);
1911 >        rs[1].assertValue(v1);
1912 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1913 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1914 >        checkCompletedNormally(h2, null);
1915 >        checkCompletedNormally(h3, null);
1916 >        rs[2].assertValue(v1);
1917 >        rs[3].assertValue(v1);
1918 >        g.complete(v2);
1919 >
1920 >        // unspecified behavior - both source completions available
1921 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1922 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1923 >        checkCompletedNormally(h4, null);
1924 >        checkCompletedNormally(h5, null);
1925 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1926 >                   Objects.equals(v2, rs[4].value));
1927 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1928 >                   Objects.equals(v2, rs[5].value));
1929  
2161        f.complete(v1);
2162        g.complete(v2);
2163        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2164
2165        checkCompletedNormally(h, null);
1930          checkCompletedNormally(f, v1);
1931          checkCompletedNormally(g, v2);
1932 <
1933 <        // unspecified behavior
1934 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
1935 <                   Objects.equals(r.value, inc(v2)));
1936 <        }
1937 <    }
1932 >        checkCompletedNormally(h0, null);
1933 >        checkCompletedNormally(h1, null);
1934 >        checkCompletedNormally(h2, null);
1935 >        checkCompletedNormally(h3, null);
1936 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1937 >    }}
1938  
1939      /**
1940       * acceptEither result completes exceptionally after exceptional
1941       * completion of either source
1942       */
1943 <    public void testAcceptEither_exceptionalCompletion1() {
1943 >    public void testAcceptEither_exceptionalCompletion() {
1944          for (ExecutionMode m : ExecutionMode.values())
1945 <        for (Integer v1 : new Integer[] { 1, null }) {
1946 <
1945 >        for (Integer v1 : new Integer[] { 1, null })
1946 >    {
1947          final CompletableFuture<Integer> f = new CompletableFuture<>();
1948          final CompletableFuture<Integer> g = new CompletableFuture<>();
2185        final IncAction r = new IncAction();
2186        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1949          final CFException ex = new CFException();
1950 +        final NoopConsumer[] rs = new NoopConsumer[6];
1951 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1952  
1953 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1954 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1955 +        checkIncomplete(h0);
1956 +        checkIncomplete(h1);
1957 +        rs[0].assertNotInvoked();
1958 +        rs[1].assertNotInvoked();
1959          f.completeExceptionally(ex);
1960 <        checkCompletedWithWrappedCFException(h, ex);
1961 <        g.complete(v1);
1962 <
1963 <        assertEquals(r.invocationCount, 0);
1964 <        checkCompletedNormally(g, v1);
1965 <        checkCompletedWithWrappedCFException(f, ex);
2196 <        checkCompletedWithWrappedCFException(h, ex);
2197 <        }
2198 <    }
2199 <
2200 <    public void testAcceptEither_exceptionalCompletion2() {
2201 <        for (ExecutionMode m : ExecutionMode.values())
2202 <        for (Integer v1 : new Integer[] { 1, null }) {
2203 <
2204 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2205 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2206 <        final IncAction r = new IncAction();
2207 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2208 <        final CFException ex = new CFException();
2209 <
2210 <        g.completeExceptionally(ex);
2211 <        checkCompletedWithWrappedCFException(h, ex);
2212 <        f.complete(v1);
2213 <
2214 <        assertEquals(r.invocationCount, 0);
2215 <        checkCompletedNormally(f, v1);
2216 <        checkCompletedWithWrappedCFException(g, ex);
2217 <        checkCompletedWithWrappedCFException(h, ex);
2218 <        }
2219 <    }
2220 <
2221 <    public void testAcceptEither_exceptionalCompletion3() {
2222 <        for (ExecutionMode m : ExecutionMode.values())
2223 <        for (Integer v1 : new Integer[] { 1, null }) {
2224 <
2225 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2226 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2227 <        final IncAction r = new IncAction();
2228 <        final CFException ex = new CFException();
1960 >        checkCompletedWithWrappedCFException(h0, ex);
1961 >        checkCompletedWithWrappedCFException(h1, ex);
1962 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1963 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1964 >        checkCompletedWithWrappedCFException(h2, ex);
1965 >        checkCompletedWithWrappedCFException(h3, ex);
1966  
1967 <        g.completeExceptionally(ex);
2231 <        f.complete(v1);
2232 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1967 >        g.complete(v1);
1968  
1969 <        // unspecified behavior
1970 <        Integer v;
1969 >        // unspecified behavior - both source completions available
1970 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1971 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1972          try {
1973 <            assertEquals(h.join(), null);
1974 <            assertEquals(r.invocationCount, 1);
2239 <            assertEquals(inc(v1), r.value);
1973 >            assertNull(h4.join());
1974 >            rs[4].assertValue(v1);
1975          } catch (CompletionException ok) {
1976 <            checkCompletedWithWrappedCFException(h, ex);
1977 <            assertEquals(r.invocationCount, 0);
1976 >            checkCompletedWithWrappedCFException(h4, ex);
1977 >            rs[4].assertNotInvoked();
1978          }
2244
2245        checkCompletedWithWrappedCFException(g, ex);
2246        checkCompletedNormally(f, v1);
2247        }
2248    }
2249
2250    public void testAcceptEither_exceptionalCompletion4() {
2251        for (ExecutionMode m : ExecutionMode.values())
2252        for (Integer v1 : new Integer[] { 1, null }) {
2253
2254        final CompletableFuture<Integer> f = new CompletableFuture<>();
2255        final CompletableFuture<Integer> g = new CompletableFuture<>();
2256        final IncAction r = new IncAction();
2257        final CFException ex = new CFException();
2258
2259        f.completeExceptionally(ex);
2260        g.complete(v1);
2261        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2262
2263        // unspecified behavior
2264        Integer v;
1979          try {
1980 <            assertEquals(h.join(), null);
1981 <            assertEquals(r.invocationCount, 1);
2268 <            assertEquals(inc(v1), r.value);
1980 >            assertNull(h5.join());
1981 >            rs[5].assertValue(v1);
1982          } catch (CompletionException ok) {
1983 <            checkCompletedWithWrappedCFException(h, ex);
1984 <            assertEquals(r.invocationCount, 0);
1983 >            checkCompletedWithWrappedCFException(h5, ex);
1984 >            rs[5].assertNotInvoked();
1985          }
1986  
1987          checkCompletedWithWrappedCFException(f, ex);
1988          checkCompletedNormally(g, v1);
1989 <        }
1990 <    }
1989 >        checkCompletedWithWrappedCFException(h0, ex);
1990 >        checkCompletedWithWrappedCFException(h1, ex);
1991 >        checkCompletedWithWrappedCFException(h2, ex);
1992 >        checkCompletedWithWrappedCFException(h3, ex);
1993 >        checkCompletedWithWrappedCFException(h4, ex);
1994 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1995 >    }}
1996  
1997      /**
1998 <     * acceptEither result completes exceptionally if action does
1998 >     * acceptEither result completes exceptionally if either source cancelled
1999       */
2000 <    public void testAcceptEither_actionFailed1() {
2000 >    public void testAcceptEither_sourceCancelled() {
2001          for (ExecutionMode m : ExecutionMode.values())
2002 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2003          for (Integer v1 : new Integer[] { 1, null })
2004 <        for (Integer v2 : new Integer[] { 2, null }) {
2286 <
2004 >    {
2005          final CompletableFuture<Integer> f = new CompletableFuture<>();
2006          final CompletableFuture<Integer> g = new CompletableFuture<>();
2007 <        final FailingConsumer r = new FailingConsumer();
2008 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2007 >        final NoopConsumer[] rs = new NoopConsumer[6];
2008 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2009  
2010 <        f.complete(v1);
2011 <        checkCompletedWithWrappedCFException(h);
2012 <        g.complete(v2);
2013 <        checkCompletedNormally(f, v1);
2014 <        checkCompletedNormally(g, v2);
2015 <        }
2016 <    }
2017 <
2018 <    public void testAcceptEither_actionFailed2() {
2019 <        for (ExecutionMode m : ExecutionMode.values())
2020 <        for (Integer v1 : new Integer[] { 1, null })
2021 <        for (Integer v2 : new Integer[] { 2, null }) {
2010 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2011 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2012 >        checkIncomplete(h0);
2013 >        checkIncomplete(h1);
2014 >        rs[0].assertNotInvoked();
2015 >        rs[1].assertNotInvoked();
2016 >        f.cancel(mayInterruptIfRunning);
2017 >        checkCompletedWithWrappedCancellationException(h0);
2018 >        checkCompletedWithWrappedCancellationException(h1);
2019 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2020 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2021 >        checkCompletedWithWrappedCancellationException(h2);
2022 >        checkCompletedWithWrappedCancellationException(h3);
2023  
2024 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2306 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2307 <        final FailingConsumer r = new FailingConsumer();
2308 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2024 >        g.complete(v1);
2025  
2026 <        g.complete(v2);
2027 <        checkCompletedWithWrappedCFException(h);
2028 <        f.complete(v1);
2029 <        checkCompletedNormally(f, v1);
2030 <        checkCompletedNormally(g, v2);
2026 >        // unspecified behavior - both source completions available
2027 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2028 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2029 >        try {
2030 >            assertNull(h4.join());
2031 >            rs[4].assertValue(v1);
2032 >        } catch (CompletionException ok) {
2033 >            checkCompletedWithWrappedCancellationException(h4);
2034 >            rs[4].assertNotInvoked();
2035 >        }
2036 >        try {
2037 >            assertNull(h5.join());
2038 >            rs[5].assertValue(v1);
2039 >        } catch (CompletionException ok) {
2040 >            checkCompletedWithWrappedCancellationException(h5);
2041 >            rs[5].assertNotInvoked();
2042          }
2316    }
2317
2318    /**
2319     * acceptEither result completes exceptionally if either source cancelled
2320     */
2321    public void testAcceptEither_sourceCancelled1() {
2322        for (ExecutionMode m : ExecutionMode.values())
2323        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2324        for (Integer v1 : new Integer[] { 1, null }) {
2325
2326        final CompletableFuture<Integer> f = new CompletableFuture<>();
2327        final CompletableFuture<Integer> g = new CompletableFuture<>();
2328        final IncAction r = new IncAction();
2329        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2330
2331        assertTrue(f.cancel(mayInterruptIfRunning));
2332        checkCompletedWithWrappedCancellationException(h);
2333        g.complete(v1);
2043  
2044          checkCancelled(f);
2336        assertEquals(r.invocationCount, 0);
2045          checkCompletedNormally(g, v1);
2046 <        checkCompletedWithWrappedCancellationException(h);
2047 <        }
2048 <    }
2046 >        checkCompletedWithWrappedCancellationException(h0);
2047 >        checkCompletedWithWrappedCancellationException(h1);
2048 >        checkCompletedWithWrappedCancellationException(h2);
2049 >        checkCompletedWithWrappedCancellationException(h3);
2050 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2051 >    }}
2052  
2053 <    public void testAcceptEither_sourceCancelled2() {
2053 >    /**
2054 >     * acceptEither result completes exceptionally if action does
2055 >     */
2056 >    public void testAcceptEither_actionFailed() {
2057          for (ExecutionMode m : ExecutionMode.values())
2058 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2059 <        for (Integer v1 : new Integer[] { 1, null }) {
2060 <
2058 >        for (Integer v1 : new Integer[] { 1, null })
2059 >        for (Integer v2 : new Integer[] { 2, null })
2060 >    {
2061          final CompletableFuture<Integer> f = new CompletableFuture<>();
2062          final CompletableFuture<Integer> g = new CompletableFuture<>();
2063 <        final IncAction r = new IncAction();
2064 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2063 >        final FailingConsumer[] rs = new FailingConsumer[6];
2064 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2065  
2066 <        assertTrue(g.cancel(mayInterruptIfRunning));
2067 <        checkCompletedWithWrappedCancellationException(h);
2066 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2067 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2068          f.complete(v1);
2069 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2070 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2071 +        checkCompletedWithWrappedCFException(h0);
2072 +        checkCompletedWithWrappedCFException(h1);
2073 +        checkCompletedWithWrappedCFException(h2);
2074 +        checkCompletedWithWrappedCFException(h3);
2075 +        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2076  
2077 <        checkCancelled(g);
2357 <        assertEquals(r.invocationCount, 0);
2358 <        checkCompletedNormally(f, v1);
2359 <        checkCompletedWithWrappedCancellationException(h);
2360 <        }
2361 <    }
2362 <
2363 <    public void testAcceptEither_sourceCancelled3() {
2364 <        for (ExecutionMode m : ExecutionMode.values())
2365 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2366 <        for (Integer v1 : new Integer[] { 1, null }) {
2077 >        g.complete(v2);
2078  
2079 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2080 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2081 <        final IncAction r = new IncAction();
2079 >        // unspecified behavior - both source completions available
2080 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2081 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2082  
2083 <        assertTrue(g.cancel(mayInterruptIfRunning));
2084 <        f.complete(v1);
2085 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2086 <
2087 <        // unspecified behavior
2088 <        Integer v;
2378 <        try {
2379 <            assertEquals(h.join(), null);
2380 <            assertEquals(r.invocationCount, 1);
2381 <            assertEquals(inc(v1), r.value);
2382 <        } catch (CompletionException ok) {
2383 <            checkCompletedWithWrappedCancellationException(h);
2384 <            assertEquals(r.invocationCount, 0);
2385 <        }
2083 >        checkCompletedWithWrappedCFException(h4);
2084 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2085 >                   Objects.equals(v2, rs[4].value));
2086 >        checkCompletedWithWrappedCFException(h5);
2087 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2088 >                   Objects.equals(v2, rs[5].value));
2089  
2387        checkCancelled(g);
2090          checkCompletedNormally(f, v1);
2091 <        }
2092 <    }
2391 <
2392 <    public void testAcceptEither_sourceCancelled4() {
2393 <        for (ExecutionMode m : ExecutionMode.values())
2394 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2395 <        for (Integer v1 : new Integer[] { 1, null }) {
2396 <
2397 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2398 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2399 <        final IncAction r = new IncAction();
2400 <
2401 <        assertTrue(f.cancel(mayInterruptIfRunning));
2402 <        g.complete(v1);
2403 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2404 <
2405 <        // unspecified behavior
2406 <        Integer v;
2407 <        try {
2408 <            assertEquals(h.join(), null);
2409 <            assertEquals(r.invocationCount, 1);
2410 <            assertEquals(inc(v1), r.value);
2411 <        } catch (CompletionException ok) {
2412 <            checkCompletedWithWrappedCancellationException(h);
2413 <            assertEquals(r.invocationCount, 0);
2414 <        }
2415 <
2416 <        checkCancelled(f);
2417 <        checkCompletedNormally(g, v1);
2418 <        }
2419 <    }
2091 >        checkCompletedNormally(g, v2);
2092 >    }}
2093  
2094      /**
2095       * runAfterEither result completes normally after normal completion
# Line 2425 | Line 2098 | public class CompletableFutureTest exten
2098      public void testRunAfterEither_normalCompletion1() {
2099          for (ExecutionMode m : ExecutionMode.values())
2100          for (Integer v1 : new Integer[] { 1, null })
2101 <        for (Integer v2 : new Integer[] { 2, null }) {
2102 <
2101 >        for (Integer v2 : new Integer[] { 2, null })
2102 >    {
2103          final CompletableFuture<Integer> f = new CompletableFuture<>();
2104          final CompletableFuture<Integer> g = new CompletableFuture<>();
2105 <        final Noop r = new Noop();
2105 >        final Noop r = new Noop(m);
2106          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2107  
2108          f.complete(v1);
2109          checkCompletedNormally(h, null);
2110 <        assertEquals(r.invocationCount, 1);
2110 >        r.assertInvoked();
2111          g.complete(v2);
2112  
2113          checkCompletedNormally(f, v1);
2114          checkCompletedNormally(g, v2);
2115          checkCompletedNormally(h, null);
2116 <        assertEquals(r.invocationCount, 1);
2117 <        }
2445 <    }
2116 >        r.assertInvoked();
2117 >    }}
2118  
2119      public void testRunAfterEither_normalCompletion2() {
2120          for (ExecutionMode m : ExecutionMode.values())
2121          for (Integer v1 : new Integer[] { 1, null })
2122 <        for (Integer v2 : new Integer[] { 2, null }) {
2123 <
2122 >        for (Integer v2 : new Integer[] { 2, null })
2123 >    {
2124          final CompletableFuture<Integer> f = new CompletableFuture<>();
2125          final CompletableFuture<Integer> g = new CompletableFuture<>();
2126 <        final Noop r = new Noop();
2126 >        final Noop r = new Noop(m);
2127          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2128  
2129          g.complete(v2);
2130          checkCompletedNormally(h, null);
2131 <        assertEquals(r.invocationCount, 1);
2131 >        r.assertInvoked();
2132          f.complete(v1);
2133  
2134          checkCompletedNormally(f, v1);
2135          checkCompletedNormally(g, v2);
2136          checkCompletedNormally(h, null);
2137 <        assertEquals(r.invocationCount, 1);
2138 <        }
2139 <    }
2137 >        r.assertInvoked();
2138 >        }}
2139 >
2140      public void testRunAfterEither_normalCompletion3() {
2141          for (ExecutionMode m : ExecutionMode.values())
2142          for (Integer v1 : new Integer[] { 1, null })
2143 <        for (Integer v2 : new Integer[] { 2, null }) {
2144 <
2143 >        for (Integer v2 : new Integer[] { 2, null })
2144 >    {
2145          final CompletableFuture<Integer> f = new CompletableFuture<>();
2146          final CompletableFuture<Integer> g = new CompletableFuture<>();
2147 <        final Noop r = new Noop();
2147 >        final Noop r = new Noop(m);
2148  
2149          f.complete(v1);
2150          g.complete(v2);
# Line 2481 | Line 2153 | public class CompletableFutureTest exten
2153          checkCompletedNormally(h, null);
2154          checkCompletedNormally(f, v1);
2155          checkCompletedNormally(g, v2);
2156 <        assertEquals(r.invocationCount, 1);
2157 <        }
2486 <    }
2156 >        r.assertInvoked();
2157 >    }}
2158  
2159      /**
2160       * runAfterEither result completes exceptionally after exceptional
# Line 2491 | Line 2162 | public class CompletableFutureTest exten
2162       */
2163      public void testRunAfterEither_exceptionalCompletion1() {
2164          for (ExecutionMode m : ExecutionMode.values())
2165 <        for (Integer v1 : new Integer[] { 1, null }) {
2166 <
2165 >        for (Integer v1 : new Integer[] { 1, null })
2166 >    {
2167          final CompletableFuture<Integer> f = new CompletableFuture<>();
2168          final CompletableFuture<Integer> g = new CompletableFuture<>();
2169 <        final Noop r = new Noop();
2169 >        final Noop r = new Noop(m);
2170          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2171          final CFException ex = new CFException();
2172  
# Line 2503 | Line 2174 | public class CompletableFutureTest exten
2174          checkCompletedWithWrappedCFException(h, ex);
2175          g.complete(v1);
2176  
2177 <        assertEquals(r.invocationCount, 0);
2177 >        r.assertNotInvoked();
2178          checkCompletedNormally(g, v1);
2179          checkCompletedWithWrappedCFException(f, ex);
2180          checkCompletedWithWrappedCFException(h, ex);
2181 <        }
2511 <    }
2181 >    }}
2182  
2183      public void testRunAfterEither_exceptionalCompletion2() {
2184          for (ExecutionMode m : ExecutionMode.values())
2185 <        for (Integer v1 : new Integer[] { 1, null }) {
2186 <
2185 >        for (Integer v1 : new Integer[] { 1, null })
2186 >    {
2187          final CompletableFuture<Integer> f = new CompletableFuture<>();
2188          final CompletableFuture<Integer> g = new CompletableFuture<>();
2189 <        final Noop r = new Noop();
2189 >        final Noop r = new Noop(m);
2190          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2191          final CFException ex = new CFException();
2192  
# Line 2524 | Line 2194 | public class CompletableFutureTest exten
2194          checkCompletedWithWrappedCFException(h, ex);
2195          f.complete(v1);
2196  
2197 <        assertEquals(r.invocationCount, 0);
2197 >        r.assertNotInvoked();
2198          checkCompletedNormally(f, v1);
2199          checkCompletedWithWrappedCFException(g, ex);
2200          checkCompletedWithWrappedCFException(h, ex);
2201 <        }
2532 <    }
2201 >    }}
2202  
2203      public void testRunAfterEither_exceptionalCompletion3() {
2204          for (ExecutionMode m : ExecutionMode.values())
2205 <        for (Integer v1 : new Integer[] { 1, null }) {
2206 <
2205 >        for (Integer v1 : new Integer[] { 1, null })
2206 >    {
2207          final CompletableFuture<Integer> f = new CompletableFuture<>();
2208          final CompletableFuture<Integer> g = new CompletableFuture<>();
2209 <        final Noop r = new Noop();
2209 >        final Noop r = new Noop(m);
2210          final CFException ex = new CFException();
2211  
2212          g.completeExceptionally(ex);
# Line 2547 | Line 2216 | public class CompletableFutureTest exten
2216          // unspecified behavior
2217          Integer v;
2218          try {
2219 <            assertEquals(h.join(), null);
2220 <            assertEquals(r.invocationCount, 1);
2219 >            assertNull(h.join());
2220 >            r.assertInvoked();
2221          } catch (CompletionException ok) {
2222              checkCompletedWithWrappedCFException(h, ex);
2223 <            assertEquals(r.invocationCount, 0);
2223 >            r.assertNotInvoked();
2224          }
2225  
2226          checkCompletedWithWrappedCFException(g, ex);
2227          checkCompletedNormally(f, v1);
2228 <        }
2560 <    }
2228 >    }}
2229  
2230      public void testRunAfterEither_exceptionalCompletion4() {
2231          for (ExecutionMode m : ExecutionMode.values())
2232 <        for (Integer v1 : new Integer[] { 1, null }) {
2233 <
2232 >        for (Integer v1 : new Integer[] { 1, null })
2233 >    {
2234          final CompletableFuture<Integer> f = new CompletableFuture<>();
2235          final CompletableFuture<Integer> g = new CompletableFuture<>();
2236 <        final Noop r = new Noop();
2236 >        final Noop r = new Noop(m);
2237          final CFException ex = new CFException();
2238  
2239          f.completeExceptionally(ex);
# Line 2575 | Line 2243 | public class CompletableFutureTest exten
2243          // unspecified behavior
2244          Integer v;
2245          try {
2246 <            assertEquals(h.join(), null);
2247 <            assertEquals(r.invocationCount, 1);
2246 >            assertNull(h.join());
2247 >            r.assertInvoked();
2248          } catch (CompletionException ok) {
2249              checkCompletedWithWrappedCFException(h, ex);
2250 <            assertEquals(r.invocationCount, 0);
2250 >            r.assertNotInvoked();
2251          }
2252  
2253          checkCompletedWithWrappedCFException(f, ex);
2254          checkCompletedNormally(g, v1);
2255 <        }
2588 <    }
2255 >    }}
2256  
2257      /**
2258       * runAfterEither result completes exceptionally if action does
# Line 2593 | Line 2260 | public class CompletableFutureTest exten
2260      public void testRunAfterEither_actionFailed1() {
2261          for (ExecutionMode m : ExecutionMode.values())
2262          for (Integer v1 : new Integer[] { 1, null })
2263 <        for (Integer v2 : new Integer[] { 2, null }) {
2264 <
2263 >        for (Integer v2 : new Integer[] { 2, null })
2264 >    {
2265          final CompletableFuture<Integer> f = new CompletableFuture<>();
2266          final CompletableFuture<Integer> g = new CompletableFuture<>();
2267 <        final FailingNoop r = new FailingNoop();
2267 >        final FailingRunnable r = new FailingRunnable(m);
2268          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2269  
2270          f.complete(v1);
# Line 2605 | Line 2272 | public class CompletableFutureTest exten
2272          g.complete(v2);
2273          checkCompletedNormally(f, v1);
2274          checkCompletedNormally(g, v2);
2275 <        }
2609 <    }
2275 >    }}
2276  
2277      public void testRunAfterEither_actionFailed2() {
2278          for (ExecutionMode m : ExecutionMode.values())
2279          for (Integer v1 : new Integer[] { 1, null })
2280 <        for (Integer v2 : new Integer[] { 2, null }) {
2281 <
2280 >        for (Integer v2 : new Integer[] { 2, null })
2281 >    {
2282          final CompletableFuture<Integer> f = new CompletableFuture<>();
2283          final CompletableFuture<Integer> g = new CompletableFuture<>();
2284 <        final FailingNoop r = new FailingNoop();
2284 >        final FailingRunnable r = new FailingRunnable(m);
2285          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2286  
2287          g.complete(v2);
# Line 2623 | Line 2289 | public class CompletableFutureTest exten
2289          f.complete(v1);
2290          checkCompletedNormally(f, v1);
2291          checkCompletedNormally(g, v2);
2292 <        }
2627 <    }
2292 >    }}
2293  
2294      /**
2295       * runAfterEither result completes exceptionally if either source cancelled
# Line 2632 | Line 2297 | public class CompletableFutureTest exten
2297      public void testRunAfterEither_sourceCancelled1() {
2298          for (ExecutionMode m : ExecutionMode.values())
2299          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2300 <        for (Integer v1 : new Integer[] { 1, null }) {
2301 <
2300 >        for (Integer v1 : new Integer[] { 1, null })
2301 >    {
2302          final CompletableFuture<Integer> f = new CompletableFuture<>();
2303          final CompletableFuture<Integer> g = new CompletableFuture<>();
2304 <        final Noop r = new Noop();
2304 >        final Noop r = new Noop(m);
2305          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2306  
2307          assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2644 | Line 2309 | public class CompletableFutureTest exten
2309          g.complete(v1);
2310  
2311          checkCancelled(f);
2312 <        assertEquals(r.invocationCount, 0);
2312 >        r.assertNotInvoked();
2313          checkCompletedNormally(g, v1);
2314          checkCompletedWithWrappedCancellationException(h);
2315 <        }
2651 <    }
2315 >    }}
2316  
2317      public void testRunAfterEither_sourceCancelled2() {
2318          for (ExecutionMode m : ExecutionMode.values())
2319          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2320 <        for (Integer v1 : new Integer[] { 1, null }) {
2321 <
2320 >        for (Integer v1 : new Integer[] { 1, null })
2321 >    {
2322          final CompletableFuture<Integer> f = new CompletableFuture<>();
2323          final CompletableFuture<Integer> g = new CompletableFuture<>();
2324 <        final Noop r = new Noop();
2324 >        final Noop r = new Noop(m);
2325          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2326  
2327          assertTrue(g.cancel(mayInterruptIfRunning));
# Line 2665 | Line 2329 | public class CompletableFutureTest exten
2329          f.complete(v1);
2330  
2331          checkCancelled(g);
2332 <        assertEquals(r.invocationCount, 0);
2332 >        r.assertNotInvoked();
2333          checkCompletedNormally(f, v1);
2334          checkCompletedWithWrappedCancellationException(h);
2335 <        }
2672 <    }
2335 >    }}
2336  
2337      public void testRunAfterEither_sourceCancelled3() {
2338          for (ExecutionMode m : ExecutionMode.values())
2339          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2340 <        for (Integer v1 : new Integer[] { 1, null }) {
2341 <
2340 >        for (Integer v1 : new Integer[] { 1, null })
2341 >    {
2342          final CompletableFuture<Integer> f = new CompletableFuture<>();
2343          final CompletableFuture<Integer> g = new CompletableFuture<>();
2344 <        final Noop r = new Noop();
2344 >        final Noop r = new Noop(m);
2345  
2346          assertTrue(g.cancel(mayInterruptIfRunning));
2347          f.complete(v1);
# Line 2687 | Line 2350 | public class CompletableFutureTest exten
2350          // unspecified behavior
2351          Integer v;
2352          try {
2353 <            assertEquals(h.join(), null);
2354 <            assertEquals(r.invocationCount, 1);
2353 >            assertNull(h.join());
2354 >            r.assertInvoked();
2355          } catch (CompletionException ok) {
2356              checkCompletedWithWrappedCancellationException(h);
2357 <            assertEquals(r.invocationCount, 0);
2357 >            r.assertNotInvoked();
2358          }
2359  
2360          checkCancelled(g);
2361          checkCompletedNormally(f, v1);
2362 <        }
2700 <    }
2362 >    }}
2363  
2364      public void testRunAfterEither_sourceCancelled4() {
2365          for (ExecutionMode m : ExecutionMode.values())
2366          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2367 <        for (Integer v1 : new Integer[] { 1, null }) {
2368 <
2367 >        for (Integer v1 : new Integer[] { 1, null })
2368 >    {
2369          final CompletableFuture<Integer> f = new CompletableFuture<>();
2370          final CompletableFuture<Integer> g = new CompletableFuture<>();
2371 <        final Noop r = new Noop();
2371 >        final Noop r = new Noop(m);
2372  
2373          assertTrue(f.cancel(mayInterruptIfRunning));
2374          g.complete(v1);
# Line 2715 | Line 2377 | public class CompletableFutureTest exten
2377          // unspecified behavior
2378          Integer v;
2379          try {
2380 <            assertEquals(h.join(), null);
2381 <            assertEquals(r.invocationCount, 1);
2380 >            assertNull(h.join());
2381 >            r.assertInvoked();
2382          } catch (CompletionException ok) {
2383              checkCompletedWithWrappedCancellationException(h);
2384 <            assertEquals(r.invocationCount, 0);
2384 >            r.assertNotInvoked();
2385          }
2386  
2387          checkCancelled(f);
2388          checkCompletedNormally(g, v1);
2389 <        }
2728 <    }
2389 >    }}
2390  
2391      /**
2392       * thenCompose result completes normally after normal completion of source
2393       */
2394 <    public void testThenCompose() {
2395 <        CompletableFuture<Integer> f, g;
2396 <        CompletableFutureInc r;
2397 <
2398 <        f = new CompletableFuture<>();
2399 <        g = f.thenCompose(r = new CompletableFutureInc());
2400 <        f.complete(one);
2401 <        checkCompletedNormally(g, two);
2402 <        assertTrue(r.ran);
2394 >    public void testThenCompose_normalCompletion() {
2395 >        for (ExecutionMode m : ExecutionMode.values())
2396 >        for (boolean createIncomplete : new boolean[] { true, false })
2397 >        for (Integer v1 : new Integer[] { 1, null })
2398 >    {
2399 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2400 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2401 >        if (!createIncomplete) f.complete(v1);
2402 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2403 >        if (createIncomplete) f.complete(v1);
2404  
2405 <        f = new CompletableFuture<>();
2406 <        f.complete(one);
2407 <        g = f.thenCompose(r = new CompletableFutureInc());
2408 <        checkCompletedNormally(g, two);
2747 <        assertTrue(r.ran);
2748 <    }
2405 >        checkCompletedNormally(g, inc(v1));
2406 >        checkCompletedNormally(f, v1);
2407 >        r.assertInvoked();
2408 >    }}
2409  
2410      /**
2411       * thenCompose result completes exceptionally after exceptional
2412       * completion of source
2413       */
2414 <    public void testThenCompose2() {
2415 <        CompletableFuture<Integer> f, g;
2416 <        CompletableFutureInc r;
2417 <
2418 <        f = new CompletableFuture<>();
2419 <        g = f.thenCompose(r = new CompletableFutureInc());
2420 <        f.completeExceptionally(new CFException());
2421 <        checkCompletedWithWrappedCFException(g);
2414 >    public void testThenCompose_exceptionalCompletion() {
2415 >        for (ExecutionMode m : ExecutionMode.values())
2416 >        for (boolean createIncomplete : new boolean[] { true, false })
2417 >    {
2418 >        final CFException ex = new CFException();
2419 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2420 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2421 >        if (!createIncomplete) f.completeExceptionally(ex);
2422 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2423 >        if (createIncomplete) f.completeExceptionally(ex);
2424  
2425 <        f = new CompletableFuture<>();
2426 <        f.completeExceptionally(new CFException());
2427 <        g = f.thenCompose(r = new CompletableFutureInc());
2428 <        checkCompletedWithWrappedCFException(g);
2767 <    }
2425 >        checkCompletedWithWrappedCFException(g, ex);
2426 >        checkCompletedWithWrappedCFException(f, ex);
2427 >        r.assertNotInvoked();
2428 >    }}
2429  
2430      /**
2431       * thenCompose result completes exceptionally if action does
2432       */
2433 <    public void testThenCompose3() {
2434 <        CompletableFuture<Integer> f, g;
2435 <        FailingCompletableFutureFunction r;
2433 >    public void testThenCompose_actionFailed() {
2434 >        for (ExecutionMode m : ExecutionMode.values())
2435 >        for (boolean createIncomplete : new boolean[] { true, false })
2436 >        for (Integer v1 : new Integer[] { 1, null })
2437 >    {
2438 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2439 >        final FailingCompletableFutureFunction r
2440 >            = new FailingCompletableFutureFunction(m);
2441 >        if (!createIncomplete) f.complete(v1);
2442 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2443 >        if (createIncomplete) f.complete(v1);
2444  
2776        f = new CompletableFuture<>();
2777        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2778        f.complete(one);
2445          checkCompletedWithWrappedCFException(g);
2446 <
2447 <        f = new CompletableFuture<>();
2782 <        f.complete(one);
2783 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2784 <        checkCompletedWithWrappedCFException(g);
2785 <    }
2446 >        checkCompletedNormally(f, v1);
2447 >    }}
2448  
2449      /**
2450       * thenCompose result completes exceptionally if source cancelled
2451       */
2452 <    public void testThenCompose4() {
2453 <        CompletableFuture<Integer> f, g;
2454 <        CompletableFutureInc r;
2455 <
2456 <        f = new CompletableFuture<>();
2457 <        g = f.thenCompose(r = new CompletableFutureInc());
2458 <        assertTrue(f.cancel(true));
2459 <        checkCompletedWithWrappedCancellationException(g);
2460 <
2461 <        f = new CompletableFuture<>();
2462 <        assertTrue(f.cancel(true));
2463 <        g = f.thenCompose(r = new CompletableFutureInc());
2464 <        checkCompletedWithWrappedCancellationException(g);
2803 <    }
2804 <
2805 <    // asyncs
2806 <
2807 <    /**
2808 <     * thenRunAsync result completes normally after normal completion of source
2809 <     */
2810 <    public void testThenRunAsync() {
2811 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2812 <        Noop r = new Noop();
2813 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2814 <        f.complete(null);
2815 <        checkCompletedNormally(g, null);
2816 <
2817 <        // reordered version
2818 <        f = new CompletableFuture<>();
2819 <        f.complete(null);
2820 <        r = new Noop();
2821 <        g = f.thenRunAsync(r);
2822 <        checkCompletedNormally(g, null);
2823 <    }
2824 <
2825 <    /**
2826 <     * thenRunAsync result completes exceptionally after exceptional
2827 <     * completion of source
2828 <     */
2829 <    public void testThenRunAsync2() {
2830 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2831 <        Noop r = new Noop();
2832 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2833 <        f.completeExceptionally(new CFException());
2834 <        try {
2835 <            g.join();
2836 <            shouldThrow();
2837 <        } catch (CompletionException success) {}
2838 <        checkCompletedWithWrappedCFException(g);
2839 <    }
2840 <
2841 <    /**
2842 <     * thenRunAsync result completes exceptionally if action does
2843 <     */
2844 <    public void testThenRunAsync3() {
2845 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2846 <        FailingNoop r = new FailingNoop();
2847 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2848 <        f.complete(null);
2849 <        checkCompletedWithWrappedCFException(g);
2850 <    }
2851 <
2852 <    /**
2853 <     * thenRunAsync result completes exceptionally if source cancelled
2854 <     */
2855 <    public void testThenRunAsync4() {
2856 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2857 <        Noop r = new Noop();
2858 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2859 <        assertTrue(f.cancel(true));
2860 <        checkCompletedWithWrappedCancellationException(g);
2861 <    }
2862 <
2863 <    /**
2864 <     * thenApplyAsync result completes normally after normal completion of source
2865 <     */
2866 <    public void testThenApplyAsync() {
2867 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2868 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2869 <        f.complete(one);
2870 <        checkCompletedNormally(g, two);
2871 <    }
2872 <
2873 <    /**
2874 <     * thenApplyAsync result completes exceptionally after exceptional
2875 <     * completion of source
2876 <     */
2877 <    public void testThenApplyAsync2() {
2878 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2879 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2880 <        f.completeExceptionally(new CFException());
2881 <        checkCompletedWithWrappedCFException(g);
2882 <    }
2883 <
2884 <    /**
2885 <     * thenApplyAsync result completes exceptionally if action does
2886 <     */
2887 <    public void testThenApplyAsync3() {
2888 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2889 <        FailingFunction r = new FailingFunction();
2890 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2891 <        f.complete(null);
2892 <        checkCompletedWithWrappedCFException(g);
2893 <    }
2894 <
2895 <    /**
2896 <     * thenApplyAsync result completes exceptionally if source cancelled
2897 <     */
2898 <    public void testThenApplyAsync4() {
2899 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2900 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2901 <        assertTrue(f.cancel(true));
2902 <        checkCompletedWithWrappedCancellationException(g);
2903 <    }
2904 <
2905 <    /**
2906 <     * thenAcceptAsync result completes normally after normal
2907 <     * completion of source
2908 <     */
2909 <    public void testThenAcceptAsync() {
2910 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2911 <        IncAction r = new IncAction();
2912 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2913 <        f.complete(one);
2914 <        checkCompletedNormally(g, null);
2915 <        assertEquals(r.value, (Integer) 2);
2916 <    }
2917 <
2918 <    /**
2919 <     * thenAcceptAsync result completes exceptionally after exceptional
2920 <     * completion of source
2921 <     */
2922 <    public void testThenAcceptAsync2() {
2923 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2924 <        IncAction r = new IncAction();
2925 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2926 <        f.completeExceptionally(new CFException());
2927 <        checkCompletedWithWrappedCFException(g);
2928 <    }
2929 <
2930 <    /**
2931 <     * thenAcceptAsync result completes exceptionally if action does
2932 <     */
2933 <    public void testThenAcceptAsync3() {
2934 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2935 <        FailingConsumer r = new FailingConsumer();
2936 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2937 <        f.complete(null);
2938 <        checkCompletedWithWrappedCFException(g);
2939 <    }
2940 <
2941 <    /**
2942 <     * thenAcceptAsync result completes exceptionally if source cancelled
2943 <     */
2944 <    public void testThenAcceptAsync4() {
2945 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2946 <        IncAction r = new IncAction();
2947 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2948 <        assertTrue(f.cancel(true));
2949 <        checkCompletedWithWrappedCancellationException(g);
2950 <    }
2951 <
2952 <    /**
2953 <     * thenComposeAsync result completes normally after normal
2954 <     * completion of source
2955 <     */
2956 <    public void testThenComposeAsync() {
2957 <        CompletableFuture<Integer> f, g;
2958 <        CompletableFutureInc r;
2959 <
2960 <        f = new CompletableFuture<>();
2961 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2962 <        f.complete(one);
2963 <        checkCompletedNormally(g, two);
2964 <
2965 <        f = new CompletableFuture<>();
2966 <        f.complete(one);
2967 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2968 <        checkCompletedNormally(g, two);
2969 <    }
2970 <
2971 <    /**
2972 <     * thenComposeAsync result completes exceptionally after
2973 <     * exceptional completion of source
2974 <     */
2975 <    public void testThenComposeAsync2() {
2976 <        CompletableFuture<Integer> f, g;
2977 <        CompletableFutureInc r;
2978 <
2979 <        f = new CompletableFuture<>();
2980 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2981 <        f.completeExceptionally(new CFException());
2982 <        checkCompletedWithWrappedCFException(g);
2983 <        assertFalse(r.ran);
2984 <
2985 <        f = new CompletableFuture<>();
2986 <        f.completeExceptionally(new CFException());
2987 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2988 <        checkCompletedWithWrappedCFException(g);
2989 <        assertFalse(r.ran);
2990 <    }
2991 <
2992 <    /**
2993 <     * thenComposeAsync result completes exceptionally if action does
2994 <     */
2995 <    public void testThenComposeAsync3() {
2996 <        CompletableFuture<Integer> f, g;
2997 <        FailingCompletableFutureFunction r;
2998 <
2999 <        f = new CompletableFuture<>();
3000 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3001 <        f.complete(one);
3002 <        checkCompletedWithWrappedCFException(g);
3003 <
3004 <        f = new CompletableFuture<>();
3005 <        f.complete(one);
3006 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3007 <        checkCompletedWithWrappedCFException(g);
3008 <    }
3009 <
3010 <    /**
3011 <     * thenComposeAsync result completes exceptionally if source cancelled
3012 <     */
3013 <    public void testThenComposeAsync4() {
3014 <        CompletableFuture<Integer> f, g;
3015 <        CompletableFutureInc r;
3016 <
3017 <        f = new CompletableFuture<>();
3018 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3019 <        assertTrue(f.cancel(true));
3020 <        checkCompletedWithWrappedCancellationException(g);
3021 <
3022 <        f = new CompletableFuture<>();
3023 <        assertTrue(f.cancel(true));
3024 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3025 <        checkCompletedWithWrappedCancellationException(g);
3026 <    }
3027 <
3028 <    // async with explicit executors
3029 <
3030 <    /**
3031 <     * thenRunAsync result completes normally after normal completion of source
3032 <     */
3033 <    public void testThenRunAsyncE() {
3034 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3035 <        Noop r = new Noop();
3036 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3037 <        f.complete(null);
3038 <        checkCompletedNormally(g, null);
3039 <
3040 <        // reordered version
3041 <        f = new CompletableFuture<>();
3042 <        f.complete(null);
3043 <        r = new Noop();
3044 <        g = f.thenRunAsync(r, new ThreadExecutor());
3045 <        checkCompletedNormally(g, null);
3046 <    }
3047 <
3048 <    /**
3049 <     * thenRunAsync result completes exceptionally after exceptional
3050 <     * completion of source
3051 <     */
3052 <    public void testThenRunAsync2E() {
3053 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3054 <        Noop r = new Noop();
3055 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3056 <        f.completeExceptionally(new CFException());
3057 <        try {
3058 <            g.join();
3059 <            shouldThrow();
3060 <        } catch (CompletionException success) {}
3061 <        checkCompletedWithWrappedCFException(g);
3062 <    }
3063 <
3064 <    /**
3065 <     * thenRunAsync result completes exceptionally if action does
3066 <     */
3067 <    public void testThenRunAsync3E() {
3068 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3069 <        FailingNoop r = new FailingNoop();
3070 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3071 <        f.complete(null);
3072 <        checkCompletedWithWrappedCFException(g);
3073 <    }
3074 <
3075 <    /**
3076 <     * thenRunAsync result completes exceptionally if source cancelled
3077 <     */
3078 <    public void testThenRunAsync4E() {
3079 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3080 <        Noop r = new Noop();
3081 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3082 <        assertTrue(f.cancel(true));
3083 <        checkCompletedWithWrappedCancellationException(g);
3084 <    }
3085 <
3086 <    /**
3087 <     * thenApplyAsync result completes normally after normal completion of source
3088 <     */
3089 <    public void testThenApplyAsyncE() {
3090 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3091 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3092 <        f.complete(one);
3093 <        checkCompletedNormally(g, two);
3094 <    }
3095 <
3096 <    /**
3097 <     * thenApplyAsync result completes exceptionally after exceptional
3098 <     * completion of source
3099 <     */
3100 <    public void testThenApplyAsync2E() {
3101 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3102 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3103 <        f.completeExceptionally(new CFException());
3104 <        checkCompletedWithWrappedCFException(g);
3105 <    }
3106 <
3107 <    /**
3108 <     * thenApplyAsync result completes exceptionally if action does
3109 <     */
3110 <    public void testThenApplyAsync3E() {
3111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3112 <        FailingFunction r = new FailingFunction();
3113 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3114 <        f.complete(null);
3115 <        checkCompletedWithWrappedCFException(g);
3116 <    }
3117 <
3118 <    /**
3119 <     * thenApplyAsync result completes exceptionally if source cancelled
3120 <     */
3121 <    public void testThenApplyAsync4E() {
3122 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3123 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3124 <        assertTrue(f.cancel(true));
3125 <        checkCompletedWithWrappedCancellationException(g);
3126 <    }
3127 <
3128 <    /**
3129 <     * thenAcceptAsync result completes normally after normal
3130 <     * completion of source
3131 <     */
3132 <    public void testThenAcceptAsyncE() {
3133 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3134 <        IncAction r = new IncAction();
3135 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3136 <        f.complete(one);
3137 <        checkCompletedNormally(g, null);
3138 <        assertEquals(r.value, (Integer) 2);
3139 <    }
3140 <
3141 <    /**
3142 <     * thenAcceptAsync result completes exceptionally after exceptional
3143 <     * completion of source
3144 <     */
3145 <    public void testThenAcceptAsync2E() {
3146 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3147 <        IncAction r = new IncAction();
3148 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3149 <        f.completeExceptionally(new CFException());
3150 <        checkCompletedWithWrappedCFException(g);
3151 <    }
3152 <
3153 <    /**
3154 <     * thenAcceptAsync result completes exceptionally if action does
3155 <     */
3156 <    public void testThenAcceptAsync3E() {
3157 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3158 <        FailingConsumer r = new FailingConsumer();
3159 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3160 <        f.complete(null);
3161 <        checkCompletedWithWrappedCFException(g);
3162 <    }
3163 <
3164 <    /**
3165 <     * thenAcceptAsync result completes exceptionally if source cancelled
3166 <     */
3167 <    public void testThenAcceptAsync4E() {
3168 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3169 <        IncAction r = new IncAction();
3170 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3171 <        assertTrue(f.cancel(true));
3172 <        checkCompletedWithWrappedCancellationException(g);
3173 <    }
3174 <
3175 <    /**
3176 <     * thenComposeAsync result completes normally after normal
3177 <     * completion of source
3178 <     */
3179 <    public void testThenComposeAsyncE() {
3180 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3181 <        CompletableFutureInc r = new CompletableFutureInc();
3182 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3183 <        f.complete(one);
3184 <        checkCompletedNormally(g, two);
3185 <    }
3186 <
3187 <    /**
3188 <     * thenComposeAsync result completes exceptionally after
3189 <     * exceptional completion of source
3190 <     */
3191 <    public void testThenComposeAsync2E() {
3192 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3193 <        CompletableFutureInc r = new CompletableFutureInc();
3194 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3195 <        f.completeExceptionally(new CFException());
3196 <        checkCompletedWithWrappedCFException(g);
3197 <    }
3198 <
3199 <    /**
3200 <     * thenComposeAsync result completes exceptionally if action does
3201 <     */
3202 <    public void testThenComposeAsync3E() {
3203 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3204 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3205 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3206 <        f.complete(one);
3207 <        checkCompletedWithWrappedCFException(g);
3208 <    }
2452 >    public void testThenCompose_sourceCancelled() {
2453 >        for (ExecutionMode m : ExecutionMode.values())
2454 >        for (boolean createIncomplete : new boolean[] { true, false })
2455 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2456 >    {
2457 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2458 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2459 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2460 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2461 >        if (createIncomplete) {
2462 >            checkIncomplete(g);
2463 >            assertTrue(f.cancel(mayInterruptIfRunning));
2464 >        }
2465  
3210    /**
3211     * thenComposeAsync result completes exceptionally if source cancelled
3212     */
3213    public void testThenComposeAsync4E() {
3214        CompletableFuture<Integer> f = new CompletableFuture<>();
3215        CompletableFutureInc r = new CompletableFutureInc();
3216        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3217        assertTrue(f.cancel(true));
2466          checkCompletedWithWrappedCancellationException(g);
2467 <    }
2467 >        checkCancelled(f);
2468 >    }}
2469  
2470      // other static methods
2471  
# Line 3235 | Line 2484 | public class CompletableFutureTest exten
2484       */
2485      public void testAllOf_normal() throws Exception {
2486          for (int k = 1; k < 20; ++k) {
2487 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2487 >            CompletableFuture<Integer>[] fs
2488 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2489              for (int i = 0; i < k; ++i)
2490                  fs[i] = new CompletableFuture<>();
2491              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3249 | Line 2499 | public class CompletableFutureTest exten
2499          }
2500      }
2501  
2502 +    public void testAllOf_backwards() throws Exception {
2503 +        for (int k = 1; k < 20; ++k) {
2504 +            CompletableFuture<Integer>[] fs
2505 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2506 +            for (int i = 0; i < k; ++i)
2507 +                fs[i] = new CompletableFuture<>();
2508 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2509 +            for (int i = k - 1; i >= 0; i--) {
2510 +                checkIncomplete(f);
2511 +                checkIncomplete(CompletableFuture.allOf(fs));
2512 +                fs[i].complete(one);
2513 +            }
2514 +            checkCompletedNormally(f, null);
2515 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2516 +        }
2517 +    }
2518 +
2519      /**
2520       * anyOf(no component futures) returns an incomplete future
2521       */
# Line 3307 | Line 2574 | public class CompletableFutureTest exten
2574          Runnable[] throwingActions = {
2575              () -> CompletableFuture.supplyAsync(null),
2576              () -> CompletableFuture.supplyAsync(null, exec),
2577 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2577 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2578  
2579              () -> CompletableFuture.runAsync(null),
2580              () -> CompletableFuture.runAsync(null, exec),
# Line 3380 | Line 2647 | public class CompletableFutureTest exten
2647  
2648              () -> f.thenCompose(null),
2649              () -> f.thenComposeAsync(null),
2650 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2650 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2651              () -> f.thenComposeAsync(null, exec),
2652  
2653              () -> f.exceptionally(null),
# Line 3418 | Line 2685 | public class CompletableFutureTest exten
2685       */
2686      public void testWhenComplete_normalCompletion1() {
2687          for (ExecutionMode m : ExecutionMode.values())
2688 <        for (Integer v1 : new Integer[] { 1, null }) {
2689 <
2690 <        final AtomicInteger a = new AtomicInteger();
2688 >        for (boolean createIncomplete : new boolean[] { true, false })
2689 >        for (Integer v1 : new Integer[] { 1, null })
2690 >    {
2691 >        final AtomicInteger a = new AtomicInteger(0);
2692          final CompletableFuture<Integer> f = new CompletableFuture<>();
2693 <        final CompletableFuture<Integer> g =
2694 <            m.whenComplete(f,
2695 <                           (Integer x, Throwable t) -> {
2696 <                               threadAssertSame(x, v1);
2697 <                               threadAssertNull(t);
2698 <                               a.getAndIncrement();
2699 <                           });
2700 <        f.complete(v1);
2701 <        checkCompletedNormally(f, v1);
2693 >        if (!createIncomplete) f.complete(v1);
2694 >        final CompletableFuture<Integer> g = m.whenComplete
2695 >            (f,
2696 >             (Integer x, Throwable t) -> {
2697 >                threadAssertSame(x, v1);
2698 >                threadAssertNull(t);
2699 >                a.getAndIncrement();
2700 >            });
2701 >        if (createIncomplete) f.complete(v1);
2702 >
2703          checkCompletedNormally(g, v1);
2704 <        assertEquals(a.get(), 1);
2705 <        }
2706 <    }
2704 >        checkCompletedNormally(f, v1);
2705 >        assertEquals(1, a.get());
2706 >    }}
2707  
2708      /**
2709       * whenComplete action executes on exceptional completion, propagating
# Line 3442 | Line 2711 | public class CompletableFutureTest exten
2711       */
2712      public void testWhenComplete_exceptionalCompletion() {
2713          for (ExecutionMode m : ExecutionMode.values())
2714 <        for (Integer v1 : new Integer[] { 1, null }) {
2715 <
2716 <        final AtomicInteger a = new AtomicInteger();
2714 >        for (boolean createIncomplete : new boolean[] { true, false })
2715 >        for (Integer v1 : new Integer[] { 1, null })
2716 >    {
2717 >        final AtomicInteger a = new AtomicInteger(0);
2718          final CFException ex = new CFException();
2719          final CompletableFuture<Integer> f = new CompletableFuture<>();
2720 +        if (!createIncomplete) f.completeExceptionally(ex);
2721          final CompletableFuture<Integer> g = m.whenComplete
2722              (f,
2723               (Integer x, Throwable t) -> {
# Line 3454 | Line 2725 | public class CompletableFutureTest exten
2725                  threadAssertSame(t, ex);
2726                  a.getAndIncrement();
2727              });
2728 <        f.completeExceptionally(ex);
2728 >        if (createIncomplete) f.completeExceptionally(ex);
2729          checkCompletedWithWrappedCFException(f, ex);
2730          checkCompletedWithWrappedCFException(g, ex);
2731 <        assertEquals(a.get(), 1);
2732 <        }
2733 <    }
2731 >        assertEquals(1, a.get());
2732 >    }}
2733 >
2734 >    /**
2735 >     * whenComplete action executes on cancelled source, propagating
2736 >     * CancellationException.
2737 >     */
2738 >    public void testWhenComplete_sourceCancelled() {
2739 >        for (ExecutionMode m : ExecutionMode.values())
2740 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2741 >        for (boolean createIncomplete : new boolean[] { true, false })
2742 >    {
2743 >        final AtomicInteger a = new AtomicInteger(0);
2744 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2745 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2746 >        final CompletableFuture<Integer> g = m.whenComplete
2747 >            (f,
2748 >             (Integer x, Throwable t) -> {
2749 >                threadAssertNull(x);
2750 >                threadAssertTrue(t instanceof CancellationException);
2751 >                a.getAndIncrement();
2752 >            });
2753 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2754 >
2755 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2756 >        checkCompletedWithWrappedCancellationException(g);
2757 >        checkCancelled(f);
2758 >        assertEquals(1, a.get());
2759 >    }}
2760  
2761      /**
2762       * If a whenComplete action throws an exception when triggered by
2763       * a normal completion, it completes exceptionally
2764       */
2765      public void testWhenComplete_actionFailed() {
2766 +        for (boolean createIncomplete : new boolean[] { true, false })
2767          for (ExecutionMode m : ExecutionMode.values())
2768 <        for (Integer v1 : new Integer[] { 1, null }) {
2769 <
2768 >        for (Integer v1 : new Integer[] { 1, null })
2769 >    {
2770 >        final AtomicInteger a = new AtomicInteger(0);
2771          final CFException ex = new CFException();
2772          final CompletableFuture<Integer> f = new CompletableFuture<>();
2773 +        if (!createIncomplete) f.complete(v1);
2774          final CompletableFuture<Integer> g = m.whenComplete
2775              (f,
2776               (Integer x, Throwable t) -> {
2777                  threadAssertSame(x, v1);
2778                  threadAssertNull(t);
2779 +                a.getAndIncrement();
2780                  throw ex;
2781              });
2782 <        f.complete(v1);
2782 >        if (createIncomplete) f.complete(v1);
2783          checkCompletedNormally(f, v1);
2784          checkCompletedWithWrappedCFException(g, ex);
2785 <        }
2786 <    }
2785 >        assertEquals(1, a.get());
2786 >    }}
2787  
2788      /**
2789       * If a whenComplete action throws an exception when triggered by
# Line 3490 | Line 2791 | public class CompletableFutureTest exten
2791       * exception takes precedence.
2792       */
2793      public void testWhenComplete_actionFailedSourceFailed() {
2794 +        for (boolean createIncomplete : new boolean[] { true, false })
2795          for (ExecutionMode m : ExecutionMode.values())
2796 <        for (Integer v1 : new Integer[] { 1, null }) {
2797 <
2796 >        for (Integer v1 : new Integer[] { 1, null })
2797 >    {
2798 >        final AtomicInteger a = new AtomicInteger(0);
2799          final CFException ex1 = new CFException();
2800          final CFException ex2 = new CFException();
2801          final CompletableFuture<Integer> f = new CompletableFuture<>();
2802 +
2803 +        if (!createIncomplete) f.completeExceptionally(ex1);
2804          final CompletableFuture<Integer> g = m.whenComplete
2805              (f,
2806               (Integer x, Throwable t) -> {
2807                  threadAssertSame(t, ex1);
2808                  threadAssertNull(x);
2809 +                a.getAndIncrement();
2810                  throw ex2;
2811              });
2812 <        f.completeExceptionally(ex1);
2812 >        if (createIncomplete) f.completeExceptionally(ex1);
2813 >
2814          checkCompletedWithWrappedCFException(f, ex1);
2815          checkCompletedWithWrappedCFException(g, ex1);
2816 <        }
2817 <    }
3511 <
3512 <    /**
3513 <     * handleAsync action completes normally with function value on
3514 <     * either normal or exceptional completion of source
3515 <     */
3516 <    public void testHandleAsync() {
3517 <        CompletableFuture<Integer> f, g;
3518 <        IntegerHandler r;
3519 <
3520 <        f = new CompletableFuture<>();
3521 <        g = f.handleAsync(r = new IntegerHandler());
3522 <        assertFalse(r.ran);
3523 <        f.completeExceptionally(new CFException());
3524 <        checkCompletedWithWrappedCFException(f);
3525 <        checkCompletedNormally(g, three);
3526 <        assertTrue(r.ran);
3527 <
3528 <        f = new CompletableFuture<>();
3529 <        g = f.handleAsync(r = new IntegerHandler());
3530 <        assertFalse(r.ran);
3531 <        f.completeExceptionally(new CFException());
3532 <        checkCompletedWithWrappedCFException(f);
3533 <        checkCompletedNormally(g, three);
3534 <        assertTrue(r.ran);
3535 <
3536 <        f = new CompletableFuture<>();
3537 <        g = f.handleAsync(r = new IntegerHandler());
3538 <        assertFalse(r.ran);
3539 <        f.complete(one);
3540 <        checkCompletedNormally(f, one);
3541 <        checkCompletedNormally(g, two);
3542 <        assertTrue(r.ran);
3543 <
3544 <        f = new CompletableFuture<>();
3545 <        g = f.handleAsync(r = new IntegerHandler());
3546 <        assertFalse(r.ran);
3547 <        f.complete(one);
3548 <        checkCompletedNormally(f, one);
3549 <        checkCompletedNormally(g, two);
3550 <        assertTrue(r.ran);
3551 <    }
3552 <
3553 <    /**
3554 <     * handleAsync action with Executor completes normally with
3555 <     * function value on either normal or exceptional completion of
3556 <     * source
3557 <     */
3558 <    public void testHandleAsync2() {
3559 <        CompletableFuture<Integer> f, g;
3560 <        ThreadExecutor exec = new ThreadExecutor();
3561 <        IntegerHandler r;
3562 <
3563 <        f = new CompletableFuture<>();
3564 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3565 <        assertFalse(r.ran);
3566 <        f.completeExceptionally(new CFException());
3567 <        checkCompletedWithWrappedCFException(f);
3568 <        checkCompletedNormally(g, three);
3569 <        assertTrue(r.ran);
3570 <
3571 <        f = new CompletableFuture<>();
3572 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3573 <        assertFalse(r.ran);
3574 <        f.completeExceptionally(new CFException());
3575 <        checkCompletedWithWrappedCFException(f);
3576 <        checkCompletedNormally(g, three);
3577 <        assertTrue(r.ran);
3578 <
3579 <        f = new CompletableFuture<>();
3580 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3581 <        assertFalse(r.ran);
3582 <        f.complete(one);
3583 <        checkCompletedNormally(f, one);
3584 <        checkCompletedNormally(g, two);
3585 <        assertTrue(r.ran);
3586 <
3587 <        f = new CompletableFuture<>();
3588 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3589 <        assertFalse(r.ran);
3590 <        f.complete(one);
3591 <        checkCompletedNormally(f, one);
3592 <        checkCompletedNormally(g, two);
3593 <        assertTrue(r.ran);
3594 <    }
2816 >        assertEquals(1, a.get());
2817 >    }}
2818  
2819   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines