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

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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines