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.38 by jsr166, Sun Jun 1 23:51:44 2014 UTC vs.
Revision 1.74 by jsr166, Fri Jun 6 21: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 103 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              CFException ex) {
108 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 >                                                      Throwable ex) {
110          try {
111              f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
# Line 129 | Line 131 | public class CompletableFutureTest exten
131          } catch (ExecutionException success) {
132              assertSame(ex, success.getCause());
133          } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +
135          assertTrue(f.isDone());
136          assertFalse(f.isCancelled());
137          assertTrue(f.toString().contains("[Completed exceptionally]"));
138      }
139  
140 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
141 +                                                Throwable ex) {
142 +        checkCompletedExceptionallyWithRootCause(f, ex);
143 +        try {
144 +            CompletableFuture<Throwable> spy = f.handle
145 +                ((U u, Throwable t) -> t);
146 +            assertTrue(spy.join() instanceof CompletionException);
147 +            assertSame(ex, spy.join().getCause());
148 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 +    }
150 +
151 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
152 +        checkCompletedExceptionallyWithRootCause(f, ex);
153 +        try {
154 +            CompletableFuture<Throwable> spy = f.handle
155 +                ((U u, Throwable t) -> t);
156 +            assertSame(ex, spy.join());
157 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
158 +    }
159 +
160      void checkCancelled(CompletableFuture<?> f) {
161          try {
162              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 216 | Line 239 | public class CompletableFutureTest exten
239       */
240      public void testCompleteExceptionally() {
241          CompletableFuture<Integer> f = new CompletableFuture<>();
242 +        CFException ex = new CFException();
243          checkIncomplete(f);
244 <        f.completeExceptionally(new CFException());
245 <        checkCompletedWithWrappedCFException(f);
244 >        f.completeExceptionally(ex);
245 >        checkCompletedExceptionally(f, ex);
246      }
247  
248      /**
# Line 247 | Line 271 | public class CompletableFutureTest exten
271          f = new CompletableFuture<>();
272          f.obtrudeValue(three);
273          checkCompletedNormally(f, three);
274 +        f.obtrudeValue(null);
275 +        checkCompletedNormally(f, null);
276          f = new CompletableFuture<>();
277          f.completeExceptionally(new CFException());
278          f.obtrudeValue(four);
# Line 257 | Line 283 | public class CompletableFutureTest exten
283       * obtrudeException forces completion with given exception
284       */
285      public void testObtrudeException() {
286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
287 <        checkIncomplete(f);
288 <        f.complete(one);
289 <        checkCompletedNormally(f, one);
290 <        f.obtrudeException(new CFException());
265 <        checkCompletedWithWrappedCFException(f);
286 >        for (Integer v1 : new Integer[] { 1, null })
287 >    {
288 >        CFException ex;
289 >        CompletableFuture<Integer> f;
290 >
291          f = new CompletableFuture<>();
292 <        f.obtrudeException(new CFException());
293 <        checkCompletedWithWrappedCFException(f);
292 >        f.complete(v1);
293 >        for (int i = 0; i < 2; i++) {
294 >            f.obtrudeException(ex = new CFException());
295 >            checkCompletedExceptionally(f, ex);
296 >        }
297 >
298          f = new CompletableFuture<>();
299 +        for (int i = 0; i < 2; i++) {
300 +            f.obtrudeException(ex = new CFException());
301 +            checkCompletedExceptionally(f, ex);
302 +        }
303 +
304 +        f = new CompletableFuture<>();
305 +        f.completeExceptionally(ex = new CFException());
306 +        f.obtrudeValue(v1);
307 +        checkCompletedNormally(f, v1);
308 +        f.obtrudeException(ex = new CFException());
309 +        checkCompletedExceptionally(f, ex);
310          f.completeExceptionally(new CFException());
311 <        f.obtrudeValue(four);
312 <        checkCompletedNormally(f, four);
313 <        f.obtrudeException(new CFException());
314 <        checkCompletedWithWrappedCFException(f);
275 <    }
311 >        checkCompletedExceptionally(f, ex);
312 >        f.complete(v1);
313 >        checkCompletedExceptionally(f, ex);
314 >    }}
315  
316      /**
317       * getNumberOfDependents returns number of dependent tasks
318       */
319      public void testGetNumberOfDependents() {
320          CompletableFuture<Integer> f = new CompletableFuture<>();
321 <        assertEquals(f.getNumberOfDependents(), 0);
322 <        CompletableFuture g = f.thenRun(new Noop());
323 <        assertEquals(f.getNumberOfDependents(), 1);
324 <        assertEquals(g.getNumberOfDependents(), 0);
325 <        CompletableFuture h = f.thenRun(new Noop());
326 <        assertEquals(f.getNumberOfDependents(), 2);
321 >        assertEquals(0, f.getNumberOfDependents());
322 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
323 >        assertEquals(1, f.getNumberOfDependents());
324 >        assertEquals(0, g.getNumberOfDependents());
325 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
326 >        assertEquals(2, f.getNumberOfDependents());
327          f.complete(1);
328          checkCompletedNormally(g, null);
329 <        assertEquals(f.getNumberOfDependents(), 0);
330 <        assertEquals(g.getNumberOfDependents(), 0);
329 >        assertEquals(0, f.getNumberOfDependents());
330 >        assertEquals(0, g.getNumberOfDependents());
331      }
332  
333      /**
# Line 306 | Line 345 | public class CompletableFutureTest exten
345          f = new CompletableFuture<String>();
346          f.completeExceptionally(new IndexOutOfBoundsException());
347          assertTrue(f.toString().contains("[Completed exceptionally]"));
348 +
349 +        f = new CompletableFuture<String>();
350 +        f.cancel(true);
351 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
352 +
353 +        f = new CompletableFuture<String>();
354 +        f.cancel(false);
355 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
356      }
357  
358      /**
# Line 316 | Line 363 | public class CompletableFutureTest exten
363          checkCompletedNormally(f, "test");
364      }
365  
366 <    // Choose non-commutative actions for better coverage
366 >    abstract class CheckedAction {
367 >        int invocationCount = 0;
368 >        final ExecutionMode m;
369 >        CheckedAction(ExecutionMode m) { this.m = m; }
370 >        void invoked() {
371 >            m.checkExecutionMode();
372 >            assertEquals(0, invocationCount++);
373 >        }
374 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
375 >        void assertInvoked() { assertEquals(1, invocationCount); }
376 >    }
377  
378 <    // A non-commutative function that handles and produces null values as well.
379 <    static Integer subtract(Integer x, Integer y) {
380 <        return (x == null && y == null) ? null :
381 <            ((x == null) ? 42 : x.intValue())
382 <            - ((y == null) ? 99 : y.intValue());
378 >    abstract class CheckedIntegerAction extends CheckedAction {
379 >        Integer value;
380 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
381 >        void assertValue(Integer expected) {
382 >            assertInvoked();
383 >            assertEquals(expected, value);
384 >        }
385 >    }
386 >
387 >    class IntegerSupplier extends CheckedAction
388 >        implements Supplier<Integer>
389 >    {
390 >        final Integer value;
391 >        IntegerSupplier(ExecutionMode m, Integer value) {
392 >            super(m);
393 >            this.value = value;
394 >        }
395 >        public Integer get() {
396 >            invoked();
397 >            return value;
398 >        }
399      }
400  
401      // A function that handles and produces null values as well.
# Line 330 | Line 403 | public class CompletableFutureTest exten
403          return (x == null) ? null : x + 1;
404      }
405  
406 <    static final Supplier<Integer> supplyOne =
407 <        () -> Integer.valueOf(1);
408 <    static final Function<Integer, Integer> inc =
409 <        (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; }
406 >    class NoopConsumer extends CheckedIntegerAction
407 >        implements Consumer<Integer>
408 >    {
409 >        NoopConsumer(ExecutionMode m) { super(m); }
410          public void accept(Integer x) {
411 <            invocationCount++;
412 <            value = inc(x);
411 >            invoked();
412 >            value = x;
413          }
414      }
415 <    static final class IncFunction implements Function<Integer,Integer> {
416 <        int invocationCount = 0;
417 <        Integer value;
418 <        public boolean ran() { return invocationCount == 1; }
415 >
416 >    class IncFunction extends CheckedIntegerAction
417 >        implements Function<Integer,Integer>
418 >    {
419 >        IncFunction(ExecutionMode m) { super(m); }
420          public Integer apply(Integer x) {
421 <            invocationCount++;
421 >            invoked();
422              return value = inc(x);
423          }
424      }
425 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
426 <        int invocationCount = 0;
427 <        Integer value;
428 <        // Check this action was invoked exactly once when result is computed.
429 <        public boolean ran() { return invocationCount == 1; }
425 >
426 >    // Choose non-commutative actions for better coverage
427 >    // A non-commutative function that handles and produces null values as well.
428 >    static Integer subtract(Integer x, Integer y) {
429 >        return (x == null && y == null) ? null :
430 >            ((x == null) ? 42 : x.intValue())
431 >            - ((y == null) ? 99 : y.intValue());
432 >    }
433 >
434 >    class SubtractAction extends CheckedIntegerAction
435 >        implements BiConsumer<Integer, Integer>
436 >    {
437 >        SubtractAction(ExecutionMode m) { super(m); }
438          public void accept(Integer x, Integer y) {
439 <            invocationCount++;
439 >            invoked();
440              value = subtract(x, y);
441          }
442      }
443 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
444 <        int invocationCount = 0;
445 <        Integer value;
446 <        // Check this action was invoked exactly once when result is computed.
447 <        public boolean ran() { return invocationCount == 1; }
443 >
444 >    class SubtractFunction extends CheckedIntegerAction
445 >        implements BiFunction<Integer, Integer, Integer>
446 >    {
447 >        SubtractFunction(ExecutionMode m) { super(m); }
448          public Integer apply(Integer x, Integer y) {
449 <            invocationCount++;
449 >            invoked();
450              return value = subtract(x, y);
451          }
452      }
453 <    static final class Noop implements Runnable {
454 <        boolean ran;
455 <        public void run() { ran = true; }
453 >
454 >    class Noop extends CheckedAction implements Runnable {
455 >        Noop(ExecutionMode m) { super(m); }
456 >        public void run() {
457 >            invoked();
458 >        }
459      }
460  
461 <    static final class FailingSupplier implements Supplier<Integer> {
462 <        boolean ran;
463 <        public Integer get() { ran = true; throw new CFException(); }
461 >    class FailingSupplier extends CheckedAction
462 >        implements Supplier<Integer>
463 >    {
464 >        FailingSupplier(ExecutionMode m) { super(m); }
465 >        public Integer get() {
466 >            invoked();
467 >            throw new CFException();
468 >        }
469      }
470 <    static final class FailingConsumer implements Consumer<Integer> {
471 <        boolean ran;
472 <        public void accept(Integer x) { ran = true; throw new CFException(); }
470 >
471 >    class FailingConsumer extends CheckedIntegerAction
472 >        implements Consumer<Integer>
473 >    {
474 >        FailingConsumer(ExecutionMode m) { super(m); }
475 >        public void accept(Integer x) {
476 >            invoked();
477 >            value = x;
478 >            throw new CFException();
479 >        }
480      }
481 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
482 <        boolean ran;
483 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
481 >
482 >    class FailingBiConsumer extends CheckedIntegerAction
483 >        implements BiConsumer<Integer, Integer>
484 >    {
485 >        FailingBiConsumer(ExecutionMode m) { super(m); }
486 >        public void accept(Integer x, Integer y) {
487 >            invoked();
488 >            value = subtract(x, y);
489 >            throw new CFException();
490 >        }
491      }
492 <    static final class FailingFunction implements Function<Integer, Integer> {
493 <        boolean ran;
494 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
492 >
493 >    class FailingFunction extends CheckedIntegerAction
494 >        implements Function<Integer, Integer>
495 >    {
496 >        FailingFunction(ExecutionMode m) { super(m); }
497 >        public Integer apply(Integer x) {
498 >            invoked();
499 >            value = x;
500 >            throw new CFException();
501 >        }
502      }
503 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
504 <        boolean ran;
505 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
503 >
504 >    class FailingBiFunction extends CheckedIntegerAction
505 >        implements BiFunction<Integer, Integer, Integer>
506 >    {
507 >        FailingBiFunction(ExecutionMode m) { super(m); }
508 >        public Integer apply(Integer x, Integer y) {
509 >            invoked();
510 >            value = subtract(x, y);
511 >            throw new CFException();
512 >        }
513      }
514 <    static final class FailingNoop implements Runnable {
515 <        boolean ran;
516 <        public void run() { ran = true; throw new CFException(); }
514 >
515 >    class FailingRunnable extends CheckedAction implements Runnable {
516 >        FailingRunnable(ExecutionMode m) { super(m); }
517 >        public void run() {
518 >            invoked();
519 >            throw new CFException();
520 >        }
521      }
522  
523 <    static final class CompletableFutureInc
524 <        implements Function<Integer, CompletableFuture<Integer>> {
525 <        boolean ran;
523 >
524 >    class CompletableFutureInc extends CheckedIntegerAction
525 >        implements Function<Integer, CompletableFuture<Integer>>
526 >    {
527 >        CompletableFutureInc(ExecutionMode m) { super(m); }
528          public CompletableFuture<Integer> apply(Integer x) {
529 <            ran = true;
529 >            invoked();
530 >            value = x;
531              CompletableFuture<Integer> f = new CompletableFuture<>();
532 <            f.complete(Integer.valueOf(x.intValue() + 1));
532 >            f.complete(inc(x));
533              return f;
534          }
535      }
536  
537 <    static final class FailingCompletableFutureFunction
538 <        implements Function<Integer, CompletableFuture<Integer>> {
539 <        boolean ran;
537 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
538 >        implements Function<Integer, CompletableFuture<Integer>>
539 >    {
540 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
541          public CompletableFuture<Integer> apply(Integer x) {
542 <            ran = true; throw new CFException();
542 >            invoked();
543 >            value = x;
544 >            throw new CFException();
545          }
546      }
547  
548      // Used for explicit executor tests
549      static final class ThreadExecutor implements Executor {
550 <        AtomicInteger count = new AtomicInteger(0);
550 >        final AtomicInteger count = new AtomicInteger(0);
551 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
552 >        static boolean startedCurrentThread() {
553 >            return Thread.currentThread().getThreadGroup() == tg;
554 >        }
555  
556          public void execute(Runnable r) {
557              count.getAndIncrement();
558 <            new Thread(r).start();
433 <        }
434 <    }
435 <
436 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
437 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
438 <    }
439 <
440 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
441 <        boolean ran;
442 <        public Integer apply(Integer x, Throwable t) {
443 <            ran = true;
444 <            return (t == null) ? two : three;
558 >            new Thread(tg, r).start();
559          }
560      }
561  
562      /**
563       * Permits the testing of parallel code for the 3 different
564 <     * execution modes without repeating all the testing code.
564 >     * execution modes without copy/pasting all the test methods.
565       */
566      enum ExecutionMode {
567          DEFAULT {
568 +            public void checkExecutionMode() {
569 +                assertFalse(ThreadExecutor.startedCurrentThread());
570 +                assertNull(ForkJoinTask.getPool());
571 +            }
572 +            public CompletableFuture<Void> runAsync(Runnable a) {
573 +                throw new UnsupportedOperationException();
574 +            }
575 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
576 +                throw new UnsupportedOperationException();
577 +            }
578 +            public <T> CompletableFuture<Void> thenRun
579 +                (CompletableFuture<T> f, Runnable a) {
580 +                return f.thenRun(a);
581 +            }
582 +            public <T> CompletableFuture<Void> thenAccept
583 +                (CompletableFuture<T> f, Consumer<? super T> a) {
584 +                return f.thenAccept(a);
585 +            }
586 +            public <T,U> CompletableFuture<U> thenApply
587 +                (CompletableFuture<T> f, Function<? super T,U> a) {
588 +                return f.thenApply(a);
589 +            }
590 +            public <T,U> CompletableFuture<U> thenCompose
591 +                (CompletableFuture<T> f,
592 +                 Function<? super T,? extends CompletionStage<U>> a) {
593 +                return f.thenCompose(a);
594 +            }
595 +            public <T,U> CompletableFuture<U> handle
596 +                (CompletableFuture<T> f,
597 +                 BiFunction<? super T,Throwable,? extends U> a) {
598 +                return f.handle(a);
599 +            }
600 +            public <T> CompletableFuture<T> whenComplete
601 +                (CompletableFuture<T> f,
602 +                 BiConsumer<? super T,? super Throwable> a) {
603 +                return f.whenComplete(a);
604 +            }
605              public <T,U> CompletableFuture<Void> runAfterBoth
606                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
607                  return f.runAfterBoth(g, a);
# Line 467 | Line 618 | public class CompletableFutureTest exten
618                   BiFunction<? super T,? super U,? extends V> a) {
619                  return f.thenCombine(g, a);
620              }
621 <            public <T,U> CompletableFuture<U> applyToEither
621 >            public <T> CompletableFuture<Void> runAfterEither
622                  (CompletableFuture<T> f,
623 <                 CompletionStage<? extends T> g,
624 <                 Function<? super T,U> a) {
625 <                return f.applyToEither(g, a);
623 >                 CompletionStage<?> g,
624 >                 java.lang.Runnable a) {
625 >                return f.runAfterEither(g, a);
626              }
627              public <T> CompletableFuture<Void> acceptEither
628                  (CompletableFuture<T> f,
# Line 479 | Line 630 | public class CompletableFutureTest exten
630                   Consumer<? super T> a) {
631                  return f.acceptEither(g, a);
632              }
633 <            public <T> CompletableFuture<Void> runAfterEither
633 >            public <T,U> CompletableFuture<U> applyToEither
634                  (CompletableFuture<T> f,
635 <                 CompletionStage<?> g,
636 <                 java.lang.Runnable a) {
637 <                return f.runAfterEither(g, a);
635 >                 CompletionStage<? extends T> g,
636 >                 Function<? super T,U> a) {
637 >                return f.applyToEither(g, a);
638 >            }
639 >        },
640 >
641 >        ASYNC {
642 >            public void checkExecutionMode() {
643 >                assertSame(ForkJoinPool.commonPool(),
644 >                           ForkJoinTask.getPool());
645 >            }
646 >            public CompletableFuture<Void> runAsync(Runnable a) {
647 >                return CompletableFuture.runAsync(a);
648 >            }
649 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
650 >                return CompletableFuture.supplyAsync(a);
651 >            }
652 >            public <T> CompletableFuture<Void> thenRun
653 >                (CompletableFuture<T> f, Runnable a) {
654 >                return f.thenRunAsync(a);
655 >            }
656 >            public <T> CompletableFuture<Void> thenAccept
657 >                (CompletableFuture<T> f, Consumer<? super T> a) {
658 >                return f.thenAcceptAsync(a);
659 >            }
660 >            public <T,U> CompletableFuture<U> thenApply
661 >                (CompletableFuture<T> f, Function<? super T,U> a) {
662 >                return f.thenApplyAsync(a);
663              }
664              public <T,U> CompletableFuture<U> thenCompose
665                  (CompletableFuture<T> f,
666                   Function<? super T,? extends CompletionStage<U>> a) {
667 <                return f.thenCompose(a);
667 >                return f.thenComposeAsync(a);
668 >            }
669 >            public <T,U> CompletableFuture<U> handle
670 >                (CompletableFuture<T> f,
671 >                 BiFunction<? super T,Throwable,? extends U> a) {
672 >                return f.handleAsync(a);
673              }
674              public <T> CompletableFuture<T> whenComplete
675                  (CompletableFuture<T> f,
676                   BiConsumer<? super T,? super Throwable> a) {
677 <                return f.whenComplete(a);
677 >                return f.whenCompleteAsync(a);
678              }
498        },
499
500 //             /** Experimental way to do more testing */
501 //         REVERSE_DEFAULT {
502 //             public <T,U> CompletableFuture<Void> runAfterBoth
503 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
504 //                 return g.runAfterBoth(f, a);
505 //             }
506 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
507 //                 (CompletableFuture<T> f,
508 //                  CompletionStage<? extends U> g,
509 //                  BiConsumer<? super T,? super U> a) {
510 //                 return DEFAULT.thenAcceptBoth(f, g, a);
511 //             }
512 //         },
513
514        DEFAULT_ASYNC {
679              public <T,U> CompletableFuture<Void> runAfterBoth
680                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
681                  return f.runAfterBothAsync(g, a);
# Line 528 | Line 692 | public class CompletableFutureTest exten
692                   BiFunction<? super T,? super U,? extends V> a) {
693                  return f.thenCombineAsync(g, a);
694              }
695 <            public <T,U> CompletableFuture<U> applyToEither
695 >            public <T> CompletableFuture<Void> runAfterEither
696                  (CompletableFuture<T> f,
697 <                 CompletionStage<? extends T> g,
698 <                 Function<? super T,U> a) {
699 <                return f.applyToEitherAsync(g, a);
697 >                 CompletionStage<?> g,
698 >                 java.lang.Runnable a) {
699 >                return f.runAfterEitherAsync(g, a);
700              }
701              public <T> CompletableFuture<Void> acceptEither
702                  (CompletableFuture<T> f,
# Line 540 | Line 704 | public class CompletableFutureTest exten
704                   Consumer<? super T> a) {
705                  return f.acceptEitherAsync(g, a);
706              }
707 <            public <T> CompletableFuture<Void> runAfterEither
707 >            public <T,U> CompletableFuture<U> applyToEither
708                  (CompletableFuture<T> f,
709 <                 CompletionStage<?> g,
710 <                 java.lang.Runnable a) {
711 <                return f.runAfterEitherAsync(g, a);
709 >                 CompletionStage<? extends T> g,
710 >                 Function<? super T,U> a) {
711 >                return f.applyToEitherAsync(g, a);
712 >            }
713 >        },
714 >
715 >        EXECUTOR {
716 >            public void checkExecutionMode() {
717 >                assertTrue(ThreadExecutor.startedCurrentThread());
718 >            }
719 >            public CompletableFuture<Void> runAsync(Runnable a) {
720 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
721 >            }
722 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
723 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
724 >            }
725 >            public <T> CompletableFuture<Void> thenRun
726 >                (CompletableFuture<T> f, Runnable a) {
727 >                return f.thenRunAsync(a, new ThreadExecutor());
728 >            }
729 >            public <T> CompletableFuture<Void> thenAccept
730 >                (CompletableFuture<T> f, Consumer<? super T> a) {
731 >                return f.thenAcceptAsync(a, new ThreadExecutor());
732 >            }
733 >            public <T,U> CompletableFuture<U> thenApply
734 >                (CompletableFuture<T> f, Function<? super T,U> a) {
735 >                return f.thenApplyAsync(a, new ThreadExecutor());
736              }
737              public <T,U> CompletableFuture<U> thenCompose
738                  (CompletableFuture<T> f,
739                   Function<? super T,? extends CompletionStage<U>> a) {
740 <                return f.thenComposeAsync(a);
740 >                return f.thenComposeAsync(a, new ThreadExecutor());
741 >            }
742 >            public <T,U> CompletableFuture<U> handle
743 >                (CompletableFuture<T> f,
744 >                 BiFunction<? super T,Throwable,? extends U> a) {
745 >                return f.handleAsync(a, new ThreadExecutor());
746              }
747              public <T> CompletableFuture<T> whenComplete
748                  (CompletableFuture<T> f,
749                   BiConsumer<? super T,? super Throwable> a) {
750 <                return f.whenCompleteAsync(a);
750 >                return f.whenCompleteAsync(a, new ThreadExecutor());
751              }
559        },
560
561 //         REVERSE_DEFAULT_ASYNC {
562 //             public <T,U> CompletableFuture<Void> runAfterBoth
563 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
564 //                 return f.runAfterBothAsync(g, a);
565 //             }
566 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
567 //                 (CompletableFuture<T> f,
568 //                  CompletionStage<? extends U> g,
569 //                  BiConsumer<? super T,? super U> a) {
570 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
571 //             }
572 //         },
573
574        EXECUTOR {
752              public <T,U> CompletableFuture<Void> runAfterBoth
753                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
754                  return f.runAfterBothAsync(g, a, new ThreadExecutor());
# Line 588 | Line 765 | public class CompletableFutureTest exten
765                   BiFunction<? super T,? super U,? extends V> a) {
766                  return f.thenCombineAsync(g, a, new ThreadExecutor());
767              }
591            public <T,U> CompletableFuture<U> applyToEither
592                (CompletableFuture<T> f,
593                 CompletionStage<? extends T> g,
594                 Function<? super T,U> a) {
595                return f.applyToEitherAsync(g, a, new ThreadExecutor());
596            }
597            public <T> CompletableFuture<Void> acceptEither
598                (CompletableFuture<T> f,
599                 CompletionStage<? extends T> g,
600                 Consumer<? super T> a) {
601                return f.acceptEitherAsync(g, a, new ThreadExecutor());
602            }
768              public <T> CompletableFuture<Void> runAfterEither
769                  (CompletableFuture<T> f,
770                   CompletionStage<?> g,
771                   java.lang.Runnable a) {
772                  return f.runAfterEitherAsync(g, a, new ThreadExecutor());
773              }
774 <            public <T,U> CompletableFuture<U> thenCompose
774 >            public <T> CompletableFuture<Void> acceptEither
775                  (CompletableFuture<T> f,
776 <                 Function<? super T,? extends CompletionStage<U>> a) {
777 <                return f.thenComposeAsync(a, new ThreadExecutor());
776 >                 CompletionStage<? extends T> g,
777 >                 Consumer<? super T> a) {
778 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
779              }
780 <            public <T> CompletableFuture<T> whenComplete
780 >            public <T,U> CompletableFuture<U> applyToEither
781                  (CompletableFuture<T> f,
782 <                 BiConsumer<? super T,? super Throwable> a) {
783 <                return f.whenCompleteAsync(a, new ThreadExecutor());
782 >                 CompletionStage<? extends T> g,
783 >                 Function<? super T,U> a) {
784 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
785              }
786          };
787  
788 +        public abstract void checkExecutionMode();
789 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
790 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
791 +        public abstract <T> CompletableFuture<Void> thenRun
792 +            (CompletableFuture<T> f, Runnable a);
793 +        public abstract <T> CompletableFuture<Void> thenAccept
794 +            (CompletableFuture<T> f, Consumer<? super T> a);
795 +        public abstract <T,U> CompletableFuture<U> thenApply
796 +            (CompletableFuture<T> f, Function<? super T,U> a);
797 +        public abstract <T,U> CompletableFuture<U> thenCompose
798 +            (CompletableFuture<T> f,
799 +             Function<? super T,? extends CompletionStage<U>> a);
800 +        public abstract <T,U> CompletableFuture<U> handle
801 +            (CompletableFuture<T> f,
802 +             BiFunction<? super T,Throwable,? extends U> a);
803 +        public abstract <T> CompletableFuture<T> whenComplete
804 +            (CompletableFuture<T> f,
805 +             BiConsumer<? super T,? super Throwable> a);
806          public abstract <T,U> CompletableFuture<Void> runAfterBoth
807              (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
808          public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
# Line 628 | Line 813 | public class CompletableFutureTest exten
813              (CompletableFuture<T> f,
814               CompletionStage<? extends U> g,
815               BiFunction<? super T,? super U,? extends V> a);
631        public abstract <T,U> CompletableFuture<U> applyToEither
632            (CompletableFuture<T> f,
633             CompletionStage<? extends T> g,
634             Function<? super T,U> a);
635        public abstract <T> CompletableFuture<Void> acceptEither
636            (CompletableFuture<T> f,
637             CompletionStage<? extends T> g,
638             Consumer<? super T> a);
816          public abstract <T> CompletableFuture<Void> runAfterEither
817              (CompletableFuture<T> f,
818               CompletionStage<?> g,
819               java.lang.Runnable a);
820 <        public abstract <T,U> CompletableFuture<U> thenCompose
820 >        public abstract <T> CompletableFuture<Void> acceptEither
821              (CompletableFuture<T> f,
822 <             Function<? super T,? extends CompletionStage<U>> a);
823 <        public abstract <T> CompletableFuture<T> whenComplete
822 >             CompletionStage<? extends T> g,
823 >             Consumer<? super T> a);
824 >        public abstract <T,U> CompletableFuture<U> applyToEither
825              (CompletableFuture<T> f,
826 <             BiConsumer<? super T,? super Throwable> a);
826 >             CompletionStage<? extends T> g,
827 >             Function<? super T,U> a);
828 >    }
829  
830 +    /**
831 +     * exceptionally action is not invoked when source completes
832 +     * normally, and source result is propagated
833 +     */
834 +    public void testExceptionally_normalCompletion() {
835 +        for (boolean createIncomplete : new boolean[] { true, false })
836 +        for (Integer v1 : new Integer[] { 1, null })
837 +    {
838 +        final AtomicInteger a = new AtomicInteger(0);
839 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
840 +        if (!createIncomplete) f.complete(v1);
841 +        final CompletableFuture<Integer> g = f.exceptionally
842 +            ((Throwable t) -> {
843 +                // Should not be called
844 +                a.getAndIncrement();
845 +                throw new AssertionError();
846 +            });
847 +        if (createIncomplete) f.complete(v1);
848 +
849 +        checkCompletedNormally(g, v1);
850 +        checkCompletedNormally(f, v1);
851 +        assertEquals(0, a.get());
852 +    }}
853  
651    }
854  
855      /**
856       * exceptionally action completes with function value on source
857 <     * exception; otherwise with source value
857 >     * exception
858       */
859 <    public void testExceptionally() {
860 <        CompletableFuture<Integer> f = new CompletableFuture<>();
861 <        ExceptionToInteger r = new ExceptionToInteger();
862 <        CompletableFuture<Integer> g = f.exceptionally(r);
863 <        f.completeExceptionally(new CFException());
864 <        checkCompletedNormally(g, three);
859 >    public void testExceptionally_exceptionalCompletion() {
860 >        for (boolean createIncomplete : new boolean[] { true, false })
861 >        for (Integer v1 : new Integer[] { 1, null })
862 >    {
863 >        final AtomicInteger a = new AtomicInteger(0);
864 >        final CFException ex = new CFException();
865 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
866 >        if (!createIncomplete) f.completeExceptionally(ex);
867 >        final CompletableFuture<Integer> g = f.exceptionally
868 >            ((Throwable t) -> {
869 >                ExecutionMode.DEFAULT.checkExecutionMode();
870 >                threadAssertSame(t, ex);
871 >                a.getAndIncrement();
872 >                return v1;
873 >            });
874 >        if (createIncomplete) f.completeExceptionally(ex);
875  
876 <        f = new CompletableFuture<>();
877 <        r = new ExceptionToInteger();
878 <        g = f.exceptionally(r);
879 <        f.complete(one);
880 <        checkCompletedNormally(g, one);
881 <    }
876 >        checkCompletedNormally(g, v1);
877 >        assertEquals(1, a.get());
878 >    }}
879 >
880 >    public void testExceptionally_exceptionalCompletionActionFailed() {
881 >        for (boolean createIncomplete : new boolean[] { true, false })
882 >        for (Integer v1 : new Integer[] { 1, null })
883 >    {
884 >        final AtomicInteger a = new AtomicInteger(0);
885 >        final CFException ex1 = new CFException();
886 >        final CFException ex2 = new CFException();
887 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
888 >        if (!createIncomplete) f.completeExceptionally(ex1);
889 >        final CompletableFuture<Integer> g = f.exceptionally
890 >            ((Throwable t) -> {
891 >                ExecutionMode.DEFAULT.checkExecutionMode();
892 >                threadAssertSame(t, ex1);
893 >                a.getAndIncrement();
894 >                throw ex2;
895 >            });
896 >        if (createIncomplete) f.completeExceptionally(ex1);
897 >
898 >        checkCompletedWithWrappedException(g, ex2);
899 >        assertEquals(1, a.get());
900 >    }}
901  
902      /**
903 <     * handle action completes normally with function value on either
904 <     * normal or exceptional completion of source
903 >     * handle action completes normally with function value on normal
904 >     * completion of source
905       */
906 <    public void testHandle() {
907 <        CompletableFuture<Integer> f, g;
908 <        IntegerHandler r;
906 >    public void testHandle_normalCompletion() {
907 >        for (ExecutionMode m : ExecutionMode.values())
908 >        for (boolean createIncomplete : new boolean[] { true, false })
909 >        for (Integer v1 : new Integer[] { 1, null })
910 >    {
911 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
912 >        final AtomicInteger a = new AtomicInteger(0);
913 >        if (!createIncomplete) f.complete(v1);
914 >        final CompletableFuture<Integer> g = m.handle
915 >            (f,
916 >             (Integer x, Throwable t) -> {
917 >                m.checkExecutionMode();
918 >                threadAssertSame(x, v1);
919 >                threadAssertNull(t);
920 >                a.getAndIncrement();
921 >                return inc(v1);
922 >            });
923 >        if (createIncomplete) f.complete(v1);
924  
925 <        f = new CompletableFuture<>();
926 <        f.completeExceptionally(new CFException());
927 <        g = f.handle(r = new IntegerHandler());
928 <        assertTrue(r.ran);
683 <        checkCompletedNormally(g, three);
925 >        checkCompletedNormally(g, inc(v1));
926 >        checkCompletedNormally(f, v1);
927 >        assertEquals(1, a.get());
928 >    }}
929  
930 <        f = new CompletableFuture<>();
931 <        g = f.handle(r = new IntegerHandler());
932 <        assertFalse(r.ran);
933 <        f.completeExceptionally(new CFException());
934 <        checkCompletedNormally(g, three);
935 <        assertTrue(r.ran);
930 >    /**
931 >     * handle action completes normally with function value on
932 >     * exceptional completion of source
933 >     */
934 >    public void testHandle_exceptionalCompletion() {
935 >        for (ExecutionMode m : ExecutionMode.values())
936 >        for (boolean createIncomplete : new boolean[] { true, false })
937 >        for (Integer v1 : new Integer[] { 1, null })
938 >    {
939 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
940 >        final AtomicInteger a = new AtomicInteger(0);
941 >        final CFException ex = new CFException();
942 >        if (!createIncomplete) f.completeExceptionally(ex);
943 >        final CompletableFuture<Integer> g = m.handle
944 >            (f,
945 >             (Integer x, Throwable t) -> {
946 >                m.checkExecutionMode();
947 >                threadAssertNull(x);
948 >                threadAssertSame(t, ex);
949 >                a.getAndIncrement();
950 >                return v1;
951 >            });
952 >        if (createIncomplete) f.completeExceptionally(ex);
953  
954 <        f = new CompletableFuture<>();
955 <        f.complete(one);
956 <        g = f.handle(r = new IntegerHandler());
957 <        assertTrue(r.ran);
696 <        checkCompletedNormally(g, two);
954 >        checkCompletedNormally(g, v1);
955 >        checkCompletedExceptionally(f, ex);
956 >        assertEquals(1, a.get());
957 >    }}
958  
959 <        f = new CompletableFuture<>();
960 <        g = f.handle(r = new IntegerHandler());
961 <        assertFalse(r.ran);
962 <        f.complete(one);
963 <        assertTrue(r.ran);
964 <        checkCompletedNormally(g, two);
965 <    }
959 >    /**
960 >     * handle action completes normally with function value on
961 >     * cancelled source
962 >     */
963 >    public void testHandle_sourceCancelled() {
964 >        for (ExecutionMode m : ExecutionMode.values())
965 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
972 >        final CompletableFuture<Integer> g = m.handle
973 >            (f,
974 >             (Integer x, Throwable t) -> {
975 >                m.checkExecutionMode();
976 >                threadAssertNull(x);
977 >                threadAssertTrue(t instanceof CancellationException);
978 >                a.getAndIncrement();
979 >                return v1;
980 >            });
981 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
982 >
983 >        checkCompletedNormally(g, v1);
984 >        checkCancelled(f);
985 >        assertEquals(1, a.get());
986 >    }}
987  
988      /**
989 <     * runAsync completes after running Runnable
989 >     * handle result completes exceptionally if action does
990       */
991 <    public void testRunAsync() {
992 <        Noop r = new Noop();
993 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
994 <        assertNull(f.join());
995 <        assertTrue(r.ran);
996 <        checkCompletedNormally(f, null);
997 <    }
991 >    public void testHandle_sourceFailedActionFailed() {
992 >        for (ExecutionMode m : ExecutionMode.values())
993 >        for (boolean createIncomplete : new boolean[] { true, false })
994 >    {
995 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
996 >        final AtomicInteger a = new AtomicInteger(0);
997 >        final CFException ex1 = new CFException();
998 >        final CFException ex2 = new CFException();
999 >        if (!createIncomplete) f.completeExceptionally(ex1);
1000 >        final CompletableFuture<Integer> g = m.handle
1001 >            (f,
1002 >             (Integer x, Throwable t) -> {
1003 >                m.checkExecutionMode();
1004 >                threadAssertNull(x);
1005 >                threadAssertSame(ex1, t);
1006 >                a.getAndIncrement();
1007 >                throw ex2;
1008 >            });
1009 >        if (createIncomplete) f.completeExceptionally(ex1);
1010 >
1011 >        checkCompletedWithWrappedException(g, ex2);
1012 >        checkCompletedExceptionally(f, ex1);
1013 >        assertEquals(1, a.get());
1014 >    }}
1015 >
1016 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (Integer v1 : new Integer[] { 1, null })
1020 >    {
1021 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1022 >        final AtomicInteger a = new AtomicInteger(0);
1023 >        final CFException ex = new CFException();
1024 >        if (!createIncomplete) f.complete(v1);
1025 >        final CompletableFuture<Integer> g = m.handle
1026 >            (f,
1027 >             (Integer x, Throwable t) -> {
1028 >                m.checkExecutionMode();
1029 >                threadAssertSame(x, v1);
1030 >                threadAssertNull(t);
1031 >                a.getAndIncrement();
1032 >                throw ex;
1033 >            });
1034 >        if (createIncomplete) f.complete(v1);
1035 >
1036 >        checkCompletedWithWrappedException(g, ex);
1037 >        checkCompletedNormally(f, v1);
1038 >        assertEquals(1, a.get());
1039 >    }}
1040  
1041      /**
1042 <     * runAsync with executor completes after running Runnable
1042 >     * runAsync completes after running Runnable
1043       */
1044 <    public void testRunAsync2() {
1045 <        Noop r = new Noop();
1046 <        ThreadExecutor exec = new ThreadExecutor();
1047 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
1044 >    public void testRunAsync_normalCompletion() {
1045 >        ExecutionMode[] executionModes = {
1046 >            ExecutionMode.ASYNC,
1047 >            ExecutionMode.EXECUTOR,
1048 >        };
1049 >        for (ExecutionMode m : executionModes)
1050 >    {
1051 >        final Noop r = new Noop(m);
1052 >        final CompletableFuture<Void> f = m.runAsync(r);
1053          assertNull(f.join());
725        assertTrue(r.ran);
1054          checkCompletedNormally(f, null);
1055 <        assertEquals(1, exec.count.get());
1056 <    }
1055 >        r.assertInvoked();
1056 >    }}
1057  
1058      /**
1059       * failing runAsync completes exceptionally after running Runnable
1060       */
1061 <    public void testRunAsync3() {
1062 <        FailingNoop r = new FailingNoop();
1063 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1061 >    public void testRunAsync_exceptionalCompletion() {
1062 >        ExecutionMode[] executionModes = {
1063 >            ExecutionMode.ASYNC,
1064 >            ExecutionMode.EXECUTOR,
1065 >        };
1066 >        for (ExecutionMode m : executionModes)
1067 >    {
1068 >        final FailingRunnable r = new FailingRunnable(m);
1069 >        final CompletableFuture<Void> f = m.runAsync(r);
1070          checkCompletedWithWrappedCFException(f);
1071 <        assertTrue(r.ran);
1072 <    }
1071 >        r.assertInvoked();
1072 >    }}
1073  
1074      /**
1075       * supplyAsync completes with result of supplier
1076       */
1077 <    public void testSupplyAsync() {
1078 <        CompletableFuture<Integer> f;
1079 <        f = CompletableFuture.supplyAsync(supplyOne);
1080 <        assertEquals(f.join(), one);
1081 <        checkCompletedNormally(f, one);
1082 <    }
1083 <
1084 <    /**
1085 <     * supplyAsync with executor completes with result of supplier
1086 <     */
1087 <    public void testSupplyAsync2() {
1088 <        CompletableFuture<Integer> f;
1089 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1090 <        assertEquals(f.join(), one);
757 <        checkCompletedNormally(f, one);
758 <    }
1077 >    public void testSupplyAsync_normalCompletion() {
1078 >        ExecutionMode[] executionModes = {
1079 >            ExecutionMode.ASYNC,
1080 >            ExecutionMode.EXECUTOR,
1081 >        };
1082 >        for (ExecutionMode m : executionModes)
1083 >        for (Integer v1 : new Integer[] { 1, null })
1084 >    {
1085 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1086 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1087 >        assertSame(v1, f.join());
1088 >        checkCompletedNormally(f, v1);
1089 >        r.assertInvoked();
1090 >    }}
1091  
1092      /**
1093       * Failing supplyAsync completes exceptionally
1094       */
1095 <    public void testSupplyAsync3() {
1096 <        FailingSupplier r = new FailingSupplier();
1097 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1095 >    public void testSupplyAsync_exceptionalCompletion() {
1096 >        ExecutionMode[] executionModes = {
1097 >            ExecutionMode.ASYNC,
1098 >            ExecutionMode.EXECUTOR,
1099 >        };
1100 >        for (ExecutionMode m : executionModes)
1101 >    {
1102 >        FailingSupplier r = new FailingSupplier(m);
1103 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1104          checkCompletedWithWrappedCFException(f);
1105 <        assertTrue(r.ran);
1106 <    }
1105 >        r.assertInvoked();
1106 >    }}
1107  
1108      // seq completion methods
1109  
1110      /**
1111       * thenRun result completes normally after normal completion of source
1112       */
1113 <    public void testThenRun() {
1114 <        CompletableFuture<Integer> f;
1115 <        CompletableFuture<Void> g;
1116 <        Noop r;
1117 <
1118 <        f = new CompletableFuture<>();
1119 <        g = f.thenRun(r = new Noop());
1120 <        f.complete(null);
1121 <        checkCompletedNormally(g, null);
1122 <        assertTrue(r.ran);
1113 >    public void testThenRun_normalCompletion() {
1114 >        for (ExecutionMode m : ExecutionMode.values())
1115 >        for (boolean createIncomplete : new boolean[] { true, false })
1116 >        for (Integer v1 : new Integer[] { 1, null })
1117 >    {
1118 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1119 >        final Noop r = new Noop(m);
1120 >        if (!createIncomplete) f.complete(v1);
1121 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1122 >        if (createIncomplete) {
1123 >            checkIncomplete(g);
1124 >            f.complete(v1);
1125 >        }
1126  
786        f = new CompletableFuture<>();
787        f.complete(null);
788        g = f.thenRun(r = new Noop());
1127          checkCompletedNormally(g, null);
1128 <        assertTrue(r.ran);
1129 <    }
1128 >        checkCompletedNormally(f, v1);
1129 >        r.assertInvoked();
1130 >    }}
1131  
1132      /**
1133       * thenRun result completes exceptionally after exceptional
1134       * completion of source
1135       */
1136 <    public void testThenRun2() {
1137 <        CompletableFuture<Integer> f;
1138 <        CompletableFuture<Void> g;
1139 <        Noop r;
1140 <
1141 <        f = new CompletableFuture<>();
1142 <        g = f.thenRun(r = new Noop());
1143 <        f.completeExceptionally(new CFException());
1144 <        checkCompletedWithWrappedCFException(g);
1145 <        assertFalse(r.ran);
1136 >    public void testThenRun_exceptionalCompletion() {
1137 >        for (ExecutionMode m : ExecutionMode.values())
1138 >        for (boolean createIncomplete : new boolean[] { true, false })
1139 >    {
1140 >        final CFException ex = new CFException();
1141 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1142 >        final Noop r = new Noop(m);
1143 >        if (!createIncomplete) f.completeExceptionally(ex);
1144 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1145 >        if (createIncomplete) {
1146 >            checkIncomplete(g);
1147 >            f.completeExceptionally(ex);
1148 >        }
1149  
1150 <        f = new CompletableFuture<>();
1151 <        f.completeExceptionally(new CFException());
1152 <        g = f.thenRun(r = new Noop());
1153 <        checkCompletedWithWrappedCFException(g);
812 <        assertFalse(r.ran);
813 <    }
1150 >        checkCompletedWithWrappedException(g, ex);
1151 >        checkCompletedExceptionally(f, ex);
1152 >        r.assertNotInvoked();
1153 >    }}
1154  
1155      /**
1156 <     * thenRun result completes exceptionally if action does
1156 >     * thenRun result completes exceptionally if source cancelled
1157       */
1158 <    public void testThenRun3() {
1159 <        CompletableFuture<Integer> f;
1160 <        CompletableFuture<Void> g;
1161 <        FailingNoop r;
1162 <
1163 <        f = new CompletableFuture<>();
1164 <        g = f.thenRun(r = new FailingNoop());
1165 <        f.complete(null);
1166 <        checkCompletedWithWrappedCFException(g);
1158 >    public void testThenRun_sourceCancelled() {
1159 >        for (ExecutionMode m : ExecutionMode.values())
1160 >        for (boolean createIncomplete : new boolean[] { true, false })
1161 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1162 >    {
1163 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1164 >        final Noop r = new Noop(m);
1165 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1166 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1167 >        if (createIncomplete) {
1168 >            checkIncomplete(g);
1169 >            assertTrue(f.cancel(mayInterruptIfRunning));
1170 >        }
1171  
1172 <        f = new CompletableFuture<>();
1173 <        f.complete(null);
1174 <        g = f.thenRun(r = new FailingNoop());
1175 <        checkCompletedWithWrappedCFException(g);
832 <    }
1172 >        checkCompletedWithWrappedCancellationException(g);
1173 >        checkCancelled(f);
1174 >        r.assertNotInvoked();
1175 >    }}
1176  
1177      /**
1178 <     * thenRun result completes exceptionally if source cancelled
1178 >     * thenRun result completes exceptionally if action does
1179       */
1180 <    public void testThenRun4() {
1181 <        CompletableFuture<Integer> f;
1182 <        CompletableFuture<Void> g;
1183 <        Noop r;
1184 <
1185 <        f = new CompletableFuture<>();
1186 <        g = f.thenRun(r = new Noop());
1187 <        assertTrue(f.cancel(true));
1188 <        checkCompletedWithWrappedCancellationException(g);
1180 >    public void testThenRun_actionFailed() {
1181 >        for (ExecutionMode m : ExecutionMode.values())
1182 >        for (boolean createIncomplete : new boolean[] { true, false })
1183 >        for (Integer v1 : new Integer[] { 1, null })
1184 >    {
1185 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1186 >        final FailingRunnable r = new FailingRunnable(m);
1187 >        if (!createIncomplete) f.complete(v1);
1188 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1189 >        if (createIncomplete) {
1190 >            checkIncomplete(g);
1191 >            f.complete(v1);
1192 >        }
1193  
1194 <        f = new CompletableFuture<>();
1195 <        assertTrue(f.cancel(true));
1196 <        g = f.thenRun(r = new Noop());
850 <        checkCompletedWithWrappedCancellationException(g);
851 <    }
1194 >        checkCompletedWithWrappedCFException(g);
1195 >        checkCompletedNormally(f, v1);
1196 >    }}
1197  
1198      /**
1199       * thenApply result completes normally after normal completion of source
1200       */
1201 <    public void testThenApply() {
1202 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1203 <        CompletableFuture<Integer> g = f.thenApply(inc);
1204 <        f.complete(one);
1205 <        checkCompletedNormally(g, two);
1206 <    }
1201 >    public void testThenApply_normalCompletion() {
1202 >        for (ExecutionMode m : ExecutionMode.values())
1203 >        for (boolean createIncomplete : new boolean[] { true, false })
1204 >        for (Integer v1 : new Integer[] { 1, null })
1205 >    {
1206 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1207 >        final IncFunction r = new IncFunction(m);
1208 >        if (!createIncomplete) f.complete(v1);
1209 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1210 >        if (createIncomplete) {
1211 >            checkIncomplete(g);
1212 >            f.complete(v1);
1213 >        }
1214 >
1215 >        checkCompletedNormally(g, inc(v1));
1216 >        checkCompletedNormally(f, v1);
1217 >        r.assertValue(inc(v1));
1218 >    }}
1219  
1220      /**
1221       * thenApply result completes exceptionally after exceptional
1222       * completion of source
1223       */
1224 <    public void testThenApply2() {
1225 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1226 <        CompletableFuture<Integer> g = f.thenApply(inc);
1227 <        f.completeExceptionally(new CFException());
1228 <        checkCompletedWithWrappedCFException(g);
1229 <    }
1224 >    public void testThenApply_exceptionalCompletion() {
1225 >        for (ExecutionMode m : ExecutionMode.values())
1226 >        for (boolean createIncomplete : new boolean[] { true, false })
1227 >    {
1228 >        final CFException ex = new CFException();
1229 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1230 >        final IncFunction r = new IncFunction(m);
1231 >        if (!createIncomplete) f.completeExceptionally(ex);
1232 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1233 >        if (createIncomplete) {
1234 >            checkIncomplete(g);
1235 >            f.completeExceptionally(ex);
1236 >        }
1237  
1238 <    /**
1239 <     * thenApply result completes exceptionally if action does
1240 <     */
1241 <    public void testThenApply3() {
878 <        CompletableFuture<Integer> f = new CompletableFuture<>();
879 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
880 <        f.complete(one);
881 <        checkCompletedWithWrappedCFException(g);
882 <    }
1238 >        checkCompletedWithWrappedException(g, ex);
1239 >        checkCompletedExceptionally(f, ex);
1240 >        r.assertNotInvoked();
1241 >    }}
1242  
1243      /**
1244       * thenApply result completes exceptionally if source cancelled
1245       */
1246 <    public void testThenApply4() {
1247 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1248 <        CompletableFuture<Integer> g = f.thenApply(inc);
1249 <        assertTrue(f.cancel(true));
1246 >    public void testThenApply_sourceCancelled() {
1247 >        for (ExecutionMode m : ExecutionMode.values())
1248 >        for (boolean createIncomplete : new boolean[] { true, false })
1249 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1250 >    {
1251 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1252 >        final IncFunction r = new IncFunction(m);
1253 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1254 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1255 >        if (createIncomplete) {
1256 >            checkIncomplete(g);
1257 >            assertTrue(f.cancel(mayInterruptIfRunning));
1258 >        }
1259 >
1260          checkCompletedWithWrappedCancellationException(g);
1261 <    }
1261 >        checkCancelled(f);
1262 >        r.assertNotInvoked();
1263 >    }}
1264 >
1265 >    /**
1266 >     * thenApply result completes exceptionally if action does
1267 >     */
1268 >    public void testThenApply_actionFailed() {
1269 >        for (ExecutionMode m : ExecutionMode.values())
1270 >        for (boolean createIncomplete : new boolean[] { true, false })
1271 >        for (Integer v1 : new Integer[] { 1, null })
1272 >    {
1273 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1274 >        final FailingFunction r = new FailingFunction(m);
1275 >        if (!createIncomplete) f.complete(v1);
1276 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1277 >        if (createIncomplete) {
1278 >            checkIncomplete(g);
1279 >            f.complete(v1);
1280 >        }
1281 >
1282 >        checkCompletedWithWrappedCFException(g);
1283 >        checkCompletedNormally(f, v1);
1284 >    }}
1285  
1286      /**
1287       * thenAccept result completes normally after normal completion of source
1288       */
1289 <    public void testThenAccept() {
1290 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1291 <        IncAction r = new IncAction();
1292 <        CompletableFuture<Void> g = f.thenAccept(r);
1293 <        f.complete(one);
1289 >    public void testThenAccept_normalCompletion() {
1290 >        for (ExecutionMode m : ExecutionMode.values())
1291 >        for (boolean createIncomplete : new boolean[] { true, false })
1292 >        for (Integer v1 : new Integer[] { 1, null })
1293 >    {
1294 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1295 >        final NoopConsumer r = new NoopConsumer(m);
1296 >        if (!createIncomplete) f.complete(v1);
1297 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1298 >        if (createIncomplete) {
1299 >            checkIncomplete(g);
1300 >            f.complete(v1);
1301 >        }
1302 >
1303          checkCompletedNormally(g, null);
1304 <        assertEquals(r.value, (Integer) 2);
1305 <    }
1304 >        r.assertValue(v1);
1305 >        checkCompletedNormally(f, v1);
1306 >    }}
1307  
1308      /**
1309       * thenAccept result completes exceptionally after exceptional
1310       * completion of source
1311       */
1312 <    public void testThenAccept2() {
1313 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1314 <        IncAction r = new IncAction();
1315 <        CompletableFuture<Void> g = f.thenAccept(r);
1316 <        f.completeExceptionally(new CFException());
1317 <        checkCompletedWithWrappedCFException(g);
1318 <    }
1312 >    public void testThenAccept_exceptionalCompletion() {
1313 >        for (ExecutionMode m : ExecutionMode.values())
1314 >        for (boolean createIncomplete : new boolean[] { true, false })
1315 >    {
1316 >        final CFException ex = new CFException();
1317 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1318 >        final NoopConsumer r = new NoopConsumer(m);
1319 >        if (!createIncomplete) f.completeExceptionally(ex);
1320 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1321 >        if (createIncomplete) {
1322 >            checkIncomplete(g);
1323 >            f.completeExceptionally(ex);
1324 >        }
1325  
1326 <    /**
1327 <     * thenAccept result completes exceptionally if action does
1328 <     */
1329 <    public void testThenAccept3() {
922 <        CompletableFuture<Integer> f = new CompletableFuture<>();
923 <        FailingConsumer r = new FailingConsumer();
924 <        CompletableFuture<Void> g = f.thenAccept(r);
925 <        f.complete(one);
926 <        checkCompletedWithWrappedCFException(g);
927 <        assertTrue(r.ran);
928 <    }
1326 >        checkCompletedWithWrappedException(g, ex);
1327 >        checkCompletedExceptionally(f, ex);
1328 >        r.assertNotInvoked();
1329 >    }}
1330  
1331      /**
1332       * thenAccept result completes exceptionally if source cancelled
1333       */
1334 <    public void testThenAccept4() {
1335 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1336 <        IncAction r = new IncAction();
1337 <        CompletableFuture<Void> g = f.thenAccept(r);
1338 <        assertTrue(f.cancel(true));
1334 >    public void testThenAccept_sourceCancelled() {
1335 >        for (ExecutionMode m : ExecutionMode.values())
1336 >        for (boolean createIncomplete : new boolean[] { true, false })
1337 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1338 >    {
1339 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1340 >        final NoopConsumer r = new NoopConsumer(m);
1341 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1342 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1343 >        if (createIncomplete) {
1344 >            checkIncomplete(g);
1345 >            assertTrue(f.cancel(mayInterruptIfRunning));
1346 >        }
1347 >
1348          checkCompletedWithWrappedCancellationException(g);
1349 <    }
1349 >        checkCancelled(f);
1350 >        r.assertNotInvoked();
1351 >    }}
1352  
1353      /**
1354 <     * thenCombine result completes normally after normal completion
943 <     * of sources
1354 >     * thenAccept result completes exceptionally if action does
1355       */
1356 <    public void testThenCombine_normalCompletion1() {
1356 >    public void testThenAccept_actionFailed() {
1357          for (ExecutionMode m : ExecutionMode.values())
1358 +        for (boolean createIncomplete : new boolean[] { true, false })
1359          for (Integer v1 : new Integer[] { 1, null })
1360 <        for (Integer v2 : new Integer[] { 2, null }) {
949 <
1360 >    {
1361          final CompletableFuture<Integer> f = new CompletableFuture<>();
1362 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1363 <        final SubtractFunction r = new SubtractFunction();
1364 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1365 <
1366 <        f.complete(v1);
1367 <        checkIncomplete(h);
957 <        assertFalse(r.ran());
958 <        g.complete(v2);
959 <
960 <        checkCompletedNormally(h, subtract(v1, v2));
961 <        checkCompletedNormally(f, v1);
962 <        checkCompletedNormally(g, v2);
1362 >        final FailingConsumer r = new FailingConsumer(m);
1363 >        if (!createIncomplete) f.complete(v1);
1364 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1365 >        if (createIncomplete) {
1366 >            checkIncomplete(g);
1367 >            f.complete(v1);
1368          }
964    }
965
966    public void testThenCombine_normalCompletion2() {
967        for (ExecutionMode m : ExecutionMode.values())
968        for (Integer v1 : new Integer[] { 1, null })
969        for (Integer v2 : new Integer[] { 2, null }) {
970
971        final CompletableFuture<Integer> f = new CompletableFuture<>();
972        final CompletableFuture<Integer> g = new CompletableFuture<>();
973        final SubtractFunction r = new SubtractFunction();
974        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
975
976        g.complete(v2);
977        checkIncomplete(h);
978        assertFalse(r.ran());
979        f.complete(v1);
1369  
1370 <        checkCompletedNormally(h, subtract(v1, v2));
1370 >        checkCompletedWithWrappedCFException(g);
1371          checkCompletedNormally(f, v1);
1372 <        checkCompletedNormally(g, v2);
984 <        }
985 <    }
1372 >    }}
1373  
1374 <    public void testThenCombine_normalCompletion3() {
1374 >    /**
1375 >     * thenCombine result completes normally after normal completion
1376 >     * of sources
1377 >     */
1378 >    public void testThenCombine_normalCompletion() {
1379          for (ExecutionMode m : ExecutionMode.values())
1380 +        for (boolean createIncomplete : new boolean[] { true, false })
1381 +        for (boolean fFirst : new boolean[] { true, false })
1382          for (Integer v1 : new Integer[] { 1, null })
1383 <        for (Integer v2 : new Integer[] { 2, null }) {
1384 <
1383 >        for (Integer v2 : new Integer[] { 2, null })
1384 >    {
1385          final CompletableFuture<Integer> f = new CompletableFuture<>();
1386          final CompletableFuture<Integer> g = new CompletableFuture<>();
1387 <        final SubtractFunction r = new SubtractFunction();
1387 >        final SubtractFunction r = new SubtractFunction(m);
1388  
1389 <        g.complete(v2);
1390 <        f.complete(v1);
1389 >        if (fFirst) f.complete(v1); else g.complete(v2);
1390 >        if (!createIncomplete)
1391 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1392          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1393 <
1394 <        checkCompletedNormally(h, subtract(v1, v2));
1395 <        checkCompletedNormally(f, v1);
1396 <        checkCompletedNormally(g, v2);
1393 >        if (createIncomplete) {
1394 >            checkIncomplete(h);
1395 >            r.assertNotInvoked();
1396 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1397          }
1004    }
1005
1006    public void testThenCombine_normalCompletion4() {
1007        for (ExecutionMode m : ExecutionMode.values())
1008        for (Integer v1 : new Integer[] { 1, null })
1009        for (Integer v2 : new Integer[] { 2, null }) {
1010
1011        final CompletableFuture<Integer> f = new CompletableFuture<>();
1012        final CompletableFuture<Integer> g = new CompletableFuture<>();
1013        final SubtractFunction r = new SubtractFunction();
1014
1015        f.complete(v1);
1016        g.complete(v2);
1017        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1398  
1399          checkCompletedNormally(h, subtract(v1, v2));
1400          checkCompletedNormally(f, v1);
1401          checkCompletedNormally(g, v2);
1402 <        }
1403 <    }
1402 >        r.assertValue(subtract(v1, v2));
1403 >    }}
1404  
1405      /**
1406       * thenCombine result completes exceptionally after exceptional
1407       * completion of either source
1408       */
1409 <    public void testThenCombine_exceptionalCompletion1() {
1409 >    public void testThenCombine_exceptionalCompletion() {
1410          for (ExecutionMode m : ExecutionMode.values())
1411 <        for (Integer v1 : new Integer[] { 1, null }) {
1412 <
1411 >        for (boolean createIncomplete : new boolean[] { true, false })
1412 >        for (boolean fFirst : new boolean[] { true, false })
1413 >        for (Integer v1 : new Integer[] { 1, null })
1414 >    {
1415          final CompletableFuture<Integer> f = new CompletableFuture<>();
1416          final CompletableFuture<Integer> g = new CompletableFuture<>();
1035        final SubtractFunction r = new SubtractFunction();
1036        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1417          final CFException ex = new CFException();
1418 +        final SubtractFunction r = new SubtractFunction(m);
1419  
1420 <        f.completeExceptionally(ex);
1421 <        checkIncomplete(h);
1422 <        g.complete(v1);
1042 <
1043 <        checkCompletedWithWrappedCFException(h, ex);
1044 <        checkCompletedWithWrappedCFException(f, ex);
1045 <        assertFalse(r.ran());
1046 <        checkCompletedNormally(g, v1);
1047 <        }
1048 <    }
1049 <
1050 <    public void testThenCombine_exceptionalCompletion2() {
1051 <        for (ExecutionMode m : ExecutionMode.values())
1052 <        for (Integer v1 : new Integer[] { 1, null }) {
1053 <
1054 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1055 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1056 <        final SubtractFunction r = new SubtractFunction();
1420 >        (fFirst ? f : g).complete(v1);
1421 >        if (!createIncomplete)
1422 >            (!fFirst ? f : g).completeExceptionally(ex);
1423          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1424 <        final CFException ex = new CFException();
1425 <
1426 <        g.completeExceptionally(ex);
1061 <        checkIncomplete(h);
1062 <        f.complete(v1);
1063 <
1064 <        checkCompletedWithWrappedCFException(h, ex);
1065 <        checkCompletedWithWrappedCFException(g, ex);
1066 <        assertFalse(r.ran());
1067 <        checkCompletedNormally(f, v1);
1424 >        if (createIncomplete) {
1425 >            checkIncomplete(h);
1426 >            (!fFirst ? f : g).completeExceptionally(ex);
1427          }
1069    }
1070
1071    public void testThenCombine_exceptionalCompletion3() {
1072        for (ExecutionMode m : ExecutionMode.values())
1073        for (Integer v1 : new Integer[] { 1, null }) {
1074
1075        final CompletableFuture<Integer> f = new CompletableFuture<>();
1076        final CompletableFuture<Integer> g = new CompletableFuture<>();
1077        final SubtractFunction r = new SubtractFunction();
1078        final CFException ex = new CFException();
1428  
1429 <        g.completeExceptionally(ex);
1430 <        f.complete(v1);
1431 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1429 >        checkCompletedWithWrappedException(h, ex);
1430 >        r.assertNotInvoked();
1431 >        checkCompletedNormally(fFirst ? f : g, v1);
1432 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1433 >    }}
1434  
1435 <        checkCompletedWithWrappedCFException(h, ex);
1436 <        checkCompletedWithWrappedCFException(g, ex);
1437 <        assertFalse(r.ran());
1438 <        checkCompletedNormally(f, v1);
1088 <        }
1089 <    }
1090 <
1091 <    public void testThenCombine_exceptionalCompletion4() {
1435 >    /**
1436 >     * thenCombine result completes exceptionally if either source cancelled
1437 >     */
1438 >    public void testThenCombine_sourceCancelled() {
1439          for (ExecutionMode m : ExecutionMode.values())
1440 <        for (Integer v1 : new Integer[] { 1, null }) {
1441 <
1440 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1441 >        for (boolean createIncomplete : new boolean[] { true, false })
1442 >        for (boolean fFirst : new boolean[] { true, false })
1443 >        for (Integer v1 : new Integer[] { 1, null })
1444 >    {
1445          final CompletableFuture<Integer> f = new CompletableFuture<>();
1446          final CompletableFuture<Integer> g = new CompletableFuture<>();
1447 <        final SubtractFunction r = new SubtractFunction();
1098 <        final CFException ex = new CFException();
1447 >        final SubtractFunction r = new SubtractFunction(m);
1448  
1449 <        f.completeExceptionally(ex);
1450 <        g.complete(v1);
1449 >        (fFirst ? f : g).complete(v1);
1450 >        if (!createIncomplete)
1451 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1452          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1453 <
1454 <        checkCompletedWithWrappedCFException(h, ex);
1455 <        checkCompletedWithWrappedCFException(f, ex);
1106 <        assertFalse(r.ran());
1107 <        checkCompletedNormally(g, v1);
1453 >        if (createIncomplete) {
1454 >            checkIncomplete(h);
1455 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1456          }
1457 <    }
1457 >
1458 >        checkCompletedWithWrappedCancellationException(h);
1459 >        checkCancelled(!fFirst ? f : g);
1460 >        r.assertNotInvoked();
1461 >        checkCompletedNormally(fFirst ? f : g, v1);
1462 >    }}
1463  
1464      /**
1465       * thenCombine result completes exceptionally if action does
1466       */
1467 <    public void testThenCombine_actionFailed1() {
1467 >    public void testThenCombine_actionFailed() {
1468          for (ExecutionMode m : ExecutionMode.values())
1469 +        for (boolean fFirst : new boolean[] { true, false })
1470          for (Integer v1 : new Integer[] { 1, null })
1471 <        for (Integer v2 : new Integer[] { 2, null }) {
1472 <
1471 >        for (Integer v2 : new Integer[] { 2, null })
1472 >    {
1473          final CompletableFuture<Integer> f = new CompletableFuture<>();
1474          final CompletableFuture<Integer> g = new CompletableFuture<>();
1475 <        final FailingBiFunction r = new FailingBiFunction();
1475 >        final FailingBiFunction r = new FailingBiFunction(m);
1476          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1477  
1478 <        f.complete(v1);
1479 <        checkIncomplete(h);
1480 <        g.complete(v2);
1478 >        if (fFirst) {
1479 >            f.complete(v1);
1480 >            g.complete(v2);
1481 >        } else {
1482 >            g.complete(v2);
1483 >            f.complete(v1);
1484 >        }
1485  
1486          checkCompletedWithWrappedCFException(h);
1487          checkCompletedNormally(f, v1);
1488          checkCompletedNormally(g, v2);
1489 <        }
1132 <    }
1489 >    }}
1490  
1491 <    public void testThenCombine_actionFailed2() {
1491 >    /**
1492 >     * thenAcceptBoth result completes normally after normal
1493 >     * completion of sources
1494 >     */
1495 >    public void testThenAcceptBoth_normalCompletion() {
1496          for (ExecutionMode m : ExecutionMode.values())
1497 +        for (boolean createIncomplete : new boolean[] { true, false })
1498 +        for (boolean fFirst : new boolean[] { true, false })
1499          for (Integer v1 : new Integer[] { 1, null })
1500 <        for (Integer v2 : new Integer[] { 2, null }) {
1501 <
1500 >        for (Integer v2 : new Integer[] { 2, null })
1501 >    {
1502          final CompletableFuture<Integer> f = new CompletableFuture<>();
1503          final CompletableFuture<Integer> g = new CompletableFuture<>();
1504 <        final FailingBiFunction r = new FailingBiFunction();
1142 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1504 >        final SubtractAction r = new SubtractAction(m);
1505  
1506 <        g.complete(v2);
1507 <        checkIncomplete(h);
1508 <        f.complete(v1);
1506 >        if (fFirst) f.complete(v1); else g.complete(v2);
1507 >        if (!createIncomplete)
1508 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1509 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1510 >        if (createIncomplete) {
1511 >            checkIncomplete(h);
1512 >            r.assertNotInvoked();
1513 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1514 >        }
1515  
1516 <        checkCompletedWithWrappedCFException(h);
1516 >        checkCompletedNormally(h, null);
1517 >        r.assertValue(subtract(v1, v2));
1518          checkCompletedNormally(f, v1);
1519          checkCompletedNormally(g, v2);
1520 <        }
1152 <    }
1520 >    }}
1521  
1522      /**
1523 <     * thenCombine result completes exceptionally if either source cancelled
1523 >     * thenAcceptBoth result completes exceptionally after exceptional
1524 >     * completion of either source
1525       */
1526 <    public void testThenCombine_sourceCancelled1() {
1526 >    public void testThenAcceptBoth_exceptionalCompletion() {
1527          for (ExecutionMode m : ExecutionMode.values())
1528 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1529 <        for (Integer v1 : new Integer[] { 1, null }) {
1530 <
1528 >        for (boolean createIncomplete : new boolean[] { true, false })
1529 >        for (boolean fFirst : new boolean[] { true, false })
1530 >        for (Integer v1 : new Integer[] { 1, null })
1531 >    {
1532          final CompletableFuture<Integer> f = new CompletableFuture<>();
1533          final CompletableFuture<Integer> g = new CompletableFuture<>();
1534 <        final SubtractFunction r = new SubtractFunction();
1535 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1166 <
1167 <        assertTrue(f.cancel(mayInterruptIfRunning));
1168 <        checkIncomplete(h);
1169 <        g.complete(v1);
1534 >        final CFException ex = new CFException();
1535 >        final SubtractAction r = new SubtractAction(m);
1536  
1537 <        checkCompletedWithWrappedCancellationException(h);
1538 <        checkCancelled(f);
1539 <        assertFalse(r.ran());
1540 <        checkCompletedNormally(g, v1);
1537 >        (fFirst ? f : g).complete(v1);
1538 >        if (!createIncomplete)
1539 >            (!fFirst ? f : g).completeExceptionally(ex);
1540 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1541 >        if (createIncomplete) {
1542 >            checkIncomplete(h);
1543 >            (!fFirst ? f : g).completeExceptionally(ex);
1544          }
1176    }
1177
1178    public void testThenCombine_sourceCancelled2() {
1179        for (ExecutionMode m : ExecutionMode.values())
1180        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1181        for (Integer v1 : new Integer[] { 1, null }) {
1182
1183        final CompletableFuture<Integer> f = new CompletableFuture<>();
1184        final CompletableFuture<Integer> g = new CompletableFuture<>();
1185        final SubtractFunction r = new SubtractFunction();
1186        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1187
1188        assertTrue(g.cancel(mayInterruptIfRunning));
1189        checkIncomplete(h);
1190        f.complete(v1);
1545  
1546 <        checkCompletedWithWrappedCancellationException(h);
1547 <        checkCancelled(g);
1548 <        assertFalse(r.ran());
1549 <        checkCompletedNormally(f, v1);
1550 <        }
1197 <    }
1546 >        checkCompletedWithWrappedException(h, ex);
1547 >        r.assertNotInvoked();
1548 >        checkCompletedNormally(fFirst ? f : g, v1);
1549 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1550 >    }}
1551  
1552 <    public void testThenCombine_sourceCancelled3() {
1552 >    /**
1553 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1554 >     */
1555 >    public void testThenAcceptBoth_sourceCancelled() {
1556          for (ExecutionMode m : ExecutionMode.values())
1557          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1558 <        for (Integer v1 : new Integer[] { 1, null }) {
1559 <
1558 >        for (boolean createIncomplete : new boolean[] { true, false })
1559 >        for (boolean fFirst : new boolean[] { true, false })
1560 >        for (Integer v1 : new Integer[] { 1, null })
1561 >    {
1562          final CompletableFuture<Integer> f = new CompletableFuture<>();
1563          final CompletableFuture<Integer> g = new CompletableFuture<>();
1564 <        final SubtractFunction r = new SubtractFunction();
1207 <
1208 <        assertTrue(g.cancel(mayInterruptIfRunning));
1209 <        f.complete(v1);
1210 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1564 >        final SubtractAction r = new SubtractAction(m);
1565  
1566 <        checkCompletedWithWrappedCancellationException(h);
1567 <        checkCancelled(g);
1568 <        assertFalse(r.ran());
1569 <        checkCompletedNormally(f, v1);
1566 >        (fFirst ? f : g).complete(v1);
1567 >        if (!createIncomplete)
1568 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1569 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1570 >        if (createIncomplete) {
1571 >            checkIncomplete(h);
1572 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1573          }
1217    }
1218
1219    public void testThenCombine_sourceCancelled4() {
1220        for (ExecutionMode m : ExecutionMode.values())
1221        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1222        for (Integer v1 : new Integer[] { 1, null }) {
1223
1224        final CompletableFuture<Integer> f = new CompletableFuture<>();
1225        final CompletableFuture<Integer> g = new CompletableFuture<>();
1226        final SubtractFunction r = new SubtractFunction();
1227
1228        assertTrue(f.cancel(mayInterruptIfRunning));
1229        g.complete(v1);
1230        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1574  
1575          checkCompletedWithWrappedCancellationException(h);
1576 <        checkCancelled(f);
1577 <        assertFalse(r.ran());
1578 <        checkCompletedNormally(g, v1);
1579 <        }
1237 <    }
1576 >        checkCancelled(!fFirst ? f : g);
1577 >        r.assertNotInvoked();
1578 >        checkCompletedNormally(fFirst ? f : g, v1);
1579 >    }}
1580  
1581      /**
1582 <     * thenAcceptBoth result completes normally after normal
1241 <     * completion of sources
1582 >     * thenAcceptBoth result completes exceptionally if action does
1583       */
1584 <    public void testThenAcceptBoth_normalCompletion1() {
1584 >    public void testThenAcceptBoth_actionFailed() {
1585          for (ExecutionMode m : ExecutionMode.values())
1586 +        for (boolean fFirst : new boolean[] { true, false })
1587          for (Integer v1 : new Integer[] { 1, null })
1588 <        for (Integer v2 : new Integer[] { 2, null }) {
1589 <
1588 >        for (Integer v2 : new Integer[] { 2, null })
1589 >    {
1590          final CompletableFuture<Integer> f = new CompletableFuture<>();
1591          final CompletableFuture<Integer> g = new CompletableFuture<>();
1592 <        final SubtractAction r = new SubtractAction();
1592 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1593          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1594  
1595 <        f.complete(v1);
1596 <        checkIncomplete(h);
1597 <        assertFalse(r.ran());
1598 <        g.complete(v2);
1599 <
1600 <        checkCompletedNormally(h, null);
1259 <        assertEquals(r.value, subtract(v1, v2));
1260 <        checkCompletedNormally(f, v1);
1261 <        checkCompletedNormally(g, v2);
1595 >        if (fFirst) {
1596 >            f.complete(v1);
1597 >            g.complete(v2);
1598 >        } else {
1599 >            g.complete(v2);
1600 >            f.complete(v1);
1601          }
1263    }
1264
1265    public void testThenAcceptBoth_normalCompletion2() {
1266        for (ExecutionMode m : ExecutionMode.values())
1267        for (Integer v1 : new Integer[] { 1, null })
1268        for (Integer v2 : new Integer[] { 2, null }) {
1269
1270        final CompletableFuture<Integer> f = new CompletableFuture<>();
1271        final CompletableFuture<Integer> g = new CompletableFuture<>();
1272        final SubtractAction r = new SubtractAction();
1273        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1274
1275        g.complete(v2);
1276        checkIncomplete(h);
1277        assertFalse(r.ran());
1278        f.complete(v1);
1602  
1603 <        checkCompletedNormally(h, null);
1281 <        assertEquals(r.value, subtract(v1, v2));
1603 >        checkCompletedWithWrappedCFException(h);
1604          checkCompletedNormally(f, v1);
1605          checkCompletedNormally(g, v2);
1606 <        }
1285 <    }
1606 >    }}
1607  
1608 <    public void testThenAcceptBoth_normalCompletion3() {
1608 >    /**
1609 >     * runAfterBoth result completes normally after normal
1610 >     * completion of sources
1611 >     */
1612 >    public void testRunAfterBoth_normalCompletion() {
1613          for (ExecutionMode m : ExecutionMode.values())
1614 +        for (boolean createIncomplete : new boolean[] { true, false })
1615 +        for (boolean fFirst : new boolean[] { true, false })
1616          for (Integer v1 : new Integer[] { 1, null })
1617 <        for (Integer v2 : new Integer[] { 2, null }) {
1618 <
1617 >        for (Integer v2 : new Integer[] { 2, null })
1618 >    {
1619          final CompletableFuture<Integer> f = new CompletableFuture<>();
1620          final CompletableFuture<Integer> g = new CompletableFuture<>();
1621 <        final SubtractAction r = new SubtractAction();
1295 <
1296 <        g.complete(v2);
1297 <        f.complete(v1);
1298 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1621 >        final Noop r = new Noop(m);
1622  
1623 <        checkCompletedNormally(h, null);
1624 <        assertEquals(r.value, subtract(v1, v2));
1625 <        checkCompletedNormally(f, v1);
1626 <        checkCompletedNormally(g, v2);
1623 >        if (fFirst) f.complete(v1); else g.complete(v2);
1624 >        if (!createIncomplete)
1625 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1626 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1627 >        if (createIncomplete) {
1628 >            checkIncomplete(h);
1629 >            r.assertNotInvoked();
1630 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1631          }
1305    }
1306
1307    public void testThenAcceptBoth_normalCompletion4() {
1308        for (ExecutionMode m : ExecutionMode.values())
1309        for (Integer v1 : new Integer[] { 1, null })
1310        for (Integer v2 : new Integer[] { 2, null }) {
1311
1312        final CompletableFuture<Integer> f = new CompletableFuture<>();
1313        final CompletableFuture<Integer> g = new CompletableFuture<>();
1314        final SubtractAction r = new SubtractAction();
1315
1316        f.complete(v1);
1317        g.complete(v2);
1318        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1632  
1633          checkCompletedNormally(h, null);
1634 <        assertEquals(r.value, subtract(v1, v2));
1634 >        r.assertInvoked();
1635          checkCompletedNormally(f, v1);
1636          checkCompletedNormally(g, v2);
1637 <        }
1325 <    }
1637 >    }}
1638  
1639      /**
1640 <     * thenAcceptBoth result completes exceptionally after exceptional
1640 >     * runAfterBoth result completes exceptionally after exceptional
1641       * completion of either source
1642       */
1643 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1643 >    public void testRunAfterBoth_exceptionalCompletion() {
1644          for (ExecutionMode m : ExecutionMode.values())
1645 <        for (Integer v1 : new Integer[] { 1, null }) {
1646 <
1645 >        for (boolean createIncomplete : new boolean[] { true, false })
1646 >        for (boolean fFirst : new boolean[] { true, false })
1647 >        for (Integer v1 : new Integer[] { 1, null })
1648 >    {
1649          final CompletableFuture<Integer> f = new CompletableFuture<>();
1650          final CompletableFuture<Integer> g = new CompletableFuture<>();
1337        final SubtractAction r = new SubtractAction();
1338        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1651          final CFException ex = new CFException();
1652 +        final Noop r = new Noop(m);
1653  
1654 <        f.completeExceptionally(ex);
1655 <        checkIncomplete(h);
1656 <        g.complete(v1);
1657 <
1658 <        checkCompletedWithWrappedCFException(h, ex);
1659 <        checkCompletedWithWrappedCFException(f, ex);
1660 <        assertFalse(r.ran());
1348 <        checkCompletedNormally(g, v1);
1654 >        (fFirst ? f : g).complete(v1);
1655 >        if (!createIncomplete)
1656 >            (!fFirst ? f : g).completeExceptionally(ex);
1657 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1658 >        if (createIncomplete) {
1659 >            checkIncomplete(h);
1660 >            (!fFirst ? f : g).completeExceptionally(ex);
1661          }
1350    }
1351
1352    public void testThenAcceptBoth_exceptionalCompletion2() {
1353        for (ExecutionMode m : ExecutionMode.values())
1354        for (Integer v1 : new Integer[] { 1, null }) {
1355
1356        final CompletableFuture<Integer> f = new CompletableFuture<>();
1357        final CompletableFuture<Integer> g = new CompletableFuture<>();
1358        final SubtractAction r = new SubtractAction();
1359        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1360        final CFException ex = new CFException();
1662  
1663 <        g.completeExceptionally(ex);
1664 <        checkIncomplete(h);
1665 <        f.complete(v1);
1666 <
1667 <        checkCompletedWithWrappedCFException(h, ex);
1367 <        checkCompletedWithWrappedCFException(g, ex);
1368 <        assertFalse(r.ran());
1369 <        checkCompletedNormally(f, v1);
1370 <        }
1371 <    }
1663 >        checkCompletedWithWrappedException(h, ex);
1664 >        r.assertNotInvoked();
1665 >        checkCompletedNormally(fFirst ? f : g, v1);
1666 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1667 >    }}
1668  
1669 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1669 >    /**
1670 >     * runAfterBoth result completes exceptionally if either source cancelled
1671 >     */
1672 >    public void testRunAfterBoth_sourceCancelled() {
1673          for (ExecutionMode m : ExecutionMode.values())
1674 <        for (Integer v1 : new Integer[] { 1, null }) {
1675 <
1674 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1675 >        for (boolean createIncomplete : new boolean[] { true, false })
1676 >        for (boolean fFirst : new boolean[] { true, false })
1677 >        for (Integer v1 : new Integer[] { 1, null })
1678 >    {
1679          final CompletableFuture<Integer> f = new CompletableFuture<>();
1680          final CompletableFuture<Integer> g = new CompletableFuture<>();
1681 <        final SubtractAction r = new SubtractAction();
1380 <        final CFException ex = new CFException();
1681 >        final Noop r = new Noop(m);
1682  
1382        g.completeExceptionally(ex);
1383        f.complete(v1);
1384        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1683  
1684 <        checkCompletedWithWrappedCFException(h, ex);
1685 <        checkCompletedWithWrappedCFException(g, ex);
1686 <        assertFalse(r.ran());
1687 <        checkCompletedNormally(f, v1);
1684 >        (fFirst ? f : g).complete(v1);
1685 >        if (!createIncomplete)
1686 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1687 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1688 >        if (createIncomplete) {
1689 >            checkIncomplete(h);
1690 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1691          }
1391    }
1392
1393    public void testThenAcceptBoth_exceptionalCompletion4() {
1394        for (ExecutionMode m : ExecutionMode.values())
1395        for (Integer v1 : new Integer[] { 1, null }) {
1396
1397        final CompletableFuture<Integer> f = new CompletableFuture<>();
1398        final CompletableFuture<Integer> g = new CompletableFuture<>();
1399        final SubtractAction r = new SubtractAction();
1400        final CFException ex = new CFException();
1401
1402        f.completeExceptionally(ex);
1403        g.complete(v1);
1404        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1692  
1693 <        checkCompletedWithWrappedCFException(h, ex);
1694 <        checkCompletedWithWrappedCFException(f, ex);
1695 <        assertFalse(r.ran());
1696 <        checkCompletedNormally(g, v1);
1697 <        }
1411 <    }
1693 >        checkCompletedWithWrappedCancellationException(h);
1694 >        checkCancelled(!fFirst ? f : g);
1695 >        r.assertNotInvoked();
1696 >        checkCompletedNormally(fFirst ? f : g, v1);
1697 >    }}
1698  
1699      /**
1700 <     * thenAcceptBoth result completes exceptionally if action does
1700 >     * runAfterBoth result completes exceptionally if action does
1701       */
1702 <    public void testThenAcceptBoth_actionFailed1() {
1702 >    public void testRunAfterBoth_actionFailed() {
1703          for (ExecutionMode m : ExecutionMode.values())
1704 +        for (boolean fFirst : new boolean[] { true, false })
1705          for (Integer v1 : new Integer[] { 1, null })
1706 <        for (Integer v2 : new Integer[] { 2, null }) {
1707 <
1706 >        for (Integer v2 : new Integer[] { 2, null })
1707 >    {
1708          final CompletableFuture<Integer> f = new CompletableFuture<>();
1709          final CompletableFuture<Integer> g = new CompletableFuture<>();
1710 <        final FailingBiConsumer r = new FailingBiConsumer();
1711 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1710 >        final FailingRunnable r1 = new FailingRunnable(m);
1711 >        final FailingRunnable r2 = new FailingRunnable(m);
1712  
1713 <        f.complete(v1);
1714 <        checkIncomplete(h);
1715 <        g.complete(v2);
1713 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1714 >        if (fFirst) {
1715 >            f.complete(v1);
1716 >            g.complete(v2);
1717 >        } else {
1718 >            g.complete(v2);
1719 >            f.complete(v1);
1720 >        }
1721 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1722  
1723 <        checkCompletedWithWrappedCFException(h);
1723 >        checkCompletedWithWrappedCFException(h1);
1724 >        checkCompletedWithWrappedCFException(h2);
1725          checkCompletedNormally(f, v1);
1726          checkCompletedNormally(g, v2);
1727 <        }
1434 <    }
1727 >    }}
1728  
1729 <    public void testThenAcceptBoth_actionFailed2() {
1729 >    /**
1730 >     * applyToEither result completes normally after normal completion
1731 >     * of either source
1732 >     */
1733 >    public void testApplyToEither_normalCompletion() {
1734          for (ExecutionMode m : ExecutionMode.values())
1735          for (Integer v1 : new Integer[] { 1, null })
1736 <        for (Integer v2 : new Integer[] { 2, null }) {
1737 <
1736 >        for (Integer v2 : new Integer[] { 2, null })
1737 >    {
1738          final CompletableFuture<Integer> f = new CompletableFuture<>();
1739          final CompletableFuture<Integer> g = new CompletableFuture<>();
1740 <        final FailingBiConsumer r = new FailingBiConsumer();
1741 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1740 >        final IncFunction[] rs = new IncFunction[6];
1741 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1742  
1743 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1744 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1745 +        checkIncomplete(h0);
1746 +        checkIncomplete(h1);
1747 +        rs[0].assertNotInvoked();
1748 +        rs[1].assertNotInvoked();
1749 +        f.complete(v1);
1750 +        checkCompletedNormally(h0, inc(v1));
1751 +        checkCompletedNormally(h1, inc(v1));
1752 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1753 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1754 +        checkCompletedNormally(h2, inc(v1));
1755 +        checkCompletedNormally(h3, inc(v1));
1756          g.complete(v2);
1447        checkIncomplete(h);
1448        f.complete(v1);
1757  
1758 <        checkCompletedWithWrappedCFException(h);
1758 >        // unspecified behavior - both source completions available
1759 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1760 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1761 >        rs[4].assertValue(h4.join());
1762 >        rs[5].assertValue(h5.join());
1763 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1764 >                   Objects.equals(inc(v2), h4.join()));
1765 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1766 >                   Objects.equals(inc(v2), h5.join()));
1767 >
1768          checkCompletedNormally(f, v1);
1769          checkCompletedNormally(g, v2);
1770 <        }
1771 <    }
1770 >        checkCompletedNormally(h0, inc(v1));
1771 >        checkCompletedNormally(h1, inc(v1));
1772 >        checkCompletedNormally(h2, inc(v1));
1773 >        checkCompletedNormally(h3, inc(v1));
1774 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1775 >    }}
1776  
1777      /**
1778 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1778 >     * applyToEither result completes exceptionally after exceptional
1779 >     * completion of either source
1780       */
1781 <    public void testThenAcceptBoth_sourceCancelled1() {
1781 >    public void testApplyToEither_exceptionalCompletion() {
1782          for (ExecutionMode m : ExecutionMode.values())
1783 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1784 <        for (Integer v1 : new Integer[] { 1, null }) {
1463 <
1783 >        for (Integer v1 : new Integer[] { 1, null })
1784 >    {
1785          final CompletableFuture<Integer> f = new CompletableFuture<>();
1786          final CompletableFuture<Integer> g = new CompletableFuture<>();
1787 <        final SubtractAction r = new SubtractAction();
1788 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1787 >        final CFException ex = new CFException();
1788 >        final IncFunction[] rs = new IncFunction[6];
1789 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1790  
1791 <        assertTrue(f.cancel(mayInterruptIfRunning));
1792 <        checkIncomplete(h);
1791 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1792 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1793 >        checkIncomplete(h0);
1794 >        checkIncomplete(h1);
1795 >        rs[0].assertNotInvoked();
1796 >        rs[1].assertNotInvoked();
1797 >        f.completeExceptionally(ex);
1798 >        checkCompletedWithWrappedException(h0, ex);
1799 >        checkCompletedWithWrappedException(h1, ex);
1800 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1801 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1802 >        checkCompletedWithWrappedException(h2, ex);
1803 >        checkCompletedWithWrappedException(h3, ex);
1804          g.complete(v1);
1805  
1806 <        checkCompletedWithWrappedCancellationException(h);
1807 <        checkCancelled(f);
1808 <        assertFalse(r.ran());
1809 <        checkCompletedNormally(g, v1);
1806 >        // unspecified behavior - both source completions available
1807 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1808 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1809 >        try {
1810 >            assertEquals(inc(v1), h4.join());
1811 >            rs[4].assertValue(inc(v1));
1812 >        } catch (CompletionException ok) {
1813 >            checkCompletedWithWrappedException(h4, ex);
1814 >            rs[4].assertNotInvoked();
1815 >        }
1816 >        try {
1817 >            assertEquals(inc(v1), h5.join());
1818 >            rs[5].assertValue(inc(v1));
1819 >        } catch (CompletionException ok) {
1820 >            checkCompletedWithWrappedException(h5, ex);
1821 >            rs[5].assertNotInvoked();
1822          }
1478    }
1823  
1824 <    public void testThenAcceptBoth_sourceCancelled2() {
1825 <        for (ExecutionMode m : ExecutionMode.values())
1826 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1827 <        for (Integer v1 : new Integer[] { 1, null }) {
1824 >        checkCompletedExceptionally(f, ex);
1825 >        checkCompletedNormally(g, v1);
1826 >        checkCompletedWithWrappedException(h0, ex);
1827 >        checkCompletedWithWrappedException(h1, ex);
1828 >        checkCompletedWithWrappedException(h2, ex);
1829 >        checkCompletedWithWrappedException(h3, ex);
1830 >        checkCompletedWithWrappedException(h4, ex);
1831 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1832 >    }}
1833  
1834 +    public void testApplyToEither_exceptionalCompletion2() {
1835 +        for (ExecutionMode m : ExecutionMode.values())
1836 +        for (boolean fFirst : new boolean[] { true, false })
1837 +        for (Integer v1 : new Integer[] { 1, null })
1838 +    {
1839          final CompletableFuture<Integer> f = new CompletableFuture<>();
1840          final CompletableFuture<Integer> g = new CompletableFuture<>();
1841 <        final SubtractAction r = new SubtractAction();
1842 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1843 <
1490 <        assertTrue(g.cancel(mayInterruptIfRunning));
1491 <        checkIncomplete(h);
1492 <        f.complete(v1);
1841 >        final CFException ex = new CFException();
1842 >        final IncFunction[] rs = new IncFunction[6];
1843 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1844  
1845 <        checkCompletedWithWrappedCancellationException(h);
1846 <        checkCancelled(g);
1847 <        assertFalse(r.ran());
1848 <        checkCompletedNormally(f, v1);
1845 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1846 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1847 >        if (fFirst) {
1848 >            f.complete(v1);
1849 >            g.completeExceptionally(ex);
1850 >        } else {
1851 >            g.completeExceptionally(ex);
1852 >            f.complete(v1);
1853          }
1854 <    }
1854 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1855 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1856  
1857 <    public void testThenAcceptBoth_sourceCancelled3() {
1858 <        for (ExecutionMode m : ExecutionMode.values())
1859 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1860 <        for (Integer v1 : new Integer[] { 1, null }) {
1861 <
1862 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1863 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1864 <        final SubtractAction r = new SubtractAction();
1865 <
1866 <        assertTrue(g.cancel(mayInterruptIfRunning));
1867 <        f.complete(v1);
1868 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1857 >        // unspecified behavior - both source completions available
1858 >        try {
1859 >            assertEquals(inc(v1), h0.join());
1860 >            rs[0].assertValue(inc(v1));
1861 >        } catch (CompletionException ok) {
1862 >            checkCompletedWithWrappedException(h0, ex);
1863 >            rs[0].assertNotInvoked();
1864 >        }
1865 >        try {
1866 >            assertEquals(inc(v1), h1.join());
1867 >            rs[1].assertValue(inc(v1));
1868 >        } catch (CompletionException ok) {
1869 >            checkCompletedWithWrappedException(h1, ex);
1870 >            rs[1].assertNotInvoked();
1871 >        }
1872 >        try {
1873 >            assertEquals(inc(v1), h2.join());
1874 >            rs[2].assertValue(inc(v1));
1875 >        } catch (CompletionException ok) {
1876 >            checkCompletedWithWrappedException(h2, ex);
1877 >            rs[2].assertNotInvoked();
1878 >        }
1879 >        try {
1880 >            assertEquals(inc(v1), h3.join());
1881 >            rs[3].assertValue(inc(v1));
1882 >        } catch (CompletionException ok) {
1883 >            checkCompletedWithWrappedException(h3, ex);
1884 >            rs[3].assertNotInvoked();
1885 >        }
1886  
1514        checkCompletedWithWrappedCancellationException(h);
1515        checkCancelled(g);
1516        assertFalse(r.ran());
1887          checkCompletedNormally(f, v1);
1888 <        }
1889 <    }
1888 >        checkCompletedExceptionally(g, ex);
1889 >    }}
1890  
1891 <    public void testThenAcceptBoth_sourceCancelled4() {
1891 >    /**
1892 >     * applyToEither result completes exceptionally if either source cancelled
1893 >     */
1894 >    public void testApplyToEither_sourceCancelled() {
1895          for (ExecutionMode m : ExecutionMode.values())
1896          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1897 <        for (Integer v1 : new Integer[] { 1, null }) {
1898 <
1897 >        for (Integer v1 : new Integer[] { 1, null })
1898 >    {
1899          final CompletableFuture<Integer> f = new CompletableFuture<>();
1900          final CompletableFuture<Integer> g = new CompletableFuture<>();
1901 <        final SubtractAction r = new SubtractAction();
1901 >        final IncFunction[] rs = new IncFunction[6];
1902 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1903  
1904 <        assertTrue(f.cancel(mayInterruptIfRunning));
1904 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1905 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1906 >        checkIncomplete(h0);
1907 >        checkIncomplete(h1);
1908 >        rs[0].assertNotInvoked();
1909 >        rs[1].assertNotInvoked();
1910 >        f.cancel(mayInterruptIfRunning);
1911 >        checkCompletedWithWrappedCancellationException(h0);
1912 >        checkCompletedWithWrappedCancellationException(h1);
1913 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1914 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1915 >        checkCompletedWithWrappedCancellationException(h2);
1916 >        checkCompletedWithWrappedCancellationException(h3);
1917          g.complete(v1);
1532        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1918  
1919 <        checkCompletedWithWrappedCancellationException(h);
1919 >        // unspecified behavior - both source completions available
1920 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1921 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1922 >        try {
1923 >            assertEquals(inc(v1), h4.join());
1924 >            rs[4].assertValue(inc(v1));
1925 >        } catch (CompletionException ok) {
1926 >            checkCompletedWithWrappedCancellationException(h4);
1927 >            rs[4].assertNotInvoked();
1928 >        }
1929 >        try {
1930 >            assertEquals(inc(v1), h5.join());
1931 >            rs[5].assertValue(inc(v1));
1932 >        } catch (CompletionException ok) {
1933 >            checkCompletedWithWrappedCancellationException(h5);
1934 >            rs[5].assertNotInvoked();
1935 >        }
1936 >
1937          checkCancelled(f);
1536        assertFalse(r.ran());
1938          checkCompletedNormally(g, v1);
1939 <        }
1940 <    }
1939 >        checkCompletedWithWrappedCancellationException(h0);
1940 >        checkCompletedWithWrappedCancellationException(h1);
1941 >        checkCompletedWithWrappedCancellationException(h2);
1942 >        checkCompletedWithWrappedCancellationException(h3);
1943 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1944 >    }}
1945  
1946 <    /**
1542 <     * runAfterBoth result completes normally after normal
1543 <     * completion of sources
1544 <     */
1545 <    public void testRunAfterBoth_normalCompletion1() {
1946 >    public void testApplyToEither_sourceCancelled2() {
1947          for (ExecutionMode m : ExecutionMode.values())
1948 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1949 +        for (boolean fFirst : new boolean[] { true, false })
1950          for (Integer v1 : new Integer[] { 1, null })
1951 <        for (Integer v2 : new Integer[] { 2, null }) {
1549 <
1951 >    {
1952          final CompletableFuture<Integer> f = new CompletableFuture<>();
1953          final CompletableFuture<Integer> g = new CompletableFuture<>();
1954 <        final Noop r = new Noop();
1955 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1954 >        final IncFunction[] rs = new IncFunction[6];
1955 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1956  
1957 <        f.complete(v1);
1958 <        checkIncomplete(h);
1959 <        assertFalse(r.ran);
1960 <        g.complete(v2);
1961 <
1962 <        checkCompletedNormally(h, null);
1963 <        assertTrue(r.ran);
1964 <        checkCompletedNormally(f, v1);
1563 <        checkCompletedNormally(g, v2);
1957 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1958 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1959 >        if (fFirst) {
1960 >            f.complete(v1);
1961 >            g.cancel(mayInterruptIfRunning);
1962 >        } else {
1963 >            g.cancel(mayInterruptIfRunning);
1964 >            f.complete(v1);
1965          }
1966 <    }
1967 <
1567 <    public void testRunAfterBoth_normalCompletion2() {
1568 <        for (ExecutionMode m : ExecutionMode.values())
1569 <        for (Integer v1 : new Integer[] { 1, null })
1570 <        for (Integer v2 : new Integer[] { 2, null }) {
1571 <
1572 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1573 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1574 <        final Noop r = new Noop();
1575 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1966 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1967 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1968  
1969 <        g.complete(v2);
1970 <        checkIncomplete(h);
1971 <        assertFalse(r.ran);
1972 <        f.complete(v1);
1969 >        // unspecified behavior - both source completions available
1970 >        try {
1971 >            assertEquals(inc(v1), h0.join());
1972 >            rs[0].assertValue(inc(v1));
1973 >        } catch (CompletionException ok) {
1974 >            checkCompletedWithWrappedCancellationException(h0);
1975 >            rs[0].assertNotInvoked();
1976 >        }
1977 >        try {
1978 >            assertEquals(inc(v1), h1.join());
1979 >            rs[1].assertValue(inc(v1));
1980 >        } catch (CompletionException ok) {
1981 >            checkCompletedWithWrappedCancellationException(h1);
1982 >            rs[1].assertNotInvoked();
1983 >        }
1984 >        try {
1985 >            assertEquals(inc(v1), h2.join());
1986 >            rs[2].assertValue(inc(v1));
1987 >        } catch (CompletionException ok) {
1988 >            checkCompletedWithWrappedCancellationException(h2);
1989 >            rs[2].assertNotInvoked();
1990 >        }
1991 >        try {
1992 >            assertEquals(inc(v1), h3.join());
1993 >            rs[3].assertValue(inc(v1));
1994 >        } catch (CompletionException ok) {
1995 >            checkCompletedWithWrappedCancellationException(h3);
1996 >            rs[3].assertNotInvoked();
1997 >        }
1998  
1582        checkCompletedNormally(h, null);
1583        assertTrue(r.ran);
1999          checkCompletedNormally(f, v1);
2000 <        checkCompletedNormally(g, v2);
2001 <        }
1587 <    }
2000 >        checkCancelled(g);
2001 >    }}
2002  
2003 <    public void testRunAfterBoth_normalCompletion3() {
2003 >    /**
2004 >     * applyToEither result completes exceptionally if action does
2005 >     */
2006 >    public void testApplyToEither_actionFailed() {
2007          for (ExecutionMode m : ExecutionMode.values())
2008          for (Integer v1 : new Integer[] { 1, null })
2009 <        for (Integer v2 : new Integer[] { 2, null }) {
2010 <
2009 >        for (Integer v2 : new Integer[] { 2, null })
2010 >    {
2011          final CompletableFuture<Integer> f = new CompletableFuture<>();
2012          final CompletableFuture<Integer> g = new CompletableFuture<>();
2013 <        final Noop r = new Noop();
2013 >        final FailingFunction[] rs = new FailingFunction[6];
2014 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2015 >
2016 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2017 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2018 >        f.complete(v1);
2019 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2020 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2021 >        checkCompletedWithWrappedCFException(h0);
2022 >        checkCompletedWithWrappedCFException(h1);
2023 >        checkCompletedWithWrappedCFException(h2);
2024 >        checkCompletedWithWrappedCFException(h3);
2025 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2026  
2027          g.complete(v2);
1599        f.complete(v1);
1600        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2028  
2029 <        checkCompletedNormally(h, null);
2030 <        assertTrue(r.ran);
2029 >        // unspecified behavior - both source completions available
2030 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2031 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2032 >
2033 >        checkCompletedWithWrappedCFException(h4);
2034 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2035 >                   Objects.equals(v2, rs[4].value));
2036 >        checkCompletedWithWrappedCFException(h5);
2037 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2038 >                   Objects.equals(v2, rs[5].value));
2039 >
2040          checkCompletedNormally(f, v1);
2041          checkCompletedNormally(g, v2);
2042 <        }
1607 <    }
2042 >    }}
2043  
2044 <    public void testRunAfterBoth_normalCompletion4() {
2044 >    /**
2045 >     * acceptEither result completes normally after normal completion
2046 >     * of either source
2047 >     */
2048 >    public void testAcceptEither_normalCompletion() {
2049          for (ExecutionMode m : ExecutionMode.values())
2050          for (Integer v1 : new Integer[] { 1, null })
2051 <        for (Integer v2 : new Integer[] { 2, null }) {
2052 <
2051 >        for (Integer v2 : new Integer[] { 2, null })
2052 >    {
2053          final CompletableFuture<Integer> f = new CompletableFuture<>();
2054          final CompletableFuture<Integer> g = new CompletableFuture<>();
2055 <        final Noop r = new Noop();
2055 >        final NoopConsumer[] rs = new NoopConsumer[6];
2056 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2057  
2058 <        f.complete(v1);
2058 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2059 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2060 >        checkIncomplete(h0);
2061 >        checkIncomplete(h1);
2062 >        rs[0].assertNotInvoked();
2063 >        rs[1].assertNotInvoked();
2064 >        f.complete(v1);
2065 >        checkCompletedNormally(h0, null);
2066 >        checkCompletedNormally(h1, null);
2067 >        rs[0].assertValue(v1);
2068 >        rs[1].assertValue(v1);
2069 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2070 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2071 >        checkCompletedNormally(h2, null);
2072 >        checkCompletedNormally(h3, null);
2073 >        rs[2].assertValue(v1);
2074 >        rs[3].assertValue(v1);
2075          g.complete(v2);
1620        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2076  
2077 <        checkCompletedNormally(h, null);
2078 <        assertTrue(r.ran);
2077 >        // unspecified behavior - both source completions available
2078 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2079 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2080 >        checkCompletedNormally(h4, null);
2081 >        checkCompletedNormally(h5, null);
2082 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2083 >                   Objects.equals(v2, rs[4].value));
2084 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2085 >                   Objects.equals(v2, rs[5].value));
2086 >
2087          checkCompletedNormally(f, v1);
2088          checkCompletedNormally(g, v2);
2089 <        }
2090 <    }
2089 >        checkCompletedNormally(h0, null);
2090 >        checkCompletedNormally(h1, null);
2091 >        checkCompletedNormally(h2, null);
2092 >        checkCompletedNormally(h3, null);
2093 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2094 >    }}
2095  
2096      /**
2097 <     * runAfterBoth result completes exceptionally after exceptional
2097 >     * acceptEither result completes exceptionally after exceptional
2098       * completion of either source
2099       */
2100 <    public void testRunAfterBoth_exceptionalCompletion1() {
2100 >    public void testAcceptEither_exceptionalCompletion() {
2101          for (ExecutionMode m : ExecutionMode.values())
2102 <        for (Integer v1 : new Integer[] { 1, null }) {
2103 <
2102 >        for (Integer v1 : new Integer[] { 1, null })
2103 >    {
2104          final CompletableFuture<Integer> f = new CompletableFuture<>();
2105          final CompletableFuture<Integer> g = new CompletableFuture<>();
1639        final Noop r = new Noop();
1640        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2106          final CFException ex = new CFException();
2107 +        final NoopConsumer[] rs = new NoopConsumer[6];
2108 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2109  
2110 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2111 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2112 +        checkIncomplete(h0);
2113 +        checkIncomplete(h1);
2114 +        rs[0].assertNotInvoked();
2115 +        rs[1].assertNotInvoked();
2116          f.completeExceptionally(ex);
2117 <        checkIncomplete(h);
2117 >        checkCompletedWithWrappedException(h0, ex);
2118 >        checkCompletedWithWrappedException(h1, ex);
2119 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2120 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2121 >        checkCompletedWithWrappedException(h2, ex);
2122 >        checkCompletedWithWrappedException(h3, ex);
2123 >
2124          g.complete(v1);
2125  
2126 <        checkCompletedWithWrappedCFException(h, ex);
2127 <        checkCompletedWithWrappedCFException(f, ex);
2128 <        assertFalse(r.ran);
2129 <        checkCompletedNormally(g, v1);
2126 >        // unspecified behavior - both source completions available
2127 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2128 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2129 >        try {
2130 >            assertNull(h4.join());
2131 >            rs[4].assertValue(v1);
2132 >        } catch (CompletionException ok) {
2133 >            checkCompletedWithWrappedException(h4, ex);
2134 >            rs[4].assertNotInvoked();
2135 >        }
2136 >        try {
2137 >            assertNull(h5.join());
2138 >            rs[5].assertValue(v1);
2139 >        } catch (CompletionException ok) {
2140 >            checkCompletedWithWrappedException(h5, ex);
2141 >            rs[5].assertNotInvoked();
2142          }
1652    }
2143  
2144 <    public void testRunAfterBoth_exceptionalCompletion2() {
2145 <        for (ExecutionMode m : ExecutionMode.values())
2146 <        for (Integer v1 : new Integer[] { 1, null }) {
2144 >        checkCompletedExceptionally(f, ex);
2145 >        checkCompletedNormally(g, v1);
2146 >        checkCompletedWithWrappedException(h0, ex);
2147 >        checkCompletedWithWrappedException(h1, ex);
2148 >        checkCompletedWithWrappedException(h2, ex);
2149 >        checkCompletedWithWrappedException(h3, ex);
2150 >        checkCompletedWithWrappedException(h4, ex);
2151 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2152 >    }}
2153  
2154 +    public void testAcceptEither_exceptionalCompletion2() {
2155 +        for (ExecutionMode m : ExecutionMode.values())
2156 +        for (boolean fFirst : new boolean[] { true, false })
2157 +        for (Integer v1 : new Integer[] { 1, null })
2158 +    {
2159          final CompletableFuture<Integer> f = new CompletableFuture<>();
2160          final CompletableFuture<Integer> g = new CompletableFuture<>();
1660        final Noop r = new Noop();
1661        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2161          final CFException ex = new CFException();
2162 +        final NoopConsumer[] rs = new NoopConsumer[6];
2163 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2164  
2165 <        g.completeExceptionally(ex);
2166 <        checkIncomplete(h);
2167 <        f.complete(v1);
2168 <
2169 <        checkCompletedWithWrappedCFException(h, ex);
2170 <        checkCompletedWithWrappedCFException(g, ex);
2171 <        assertFalse(r.ran);
2172 <        checkCompletedNormally(f, v1);
2165 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2166 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2167 >        if (fFirst) {
2168 >            f.complete(v1);
2169 >            g.completeExceptionally(ex);
2170 >        } else {
2171 >            g.completeExceptionally(ex);
2172 >            f.complete(v1);
2173          }
2174 <    }
2175 <
1675 <    public void testRunAfterBoth_exceptionalCompletion3() {
1676 <        for (ExecutionMode m : ExecutionMode.values())
1677 <        for (Integer v1 : new Integer[] { 1, null }) {
1678 <
1679 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1680 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1681 <        final Noop r = new Noop();
1682 <        final CFException ex = new CFException();
2174 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2175 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2176  
2177 <        g.completeExceptionally(ex);
2178 <        f.complete(v1);
2179 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2177 >        // unspecified behavior - both source completions available
2178 >        try {
2179 >            assertEquals(null, h0.join());
2180 >            rs[0].assertValue(v1);
2181 >        } catch (CompletionException ok) {
2182 >            checkCompletedWithWrappedException(h0, ex);
2183 >            rs[0].assertNotInvoked();
2184 >        }
2185 >        try {
2186 >            assertEquals(null, h1.join());
2187 >            rs[1].assertValue(v1);
2188 >        } catch (CompletionException ok) {
2189 >            checkCompletedWithWrappedException(h1, ex);
2190 >            rs[1].assertNotInvoked();
2191 >        }
2192 >        try {
2193 >            assertEquals(null, h2.join());
2194 >            rs[2].assertValue(v1);
2195 >        } catch (CompletionException ok) {
2196 >            checkCompletedWithWrappedException(h2, ex);
2197 >            rs[2].assertNotInvoked();
2198 >        }
2199 >        try {
2200 >            assertEquals(null, h3.join());
2201 >            rs[3].assertValue(v1);
2202 >        } catch (CompletionException ok) {
2203 >            checkCompletedWithWrappedException(h3, ex);
2204 >            rs[3].assertNotInvoked();
2205 >        }
2206  
1688        checkCompletedWithWrappedCFException(h, ex);
1689        checkCompletedWithWrappedCFException(g, ex);
1690        assertFalse(r.ran);
2207          checkCompletedNormally(f, v1);
2208 <        }
2209 <    }
2208 >        checkCompletedExceptionally(g, ex);
2209 >    }}
2210  
2211 <    public void testRunAfterBoth_exceptionalCompletion4() {
2211 >    /**
2212 >     * acceptEither result completes exceptionally if either source cancelled
2213 >     */
2214 >    public void testAcceptEither_sourceCancelled() {
2215          for (ExecutionMode m : ExecutionMode.values())
2216 <        for (Integer v1 : new Integer[] { 1, null }) {
2217 <
2216 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2217 >        for (Integer v1 : new Integer[] { 1, null })
2218 >    {
2219          final CompletableFuture<Integer> f = new CompletableFuture<>();
2220          final CompletableFuture<Integer> g = new CompletableFuture<>();
2221 <        final Noop r = new Noop();
2222 <        final CFException ex = new CFException();
2221 >        final NoopConsumer[] rs = new NoopConsumer[6];
2222 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2223 >
2224 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2225 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2226 >        checkIncomplete(h0);
2227 >        checkIncomplete(h1);
2228 >        rs[0].assertNotInvoked();
2229 >        rs[1].assertNotInvoked();
2230 >        f.cancel(mayInterruptIfRunning);
2231 >        checkCompletedWithWrappedCancellationException(h0);
2232 >        checkCompletedWithWrappedCancellationException(h1);
2233 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2234 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2235 >        checkCompletedWithWrappedCancellationException(h2);
2236 >        checkCompletedWithWrappedCancellationException(h3);
2237  
1704        f.completeExceptionally(ex);
2238          g.complete(v1);
1706        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2239  
2240 <        checkCompletedWithWrappedCFException(h, ex);
2241 <        checkCompletedWithWrappedCFException(f, ex);
2242 <        assertFalse(r.ran);
2243 <        checkCompletedNormally(g, v1);
2240 >        // unspecified behavior - both source completions available
2241 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2242 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2243 >        try {
2244 >            assertNull(h4.join());
2245 >            rs[4].assertValue(v1);
2246 >        } catch (CompletionException ok) {
2247 >            checkCompletedWithWrappedCancellationException(h4);
2248 >            rs[4].assertNotInvoked();
2249 >        }
2250 >        try {
2251 >            assertNull(h5.join());
2252 >            rs[5].assertValue(v1);
2253 >        } catch (CompletionException ok) {
2254 >            checkCompletedWithWrappedCancellationException(h5);
2255 >            rs[5].assertNotInvoked();
2256          }
2257 <    }
2257 >
2258 >        checkCancelled(f);
2259 >        checkCompletedNormally(g, v1);
2260 >        checkCompletedWithWrappedCancellationException(h0);
2261 >        checkCompletedWithWrappedCancellationException(h1);
2262 >        checkCompletedWithWrappedCancellationException(h2);
2263 >        checkCompletedWithWrappedCancellationException(h3);
2264 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2265 >    }}
2266  
2267      /**
2268 <     * runAfterBoth result completes exceptionally if action does
2268 >     * acceptEither result completes exceptionally if action does
2269       */
2270 <    public void testRunAfterBoth_actionFailed1() {
2270 >    public void testAcceptEither_actionFailed() {
2271          for (ExecutionMode m : ExecutionMode.values())
2272          for (Integer v1 : new Integer[] { 1, null })
2273 <        for (Integer v2 : new Integer[] { 2, null }) {
2274 <
2273 >        for (Integer v2 : new Integer[] { 2, null })
2274 >    {
2275          final CompletableFuture<Integer> f = new CompletableFuture<>();
2276          final CompletableFuture<Integer> g = new CompletableFuture<>();
2277 <        final FailingNoop r = new FailingNoop();
2278 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2277 >        final FailingConsumer[] rs = new FailingConsumer[6];
2278 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2279 >
2280 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2281 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2282 >        f.complete(v1);
2283 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2284 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2285 >        checkCompletedWithWrappedCFException(h0);
2286 >        checkCompletedWithWrappedCFException(h1);
2287 >        checkCompletedWithWrappedCFException(h2);
2288 >        checkCompletedWithWrappedCFException(h3);
2289 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2290  
1728        f.complete(v1);
1729        checkIncomplete(h);
2291          g.complete(v2);
2292  
2293 <        checkCompletedWithWrappedCFException(h);
2293 >        // unspecified behavior - both source completions available
2294 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2295 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2296 >
2297 >        checkCompletedWithWrappedCFException(h4);
2298 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2299 >                   Objects.equals(v2, rs[4].value));
2300 >        checkCompletedWithWrappedCFException(h5);
2301 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2302 >                   Objects.equals(v2, rs[5].value));
2303 >
2304          checkCompletedNormally(f, v1);
2305          checkCompletedNormally(g, v2);
2306 <        }
1736 <    }
2306 >    }}
2307  
2308 <    public void testRunAfterBoth_actionFailed2() {
2308 >    /**
2309 >     * runAfterEither result completes normally after normal completion
2310 >     * of either source
2311 >     */
2312 >    public void testRunAfterEither_normalCompletion() {
2313          for (ExecutionMode m : ExecutionMode.values())
2314          for (Integer v1 : new Integer[] { 1, null })
2315 <        for (Integer v2 : new Integer[] { 2, null }) {
2316 <
2315 >        for (Integer v2 : new Integer[] { 2, null })
2316 >    {
2317          final CompletableFuture<Integer> f = new CompletableFuture<>();
2318          final CompletableFuture<Integer> g = new CompletableFuture<>();
2319 <        final FailingNoop r = new FailingNoop();
2320 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2319 >        final Noop[] rs = new Noop[6];
2320 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2321 >
2322 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2323 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2324 >        checkIncomplete(h0);
2325 >        checkIncomplete(h1);
2326 >        rs[0].assertNotInvoked();
2327 >        rs[1].assertNotInvoked();
2328 >        f.complete(v1);
2329 >        checkCompletedNormally(h0, null);
2330 >        checkCompletedNormally(h1, null);
2331 >        rs[0].assertInvoked();
2332 >        rs[1].assertInvoked();
2333 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2334 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2335 >        checkCompletedNormally(h2, null);
2336 >        checkCompletedNormally(h3, null);
2337 >        rs[2].assertInvoked();
2338 >        rs[3].assertInvoked();
2339  
2340          g.complete(v2);
1749        checkIncomplete(h);
1750        f.complete(v1);
2341  
2342 <        checkCompletedWithWrappedCFException(h);
2342 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2343 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2344 >
2345          checkCompletedNormally(f, v1);
2346          checkCompletedNormally(g, v2);
2347 <        }
2348 <    }
2347 >        checkCompletedNormally(h0, null);
2348 >        checkCompletedNormally(h1, null);
2349 >        checkCompletedNormally(h2, null);
2350 >        checkCompletedNormally(h3, null);
2351 >        checkCompletedNormally(h4, null);
2352 >        checkCompletedNormally(h5, null);
2353 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2354 >    }}
2355  
2356      /**
2357 <     * runAfterBoth result completes exceptionally if either source cancelled
2357 >     * runAfterEither result completes exceptionally after exceptional
2358 >     * completion of either source
2359       */
2360 <    public void testRunAfterBoth_sourceCancelled1() {
2360 >    public void testRunAfterEither_exceptionalCompletion() {
2361          for (ExecutionMode m : ExecutionMode.values())
2362 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2363 <        for (Integer v1 : new Integer[] { 1, null }) {
1765 <
2362 >        for (Integer v1 : new Integer[] { 1, null })
2363 >    {
2364          final CompletableFuture<Integer> f = new CompletableFuture<>();
2365          final CompletableFuture<Integer> g = new CompletableFuture<>();
2366 <        final Noop r = new Noop();
2367 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2366 >        final CFException ex = new CFException();
2367 >        final Noop[] rs = new Noop[6];
2368 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2369 >
2370 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2371 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2372 >        checkIncomplete(h0);
2373 >        checkIncomplete(h1);
2374 >        rs[0].assertNotInvoked();
2375 >        rs[1].assertNotInvoked();
2376 >        f.completeExceptionally(ex);
2377 >        checkCompletedWithWrappedException(h0, ex);
2378 >        checkCompletedWithWrappedException(h1, ex);
2379 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2380 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2381 >        checkCompletedWithWrappedException(h2, ex);
2382 >        checkCompletedWithWrappedException(h3, ex);
2383  
1771        assertTrue(f.cancel(mayInterruptIfRunning));
1772        checkIncomplete(h);
2384          g.complete(v1);
2385  
2386 <        checkCompletedWithWrappedCancellationException(h);
2387 <        checkCancelled(f);
2388 <        assertFalse(r.ran);
2389 <        checkCompletedNormally(g, v1);
2386 >        // unspecified behavior - both source completions available
2387 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2388 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2389 >        try {
2390 >            assertNull(h4.join());
2391 >            rs[4].assertInvoked();
2392 >        } catch (CompletionException ok) {
2393 >            checkCompletedWithWrappedException(h4, ex);
2394 >            rs[4].assertNotInvoked();
2395 >        }
2396 >        try {
2397 >            assertNull(h5.join());
2398 >            rs[5].assertInvoked();
2399 >        } catch (CompletionException ok) {
2400 >            checkCompletedWithWrappedException(h5, ex);
2401 >            rs[5].assertNotInvoked();
2402          }
1780    }
2403  
2404 <    public void testRunAfterBoth_sourceCancelled2() {
2405 <        for (ExecutionMode m : ExecutionMode.values())
2406 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2407 <        for (Integer v1 : new Integer[] { 1, null }) {
2404 >        checkCompletedExceptionally(f, ex);
2405 >        checkCompletedNormally(g, v1);
2406 >        checkCompletedWithWrappedException(h0, ex);
2407 >        checkCompletedWithWrappedException(h1, ex);
2408 >        checkCompletedWithWrappedException(h2, ex);
2409 >        checkCompletedWithWrappedException(h3, ex);
2410 >        checkCompletedWithWrappedException(h4, ex);
2411 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2412 >    }}
2413  
2414 +    public void testRunAfterEither_exceptionalCompletion2() {
2415 +        for (ExecutionMode m : ExecutionMode.values())
2416 +        for (boolean fFirst : new boolean[] { true, false })
2417 +        for (Integer v1 : new Integer[] { 1, null })
2418 +    {
2419          final CompletableFuture<Integer> f = new CompletableFuture<>();
2420          final CompletableFuture<Integer> g = new CompletableFuture<>();
2421 <        final Noop r = new Noop();
2422 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2423 <
1792 <        assertTrue(g.cancel(mayInterruptIfRunning));
1793 <        checkIncomplete(h);
1794 <        f.complete(v1);
2421 >        final CFException ex = new CFException();
2422 >        final Noop[] rs = new Noop[6];
2423 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2424  
2425 <        checkCompletedWithWrappedCancellationException(h);
2426 <        checkCancelled(g);
2427 <        assertFalse(r.ran);
2428 <        checkCompletedNormally(f, v1);
2425 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2426 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2427 >        if (fFirst) {
2428 >            f.complete(v1);
2429 >            g.completeExceptionally(ex);
2430 >        } else {
2431 >            g.completeExceptionally(ex);
2432 >            f.complete(v1);
2433          }
2434 <    }
2435 <
1803 <    public void testRunAfterBoth_sourceCancelled3() {
1804 <        for (ExecutionMode m : ExecutionMode.values())
1805 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1806 <        for (Integer v1 : new Integer[] { 1, null }) {
1807 <
1808 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1809 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1810 <        final Noop r = new Noop();
2434 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2435 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2436  
2437 <        assertTrue(g.cancel(mayInterruptIfRunning));
2438 <        f.complete(v1);
2439 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2437 >        // unspecified behavior - both source completions available
2438 >        try {
2439 >            assertEquals(null, h0.join());
2440 >            rs[0].assertInvoked();
2441 >        } catch (CompletionException ok) {
2442 >            checkCompletedWithWrappedException(h0, ex);
2443 >            rs[0].assertNotInvoked();
2444 >        }
2445 >        try {
2446 >            assertEquals(null, h1.join());
2447 >            rs[1].assertInvoked();
2448 >        } catch (CompletionException ok) {
2449 >            checkCompletedWithWrappedException(h1, ex);
2450 >            rs[1].assertNotInvoked();
2451 >        }
2452 >        try {
2453 >            assertEquals(null, h2.join());
2454 >            rs[2].assertInvoked();
2455 >        } catch (CompletionException ok) {
2456 >            checkCompletedWithWrappedException(h2, ex);
2457 >            rs[2].assertNotInvoked();
2458 >        }
2459 >        try {
2460 >            assertEquals(null, h3.join());
2461 >            rs[3].assertInvoked();
2462 >        } catch (CompletionException ok) {
2463 >            checkCompletedWithWrappedException(h3, ex);
2464 >            rs[3].assertNotInvoked();
2465 >        }
2466  
1816        checkCompletedWithWrappedCancellationException(h);
1817        checkCancelled(g);
1818        assertFalse(r.ran);
2467          checkCompletedNormally(f, v1);
2468 <        }
2469 <    }
2468 >        checkCompletedExceptionally(g, ex);
2469 >    }}
2470  
2471 <    public void testRunAfterBoth_sourceCancelled4() {
2471 >    /**
2472 >     * runAfterEither result completes exceptionally if either source cancelled
2473 >     */
2474 >    public void testRunAfterEither_sourceCancelled() {
2475          for (ExecutionMode m : ExecutionMode.values())
2476          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2477 <        for (Integer v1 : new Integer[] { 1, null }) {
2478 <
2477 >        for (Integer v1 : new Integer[] { 1, null })
2478 >    {
2479          final CompletableFuture<Integer> f = new CompletableFuture<>();
2480          final CompletableFuture<Integer> g = new CompletableFuture<>();
2481 <        final Noop r = new Noop();
2481 >        final Noop[] rs = new Noop[6];
2482 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2483 >
2484 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2485 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2486 >        checkIncomplete(h0);
2487 >        checkIncomplete(h1);
2488 >        rs[0].assertNotInvoked();
2489 >        rs[1].assertNotInvoked();
2490 >        f.cancel(mayInterruptIfRunning);
2491 >        checkCompletedWithWrappedCancellationException(h0);
2492 >        checkCompletedWithWrappedCancellationException(h1);
2493 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2494 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2495 >        checkCompletedWithWrappedCancellationException(h2);
2496 >        checkCompletedWithWrappedCancellationException(h3);
2497  
1832        assertTrue(f.cancel(mayInterruptIfRunning));
2498          g.complete(v1);
1834        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2499  
2500 <        checkCompletedWithWrappedCancellationException(h);
2501 <        checkCancelled(f);
2502 <        assertFalse(r.ran);
2503 <        checkCompletedNormally(g, v1);
2500 >        // unspecified behavior - both source completions available
2501 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2502 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2503 >        try {
2504 >            assertNull(h4.join());
2505 >            rs[4].assertInvoked();
2506 >        } catch (CompletionException ok) {
2507 >            checkCompletedWithWrappedCancellationException(h4);
2508 >            rs[4].assertNotInvoked();
2509 >        }
2510 >        try {
2511 >            assertNull(h5.join());
2512 >            rs[5].assertInvoked();
2513 >        } catch (CompletionException ok) {
2514 >            checkCompletedWithWrappedCancellationException(h5);
2515 >            rs[5].assertNotInvoked();
2516          }
1841    }
1842
1843    /**
1844     * applyToEither result completes normally after normal completion
1845     * of either source
1846     */
1847    public void testApplyToEither() {
1848        CompletableFuture<Integer> f = new CompletableFuture<>();
1849        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1850        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1851        f.complete(one);
1852        checkCompletedNormally(g, two);
1853        f2.complete(one);
1854        checkCompletedNormally(g, two);
1855
1856        f = new CompletableFuture<>();
1857        f.complete(one);
1858        f2 = new CompletableFuture<>();
1859        g = f.applyToEither(f2, inc);
1860        checkCompletedNormally(g, two);
1861    }
1862
1863    /**
1864     * applyToEither result completes exceptionally after exceptional
1865     * completion of either source
1866     */
1867    public void testApplyToEither2() {
1868        CompletableFuture<Integer> f = new CompletableFuture<>();
1869        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1870        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1871        f.completeExceptionally(new CFException());
1872        f2.complete(one);
1873        checkCompletedWithWrappedCFException(g);
1874
1875        f = new CompletableFuture<>();
1876        f2 = new CompletableFuture<>();
1877        f2.completeExceptionally(new CFException());
1878        g = f.applyToEither(f2, inc);
1879        checkCompletedWithWrappedCFException(g);
1880    }
1881
1882    /**
1883     * applyToEither result completes exceptionally if action does
1884     */
1885    public void testApplyToEither3() {
1886        CompletableFuture<Integer> f = new CompletableFuture<>();
1887        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1888        FailingFunction r = new FailingFunction();
1889        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1890        f2.complete(two);
1891        checkCompletedWithWrappedCFException(g);
1892    }
1893
1894    /**
1895     * applyToEither result completes exceptionally if either source cancelled
1896     */
1897    public void testApplyToEither4() {
1898        CompletableFuture<Integer> f = new CompletableFuture<>();
1899        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1900        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1901        assertTrue(f.cancel(true));
1902        checkCompletedWithWrappedCancellationException(g);
1903        f = new CompletableFuture<>();
1904        f2 = new CompletableFuture<>();
1905        assertTrue(f2.cancel(true));
1906        checkCompletedWithWrappedCancellationException(g);
1907    }
1908
1909    /**
1910     * acceptEither result completes normally after normal completion
1911     * of either source
1912     */
1913    public void testAcceptEither() {
1914        CompletableFuture<Integer> f = new CompletableFuture<>();
1915        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1916        IncAction r = new IncAction();
1917        CompletableFuture<Void> g = f.acceptEither(f2, r);
1918        f.complete(one);
1919        checkCompletedNormally(g, null);
1920        f2.complete(one);
1921        checkCompletedNormally(g, null);
1922        assertEquals(r.value, (Integer) 2);
1923
1924        r = new IncAction();
1925        f = new CompletableFuture<>();
1926        f.complete(one);
1927        f2 = new CompletableFuture<>();
1928        g = f.acceptEither(f2, r);
1929        checkCompletedNormally(g, null);
1930        assertEquals(r.value, (Integer) 2);
1931    }
1932
1933    /**
1934     * acceptEither result completes exceptionally after exceptional
1935     * completion of either source
1936     */
1937    public void testAcceptEither2() {
1938        CompletableFuture<Integer> f = new CompletableFuture<>();
1939        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1940        IncAction r = new IncAction();
1941        CompletableFuture<Void> g = f.acceptEither(f2, r);
1942        f.completeExceptionally(new CFException());
1943        f2.complete(one);
1944        checkCompletedWithWrappedCFException(g);
1945
1946        r = new IncAction();
1947        f = new CompletableFuture<>();
1948        f2 = new CompletableFuture<>();
1949        f2.completeExceptionally(new CFException());
1950        g = f.acceptEither(f2, r);
1951        checkCompletedWithWrappedCFException(g);
1952    }
1953
1954    /**
1955     * acceptEither result completes exceptionally if action does
1956     */
1957    public void testAcceptEither3() {
1958        CompletableFuture<Integer> f = new CompletableFuture<>();
1959        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1960        FailingConsumer r = new FailingConsumer();
1961        CompletableFuture<Void> g = f.acceptEither(f2, r);
1962        f2.complete(two);
1963        checkCompletedWithWrappedCFException(g);
1964    }
1965
1966    /**
1967     * acceptEither result completes exceptionally if either source cancelled
1968     */
1969    public void testAcceptEither4() {
1970        CompletableFuture<Integer> f = new CompletableFuture<>();
1971        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1972        IncAction r = new IncAction();
1973        CompletableFuture<Void> g = f.acceptEither(f2, r);
1974        assertTrue(f.cancel(true));
1975        checkCompletedWithWrappedCancellationException(g);
1976        f = new CompletableFuture<>();
1977        f2 = new CompletableFuture<>();
1978        assertTrue(f2.cancel(true));
1979        checkCompletedWithWrappedCancellationException(g);
1980    }
1981
1982    /**
1983     * runAfterEither result completes normally after normal completion
1984     * of either source
1985     */
1986    public void testRunAfterEither() {
1987        CompletableFuture<Integer> f = new CompletableFuture<>();
1988        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1989        Noop r = new Noop();
1990        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1991        f.complete(one);
1992        checkCompletedNormally(g, null);
1993        f2.complete(one);
1994        checkCompletedNormally(g, null);
1995        assertTrue(r.ran);
1996
1997        r = new Noop();
1998        f = new CompletableFuture<>();
1999        f.complete(one);
2000        f2 = new CompletableFuture<>();
2001        g = f.runAfterEither(f2, r);
2002        checkCompletedNormally(g, null);
2003        assertTrue(r.ran);
2004    }
2005
2006    /**
2007     * runAfterEither result completes exceptionally after exceptional
2008     * completion of either source
2009     */
2010    public void testRunAfterEither2() {
2011        CompletableFuture<Integer> f = new CompletableFuture<>();
2012        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2013        Noop r = new Noop();
2014        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2015        f.completeExceptionally(new CFException());
2016        f2.complete(one);
2017        checkCompletedWithWrappedCFException(g);
2517  
2518 <        r = new Noop();
2519 <        f = new CompletableFuture<>();
2520 <        f2 = new CompletableFuture<>();
2521 <        f2.completeExceptionally(new CFException());
2522 <        g = f.runAfterEither(f2, r);
2523 <        checkCompletedWithWrappedCFException(g);
2524 <    }
2518 >        checkCancelled(f);
2519 >        checkCompletedNormally(g, v1);
2520 >        checkCompletedWithWrappedCancellationException(h0);
2521 >        checkCompletedWithWrappedCancellationException(h1);
2522 >        checkCompletedWithWrappedCancellationException(h2);
2523 >        checkCompletedWithWrappedCancellationException(h3);
2524 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2525 >    }}
2526  
2527      /**
2528       * runAfterEither result completes exceptionally if action does
2529       */
2530 <    public void testRunAfterEither3() {
2531 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2532 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2533 <        FailingNoop r = new FailingNoop();
2534 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2535 <        f2.complete(two);
2536 <        checkCompletedWithWrappedCFException(g);
2537 <    }
2530 >    public void testRunAfterEither_actionFailed() {
2531 >        for (ExecutionMode m : ExecutionMode.values())
2532 >        for (Integer v1 : new Integer[] { 1, null })
2533 >        for (Integer v2 : new Integer[] { 2, null })
2534 >    {
2535 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2536 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2537 >        final FailingRunnable[] rs = new FailingRunnable[6];
2538 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2539  
2540 <    /**
2541 <     * runAfterEither result completes exceptionally if either source cancelled
2542 <     */
2543 <    public void testRunAfterEither4() {
2544 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2545 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2546 <        Noop r = new Noop();
2547 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2548 <        assertTrue(f.cancel(true));
2549 <        checkCompletedWithWrappedCancellationException(g);
2550 <        f = new CompletableFuture<>();
2551 <        f2 = new CompletableFuture<>();
2552 <        assertTrue(f2.cancel(true));
2553 <        checkCompletedWithWrappedCancellationException(g);
2554 <    }
2540 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2541 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2542 >        f.complete(v1);
2543 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2544 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2545 >        checkCompletedWithWrappedCFException(h0);
2546 >        checkCompletedWithWrappedCFException(h1);
2547 >        checkCompletedWithWrappedCFException(h2);
2548 >        checkCompletedWithWrappedCFException(h3);
2549 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2550 >        g.complete(v2);
2551 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2552 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2553 >        checkCompletedWithWrappedCFException(h4);
2554 >        checkCompletedWithWrappedCFException(h5);
2555 >
2556 >        checkCompletedNormally(f, v1);
2557 >        checkCompletedNormally(g, v2);
2558 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2559 >    }}
2560  
2561      /**
2562       * thenCompose result completes normally after normal completion of source
2563       */
2564 <    public void testThenCompose() {
2565 <        CompletableFuture<Integer> f, g;
2566 <        CompletableFutureInc r;
2567 <
2568 <        f = new CompletableFuture<>();
2569 <        g = f.thenCompose(r = new CompletableFutureInc());
2570 <        f.complete(one);
2571 <        checkCompletedNormally(g, two);
2572 <        assertTrue(r.ran);
2564 >    public void testThenCompose_normalCompletion() {
2565 >        for (ExecutionMode m : ExecutionMode.values())
2566 >        for (boolean createIncomplete : new boolean[] { true, false })
2567 >        for (Integer v1 : new Integer[] { 1, null })
2568 >    {
2569 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2570 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2571 >        if (!createIncomplete) f.complete(v1);
2572 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2573 >        if (createIncomplete) f.complete(v1);
2574  
2575 <        f = new CompletableFuture<>();
2576 <        f.complete(one);
2577 <        g = f.thenCompose(r = new CompletableFutureInc());
2578 <        checkCompletedNormally(g, two);
2072 <        assertTrue(r.ran);
2073 <    }
2575 >        checkCompletedNormally(g, inc(v1));
2576 >        checkCompletedNormally(f, v1);
2577 >        r.assertValue(v1);
2578 >    }}
2579  
2580      /**
2581       * thenCompose result completes exceptionally after exceptional
2582       * completion of source
2583       */
2584 <    public void testThenCompose2() {
2585 <        CompletableFuture<Integer> f, g;
2586 <        CompletableFutureInc r;
2587 <
2588 <        f = new CompletableFuture<>();
2589 <        g = f.thenCompose(r = new CompletableFutureInc());
2590 <        f.completeExceptionally(new CFException());
2591 <        checkCompletedWithWrappedCFException(g);
2592 <
2593 <        f = new CompletableFuture<>();
2594 <        f.completeExceptionally(new CFException());
2595 <        g = f.thenCompose(r = new CompletableFutureInc());
2596 <        checkCompletedWithWrappedCFException(g);
2597 <    }
2584 >    public void testThenCompose_exceptionalCompletion() {
2585 >        for (ExecutionMode m : ExecutionMode.values())
2586 >        for (boolean createIncomplete : new boolean[] { true, false })
2587 >    {
2588 >        final CFException ex = new CFException();
2589 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2590 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2591 >        if (!createIncomplete) f.completeExceptionally(ex);
2592 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2593 >        if (createIncomplete) f.completeExceptionally(ex);
2594 >
2595 >        checkCompletedWithWrappedException(g, ex);
2596 >        checkCompletedExceptionally(f, ex);
2597 >        r.assertNotInvoked();
2598 >    }}
2599  
2600      /**
2601       * thenCompose result completes exceptionally if action does
2602       */
2603 <    public void testThenCompose3() {
2604 <        CompletableFuture<Integer> f, g;
2605 <        FailingCompletableFutureFunction r;
2606 <
2607 <        f = new CompletableFuture<>();
2608 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2609 <        f.complete(one);
2610 <        checkCompletedWithWrappedCFException(g);
2603 >    public void testThenCompose_actionFailed() {
2604 >        for (ExecutionMode m : ExecutionMode.values())
2605 >        for (boolean createIncomplete : new boolean[] { true, false })
2606 >        for (Integer v1 : new Integer[] { 1, null })
2607 >    {
2608 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2609 >        final FailingCompletableFutureFunction r
2610 >            = new FailingCompletableFutureFunction(m);
2611 >        if (!createIncomplete) f.complete(v1);
2612 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2613 >        if (createIncomplete) f.complete(v1);
2614  
2106        f = new CompletableFuture<>();
2107        f.complete(one);
2108        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2615          checkCompletedWithWrappedCFException(g);
2616 <    }
2616 >        checkCompletedNormally(f, v1);
2617 >    }}
2618  
2619      /**
2620       * thenCompose result completes exceptionally if source cancelled
2621       */
2622 <    public void testThenCompose4() {
2623 <        CompletableFuture<Integer> f, g;
2624 <        CompletableFutureInc r;
2625 <
2626 <        f = new CompletableFuture<>();
2627 <        g = f.thenCompose(r = new CompletableFutureInc());
2628 <        assertTrue(f.cancel(true));
2629 <        checkCompletedWithWrappedCancellationException(g);
2630 <
2631 <        f = new CompletableFuture<>();
2632 <        assertTrue(f.cancel(true));
2633 <        g = f.thenCompose(r = new CompletableFutureInc());
2634 <        checkCompletedWithWrappedCancellationException(g);
2128 <    }
2129 <
2130 <    // asyncs
2131 <
2132 <    /**
2133 <     * thenRunAsync result completes normally after normal completion of source
2134 <     */
2135 <    public void testThenRunAsync() {
2136 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2137 <        Noop r = new Noop();
2138 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2139 <        f.complete(null);
2140 <        checkCompletedNormally(g, null);
2141 <
2142 <        // reordered version
2143 <        f = new CompletableFuture<>();
2144 <        f.complete(null);
2145 <        r = new Noop();
2146 <        g = f.thenRunAsync(r);
2147 <        checkCompletedNormally(g, null);
2148 <    }
2149 <
2150 <    /**
2151 <     * thenRunAsync result completes exceptionally after exceptional
2152 <     * completion of source
2153 <     */
2154 <    public void testThenRunAsync2() {
2155 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2156 <        Noop r = new Noop();
2157 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2158 <        f.completeExceptionally(new CFException());
2159 <        try {
2160 <            g.join();
2161 <            shouldThrow();
2162 <        } catch (CompletionException success) {}
2163 <        checkCompletedWithWrappedCFException(g);
2164 <    }
2165 <
2166 <    /**
2167 <     * thenRunAsync result completes exceptionally if action does
2168 <     */
2169 <    public void testThenRunAsync3() {
2170 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2171 <        FailingNoop r = new FailingNoop();
2172 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2173 <        f.complete(null);
2174 <        checkCompletedWithWrappedCFException(g);
2175 <    }
2176 <
2177 <    /**
2178 <     * thenRunAsync result completes exceptionally if source cancelled
2179 <     */
2180 <    public void testThenRunAsync4() {
2181 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2182 <        Noop r = new Noop();
2183 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2184 <        assertTrue(f.cancel(true));
2185 <        checkCompletedWithWrappedCancellationException(g);
2186 <    }
2187 <
2188 <    /**
2189 <     * thenApplyAsync result completes normally after normal completion of source
2190 <     */
2191 <    public void testThenApplyAsync() {
2192 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2193 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2194 <        f.complete(one);
2195 <        checkCompletedNormally(g, two);
2196 <    }
2197 <
2198 <    /**
2199 <     * thenApplyAsync result completes exceptionally after exceptional
2200 <     * completion of source
2201 <     */
2202 <    public void testThenApplyAsync2() {
2203 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2204 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2205 <        f.completeExceptionally(new CFException());
2206 <        checkCompletedWithWrappedCFException(g);
2207 <    }
2208 <
2209 <    /**
2210 <     * thenApplyAsync result completes exceptionally if action does
2211 <     */
2212 <    public void testThenApplyAsync3() {
2213 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2214 <        FailingFunction r = new FailingFunction();
2215 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2216 <        f.complete(null);
2217 <        checkCompletedWithWrappedCFException(g);
2218 <    }
2219 <
2220 <    /**
2221 <     * thenApplyAsync result completes exceptionally if source cancelled
2222 <     */
2223 <    public void testThenApplyAsync4() {
2224 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2225 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2226 <        assertTrue(f.cancel(true));
2227 <        checkCompletedWithWrappedCancellationException(g);
2228 <    }
2229 <
2230 <    /**
2231 <     * thenAcceptAsync result completes normally after normal
2232 <     * completion of source
2233 <     */
2234 <    public void testThenAcceptAsync() {
2235 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2236 <        IncAction r = new IncAction();
2237 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2238 <        f.complete(one);
2239 <        checkCompletedNormally(g, null);
2240 <        assertEquals(r.value, (Integer) 2);
2241 <    }
2242 <
2243 <    /**
2244 <     * thenAcceptAsync result completes exceptionally after exceptional
2245 <     * completion of source
2246 <     */
2247 <    public void testThenAcceptAsync2() {
2248 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2249 <        IncAction r = new IncAction();
2250 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2251 <        f.completeExceptionally(new CFException());
2252 <        checkCompletedWithWrappedCFException(g);
2253 <    }
2254 <
2255 <    /**
2256 <     * thenAcceptAsync result completes exceptionally if action does
2257 <     */
2258 <    public void testThenAcceptAsync3() {
2259 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2260 <        FailingConsumer r = new FailingConsumer();
2261 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2262 <        f.complete(null);
2263 <        checkCompletedWithWrappedCFException(g);
2264 <    }
2265 <
2266 <    /**
2267 <     * thenAcceptAsync result completes exceptionally if source cancelled
2268 <     */
2269 <    public void testThenAcceptAsync4() {
2270 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2271 <        IncAction r = new IncAction();
2272 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2273 <        assertTrue(f.cancel(true));
2274 <        checkCompletedWithWrappedCancellationException(g);
2275 <    }
2276 <
2277 <    /**
2278 <     * applyToEitherAsync result completes normally after normal
2279 <     * completion of sources
2280 <     */
2281 <    public void testApplyToEitherAsync() {
2282 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2283 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2284 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2285 <        f.complete(one);
2286 <        checkCompletedNormally(g, two);
2287 <
2288 <        f = new CompletableFuture<>();
2289 <        f.complete(one);
2290 <        f2 = new CompletableFuture<>();
2291 <        g = f.applyToEitherAsync(f2, inc);
2292 <        checkCompletedNormally(g, two);
2293 <    }
2294 <
2295 <    /**
2296 <     * applyToEitherAsync result completes exceptionally after exceptional
2297 <     * completion of source
2298 <     */
2299 <    public void testApplyToEitherAsync2() {
2300 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2301 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2302 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2303 <        f.completeExceptionally(new CFException());
2304 <        checkCompletedWithWrappedCFException(g);
2305 <
2306 <        f = new CompletableFuture<>();
2307 <        f2 = new CompletableFuture<>();
2308 <        f2.completeExceptionally(new CFException());
2309 <        g = f.applyToEitherAsync(f2, inc);
2310 <        f.complete(one);
2311 <        checkCompletedWithWrappedCFException(g);
2312 <    }
2313 <
2314 <    /**
2315 <     * applyToEitherAsync result completes exceptionally if action does
2316 <     */
2317 <    public void testApplyToEitherAsync3() {
2318 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2319 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2320 <        FailingFunction r = new FailingFunction();
2321 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2322 <        f.complete(one);
2323 <        checkCompletedWithWrappedCFException(g);
2324 <    }
2325 <
2326 <    /**
2327 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2328 <     */
2329 <    public void testApplyToEitherAsync4() {
2330 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2331 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2332 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2333 <        assertTrue(f.cancel(true));
2334 <        checkCompletedWithWrappedCancellationException(g);
2335 <
2336 <        f = new CompletableFuture<>();
2337 <        f2 = new CompletableFuture<>();
2338 <        assertTrue(f2.cancel(true));
2339 <        g = f.applyToEitherAsync(f2, inc);
2340 <        checkCompletedWithWrappedCancellationException(g);
2341 <    }
2342 <
2343 <    /**
2344 <     * acceptEitherAsync result completes normally after normal
2345 <     * completion of sources
2346 <     */
2347 <    public void testAcceptEitherAsync() {
2348 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2349 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2350 <        IncAction r = new IncAction();
2351 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2352 <        f.complete(one);
2353 <        checkCompletedNormally(g, null);
2354 <        assertEquals(r.value, (Integer) 2);
2355 <
2356 <        r = new IncAction();
2357 <        f = new CompletableFuture<>();
2358 <        f.complete(one);
2359 <        f2 = new CompletableFuture<>();
2360 <        g = f.acceptEitherAsync(f2, r);
2361 <        checkCompletedNormally(g, null);
2362 <        assertEquals(r.value, (Integer) 2);
2363 <    }
2364 <
2365 <    /**
2366 <     * acceptEitherAsync result completes exceptionally after exceptional
2367 <     * completion of source
2368 <     */
2369 <    public void testAcceptEitherAsync2() {
2370 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2371 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2372 <        IncAction r = new IncAction();
2373 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2374 <        f.completeExceptionally(new CFException());
2375 <        checkCompletedWithWrappedCFException(g);
2376 <
2377 <        r = new IncAction();
2378 <        f = new CompletableFuture<>();
2379 <        f2 = new CompletableFuture<>();
2380 <        f2.completeExceptionally(new CFException());
2381 <        g = f.acceptEitherAsync(f2, r);
2382 <        f.complete(one);
2383 <        checkCompletedWithWrappedCFException(g);
2384 <    }
2385 <
2386 <    /**
2387 <     * acceptEitherAsync result completes exceptionally if action does
2388 <     */
2389 <    public void testAcceptEitherAsync3() {
2390 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2391 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2392 <        FailingConsumer r = new FailingConsumer();
2393 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2394 <        f.complete(one);
2395 <        checkCompletedWithWrappedCFException(g);
2396 <    }
2397 <
2398 <    /**
2399 <     * acceptEitherAsync result completes exceptionally if either
2400 <     * source cancelled
2401 <     */
2402 <    public void testAcceptEitherAsync4() {
2403 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2404 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2405 <        IncAction r = new IncAction();
2406 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2407 <        assertTrue(f.cancel(true));
2408 <        checkCompletedWithWrappedCancellationException(g);
2409 <
2410 <        r = new IncAction();
2411 <        f = new CompletableFuture<>();
2412 <        f2 = new CompletableFuture<>();
2413 <        assertTrue(f2.cancel(true));
2414 <        g = f.acceptEitherAsync(f2, r);
2415 <        checkCompletedWithWrappedCancellationException(g);
2416 <    }
2417 <
2418 <    /**
2419 <     * runAfterEitherAsync result completes normally after normal
2420 <     * completion of sources
2421 <     */
2422 <    public void testRunAfterEitherAsync() {
2423 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2424 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2425 <        Noop r = new Noop();
2426 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2427 <        f.complete(one);
2428 <        checkCompletedNormally(g, null);
2429 <        assertTrue(r.ran);
2430 <
2431 <        r = new Noop();
2432 <        f = new CompletableFuture<>();
2433 <        f.complete(one);
2434 <        f2 = new CompletableFuture<>();
2435 <        g = f.runAfterEitherAsync(f2, r);
2436 <        checkCompletedNormally(g, null);
2437 <        assertTrue(r.ran);
2438 <    }
2439 <
2440 <    /**
2441 <     * runAfterEitherAsync result completes exceptionally after exceptional
2442 <     * completion of source
2443 <     */
2444 <    public void testRunAfterEitherAsync2() {
2445 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2446 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2447 <        Noop r = new Noop();
2448 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2449 <        f.completeExceptionally(new CFException());
2450 <        checkCompletedWithWrappedCFException(g);
2451 <
2452 <        r = new Noop();
2453 <        f = new CompletableFuture<>();
2454 <        f2 = new CompletableFuture<>();
2455 <        f2.completeExceptionally(new CFException());
2456 <        g = f.runAfterEitherAsync(f2, r);
2457 <        f.complete(one);
2458 <        checkCompletedWithWrappedCFException(g);
2459 <    }
2460 <
2461 <    /**
2462 <     * runAfterEitherAsync result completes exceptionally if action does
2463 <     */
2464 <    public void testRunAfterEitherAsync3() {
2465 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2466 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2467 <        FailingNoop r = new FailingNoop();
2468 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2469 <        f.complete(one);
2470 <        checkCompletedWithWrappedCFException(g);
2471 <    }
2472 <
2473 <    /**
2474 <     * runAfterEitherAsync result completes exceptionally if either
2475 <     * source cancelled
2476 <     */
2477 <    public void testRunAfterEitherAsync4() {
2478 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2479 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2480 <        Noop r = new Noop();
2481 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2482 <        assertTrue(f.cancel(true));
2483 <        checkCompletedWithWrappedCancellationException(g);
2484 <
2485 <        r = new Noop();
2486 <        f = new CompletableFuture<>();
2487 <        f2 = new CompletableFuture<>();
2488 <        assertTrue(f2.cancel(true));
2489 <        g = f.runAfterEitherAsync(f2, r);
2490 <        checkCompletedWithWrappedCancellationException(g);
2491 <    }
2492 <
2493 <    /**
2494 <     * thenComposeAsync result completes normally after normal
2495 <     * completion of source
2496 <     */
2497 <    public void testThenComposeAsync() {
2498 <        CompletableFuture<Integer> f, g;
2499 <        CompletableFutureInc r;
2500 <
2501 <        f = new CompletableFuture<>();
2502 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2503 <        f.complete(one);
2504 <        checkCompletedNormally(g, two);
2505 <
2506 <        f = new CompletableFuture<>();
2507 <        f.complete(one);
2508 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2509 <        checkCompletedNormally(g, two);
2510 <    }
2511 <
2512 <    /**
2513 <     * thenComposeAsync result completes exceptionally after
2514 <     * exceptional completion of source
2515 <     */
2516 <    public void testThenComposeAsync2() {
2517 <        CompletableFuture<Integer> f, g;
2518 <        CompletableFutureInc r;
2519 <
2520 <        f = new CompletableFuture<>();
2521 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2522 <        f.completeExceptionally(new CFException());
2523 <        checkCompletedWithWrappedCFException(g);
2524 <        assertFalse(r.ran);
2525 <
2526 <        f = new CompletableFuture<>();
2527 <        f.completeExceptionally(new CFException());
2528 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2529 <        checkCompletedWithWrappedCFException(g);
2530 <        assertFalse(r.ran);
2531 <    }
2532 <
2533 <    /**
2534 <     * thenComposeAsync result completes exceptionally if action does
2535 <     */
2536 <    public void testThenComposeAsync3() {
2537 <        CompletableFuture<Integer> f, g;
2538 <        FailingCompletableFutureFunction r;
2539 <
2540 <        f = new CompletableFuture<>();
2541 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2542 <        f.complete(one);
2543 <        checkCompletedWithWrappedCFException(g);
2544 <
2545 <        f = new CompletableFuture<>();
2546 <        f.complete(one);
2547 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2548 <        checkCompletedWithWrappedCFException(g);
2549 <    }
2550 <
2551 <    /**
2552 <     * thenComposeAsync result completes exceptionally if source cancelled
2553 <     */
2554 <    public void testThenComposeAsync4() {
2555 <        CompletableFuture<Integer> f, g;
2556 <        CompletableFutureInc r;
2557 <
2558 <        f = new CompletableFuture<>();
2559 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2560 <        assertTrue(f.cancel(true));
2561 <        checkCompletedWithWrappedCancellationException(g);
2562 <
2563 <        f = new CompletableFuture<>();
2564 <        assertTrue(f.cancel(true));
2565 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2566 <        checkCompletedWithWrappedCancellationException(g);
2567 <    }
2568 <
2569 <    // async with explicit executors
2570 <
2571 <    /**
2572 <     * thenRunAsync result completes normally after normal completion of source
2573 <     */
2574 <    public void testThenRunAsyncE() {
2575 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2576 <        Noop r = new Noop();
2577 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2578 <        f.complete(null);
2579 <        checkCompletedNormally(g, null);
2580 <
2581 <        // reordered version
2582 <        f = new CompletableFuture<>();
2583 <        f.complete(null);
2584 <        r = new Noop();
2585 <        g = f.thenRunAsync(r, new ThreadExecutor());
2586 <        checkCompletedNormally(g, null);
2587 <    }
2588 <
2589 <    /**
2590 <     * thenRunAsync result completes exceptionally after exceptional
2591 <     * completion of source
2592 <     */
2593 <    public void testThenRunAsync2E() {
2594 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2595 <        Noop r = new Noop();
2596 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2597 <        f.completeExceptionally(new CFException());
2598 <        try {
2599 <            g.join();
2600 <            shouldThrow();
2601 <        } catch (CompletionException success) {}
2602 <        checkCompletedWithWrappedCFException(g);
2603 <    }
2604 <
2605 <    /**
2606 <     * thenRunAsync result completes exceptionally if action does
2607 <     */
2608 <    public void testThenRunAsync3E() {
2609 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2610 <        FailingNoop r = new FailingNoop();
2611 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2612 <        f.complete(null);
2613 <        checkCompletedWithWrappedCFException(g);
2614 <    }
2615 <
2616 <    /**
2617 <     * thenRunAsync result completes exceptionally if source cancelled
2618 <     */
2619 <    public void testThenRunAsync4E() {
2620 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2621 <        Noop r = new Noop();
2622 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2623 <        assertTrue(f.cancel(true));
2624 <        checkCompletedWithWrappedCancellationException(g);
2625 <    }
2626 <
2627 <    /**
2628 <     * thenApplyAsync result completes normally after normal completion of source
2629 <     */
2630 <    public void testThenApplyAsyncE() {
2631 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2632 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2633 <        f.complete(one);
2634 <        checkCompletedNormally(g, two);
2635 <    }
2636 <
2637 <    /**
2638 <     * thenApplyAsync result completes exceptionally after exceptional
2639 <     * completion of source
2640 <     */
2641 <    public void testThenApplyAsync2E() {
2642 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2643 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2644 <        f.completeExceptionally(new CFException());
2645 <        checkCompletedWithWrappedCFException(g);
2646 <    }
2647 <
2648 <    /**
2649 <     * thenApplyAsync result completes exceptionally if action does
2650 <     */
2651 <    public void testThenApplyAsync3E() {
2652 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2653 <        FailingFunction r = new FailingFunction();
2654 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2655 <        f.complete(null);
2656 <        checkCompletedWithWrappedCFException(g);
2657 <    }
2658 <
2659 <    /**
2660 <     * thenApplyAsync result completes exceptionally if source cancelled
2661 <     */
2662 <    public void testThenApplyAsync4E() {
2663 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2664 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2665 <        assertTrue(f.cancel(true));
2666 <        checkCompletedWithWrappedCancellationException(g);
2667 <    }
2668 <
2669 <    /**
2670 <     * thenAcceptAsync result completes normally after normal
2671 <     * completion of source
2672 <     */
2673 <    public void testThenAcceptAsyncE() {
2674 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2675 <        IncAction r = new IncAction();
2676 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2677 <        f.complete(one);
2678 <        checkCompletedNormally(g, null);
2679 <        assertEquals(r.value, (Integer) 2);
2680 <    }
2681 <
2682 <    /**
2683 <     * thenAcceptAsync result completes exceptionally after exceptional
2684 <     * completion of source
2685 <     */
2686 <    public void testThenAcceptAsync2E() {
2687 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2688 <        IncAction r = new IncAction();
2689 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2690 <        f.completeExceptionally(new CFException());
2691 <        checkCompletedWithWrappedCFException(g);
2692 <    }
2693 <
2694 <    /**
2695 <     * thenAcceptAsync result completes exceptionally if action does
2696 <     */
2697 <    public void testThenAcceptAsync3E() {
2698 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2699 <        FailingConsumer r = new FailingConsumer();
2700 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2701 <        f.complete(null);
2702 <        checkCompletedWithWrappedCFException(g);
2703 <    }
2704 <
2705 <    /**
2706 <     * thenAcceptAsync result completes exceptionally if source cancelled
2707 <     */
2708 <    public void testThenAcceptAsync4E() {
2709 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2710 <        IncAction r = new IncAction();
2711 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2712 <        assertTrue(f.cancel(true));
2713 <        checkCompletedWithWrappedCancellationException(g);
2714 <    }
2715 <
2716 <    /**
2717 <     * applyToEitherAsync result completes normally after normal
2718 <     * completion of sources
2719 <     */
2720 <    public void testApplyToEitherAsyncE() {
2721 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2722 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2723 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2724 <        f.complete(one);
2725 <        checkCompletedNormally(g, two);
2726 <
2727 <        f = new CompletableFuture<>();
2728 <        f.complete(one);
2729 <        f2 = new CompletableFuture<>();
2730 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2731 <        checkCompletedNormally(g, two);
2732 <    }
2733 <
2734 <    /**
2735 <     * applyToEitherAsync result completes exceptionally after exceptional
2736 <     * completion of source
2737 <     */
2738 <    public void testApplyToEitherAsync2E() {
2739 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2740 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2741 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2742 <        f.completeExceptionally(new CFException());
2743 <        checkCompletedWithWrappedCFException(g);
2744 <
2745 <        f = new CompletableFuture<>();
2746 <        f2 = new CompletableFuture<>();
2747 <        f2.completeExceptionally(new CFException());
2748 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2749 <        f.complete(one);
2750 <        checkCompletedWithWrappedCFException(g);
2751 <    }
2752 <
2753 <    /**
2754 <     * applyToEitherAsync result completes exceptionally if action does
2755 <     */
2756 <    public void testApplyToEitherAsync3E() {
2757 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2758 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2759 <        FailingFunction r = new FailingFunction();
2760 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2761 <        f.complete(one);
2762 <        checkCompletedWithWrappedCFException(g);
2763 <    }
2764 <
2765 <    /**
2766 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2767 <     */
2768 <    public void testApplyToEitherAsync4E() {
2769 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2770 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2771 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2772 <        assertTrue(f.cancel(true));
2773 <        checkCompletedWithWrappedCancellationException(g);
2774 <
2775 <        f = new CompletableFuture<>();
2776 <        f2 = new CompletableFuture<>();
2777 <        assertTrue(f2.cancel(true));
2778 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2779 <        checkCompletedWithWrappedCancellationException(g);
2780 <    }
2781 <
2782 <    /**
2783 <     * acceptEitherAsync result completes normally after normal
2784 <     * completion of sources
2785 <     */
2786 <    public void testAcceptEitherAsyncE() {
2787 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2788 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2789 <        IncAction r = new IncAction();
2790 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2791 <        f.complete(one);
2792 <        checkCompletedNormally(g, null);
2793 <        assertEquals(r.value, (Integer) 2);
2794 <
2795 <        r = new IncAction();
2796 <        f = new CompletableFuture<>();
2797 <        f.complete(one);
2798 <        f2 = new CompletableFuture<>();
2799 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2800 <        checkCompletedNormally(g, null);
2801 <        assertEquals(r.value, (Integer) 2);
2802 <    }
2803 <
2804 <    /**
2805 <     * acceptEitherAsync result completes exceptionally after exceptional
2806 <     * completion of source
2807 <     */
2808 <    public void testAcceptEitherAsync2E() {
2809 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2810 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2811 <        IncAction r = new IncAction();
2812 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2813 <        f.completeExceptionally(new CFException());
2814 <        checkCompletedWithWrappedCFException(g);
2815 <
2816 <        r = new IncAction();
2817 <        f = new CompletableFuture<>();
2818 <        f2 = new CompletableFuture<>();
2819 <        f2.completeExceptionally(new CFException());
2820 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2821 <        f.complete(one);
2822 <        checkCompletedWithWrappedCFException(g);
2823 <    }
2824 <
2825 <    /**
2826 <     * acceptEitherAsync result completes exceptionally if action does
2827 <     */
2828 <    public void testAcceptEitherAsync3E() {
2829 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2830 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2831 <        FailingConsumer r = new FailingConsumer();
2832 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2833 <        f.complete(one);
2834 <        checkCompletedWithWrappedCFException(g);
2835 <    }
2836 <
2837 <    /**
2838 <     * acceptEitherAsync result completes exceptionally if either
2839 <     * source cancelled
2840 <     */
2841 <    public void testAcceptEitherAsync4E() {
2842 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2843 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2844 <        IncAction r = new IncAction();
2845 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2846 <        assertTrue(f.cancel(true));
2847 <        checkCompletedWithWrappedCancellationException(g);
2848 <
2849 <        r = new IncAction();
2850 <        f = new CompletableFuture<>();
2851 <        f2 = new CompletableFuture<>();
2852 <        assertTrue(f2.cancel(true));
2853 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2854 <        checkCompletedWithWrappedCancellationException(g);
2855 <    }
2856 <
2857 <    /**
2858 <     * runAfterEitherAsync result completes normally after normal
2859 <     * completion of sources
2860 <     */
2861 <    public void testRunAfterEitherAsyncE() {
2862 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2863 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2864 <        Noop r = new Noop();
2865 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2866 <        f.complete(one);
2867 <        checkCompletedNormally(g, null);
2868 <        assertTrue(r.ran);
2869 <
2870 <        r = new Noop();
2871 <        f = new CompletableFuture<>();
2872 <        f.complete(one);
2873 <        f2 = new CompletableFuture<>();
2874 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2875 <        checkCompletedNormally(g, null);
2876 <        assertTrue(r.ran);
2877 <    }
2878 <
2879 <    /**
2880 <     * runAfterEitherAsync result completes exceptionally after exceptional
2881 <     * completion of source
2882 <     */
2883 <    public void testRunAfterEitherAsync2E() {
2884 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2885 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2886 <        Noop r = new Noop();
2887 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2888 <        f.completeExceptionally(new CFException());
2889 <        checkCompletedWithWrappedCFException(g);
2890 <
2891 <        r = new Noop();
2892 <        f = new CompletableFuture<>();
2893 <        f2 = new CompletableFuture<>();
2894 <        f2.completeExceptionally(new CFException());
2895 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2896 <        f.complete(one);
2897 <        checkCompletedWithWrappedCFException(g);
2898 <    }
2899 <
2900 <    /**
2901 <     * runAfterEitherAsync result completes exceptionally if action does
2902 <     */
2903 <    public void testRunAfterEitherAsync3E() {
2904 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2905 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2906 <        FailingNoop r = new FailingNoop();
2907 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2908 <        f.complete(one);
2909 <        checkCompletedWithWrappedCFException(g);
2910 <    }
2911 <
2912 <    /**
2913 <     * runAfterEitherAsync result completes exceptionally if either
2914 <     * source cancelled
2915 <     */
2916 <    public void testRunAfterEitherAsync4E() {
2917 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2918 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2919 <        Noop r = new Noop();
2920 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2921 <        assertTrue(f.cancel(true));
2922 <        checkCompletedWithWrappedCancellationException(g);
2923 <
2924 <        r = new Noop();
2925 <        f = new CompletableFuture<>();
2926 <        f2 = new CompletableFuture<>();
2927 <        assertTrue(f2.cancel(true));
2928 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2929 <        checkCompletedWithWrappedCancellationException(g);
2930 <    }
2931 <
2932 <    /**
2933 <     * thenComposeAsync result completes normally after normal
2934 <     * completion of source
2935 <     */
2936 <    public void testThenComposeAsyncE() {
2937 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2938 <        CompletableFutureInc r = new CompletableFutureInc();
2939 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2940 <        f.complete(one);
2941 <        checkCompletedNormally(g, two);
2942 <    }
2943 <
2944 <    /**
2945 <     * thenComposeAsync result completes exceptionally after
2946 <     * exceptional completion of source
2947 <     */
2948 <    public void testThenComposeAsync2E() {
2949 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2950 <        CompletableFutureInc r = new CompletableFutureInc();
2951 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2952 <        f.completeExceptionally(new CFException());
2953 <        checkCompletedWithWrappedCFException(g);
2954 <    }
2955 <
2956 <    /**
2957 <     * thenComposeAsync result completes exceptionally if action does
2958 <     */
2959 <    public void testThenComposeAsync3E() {
2960 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2961 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2962 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2963 <        f.complete(one);
2964 <        checkCompletedWithWrappedCFException(g);
2965 <    }
2622 >    public void testThenCompose_sourceCancelled() {
2623 >        for (ExecutionMode m : ExecutionMode.values())
2624 >        for (boolean createIncomplete : new boolean[] { true, false })
2625 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2626 >    {
2627 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2628 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2629 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2630 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2631 >        if (createIncomplete) {
2632 >            checkIncomplete(g);
2633 >            assertTrue(f.cancel(mayInterruptIfRunning));
2634 >        }
2635  
2967    /**
2968     * thenComposeAsync result completes exceptionally if source cancelled
2969     */
2970    public void testThenComposeAsync4E() {
2971        CompletableFuture<Integer> f = new CompletableFuture<>();
2972        CompletableFutureInc r = new CompletableFutureInc();
2973        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2974        assertTrue(f.cancel(true));
2636          checkCompletedWithWrappedCancellationException(g);
2637 <    }
2637 >        checkCancelled(f);
2638 >    }}
2639  
2640      // other static methods
2641  
# Line 2992 | Line 2654 | public class CompletableFutureTest exten
2654       */
2655      public void testAllOf_normal() throws Exception {
2656          for (int k = 1; k < 20; ++k) {
2657 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2657 >            CompletableFuture<Integer>[] fs
2658 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2659              for (int i = 0; i < k; ++i)
2660                  fs[i] = new CompletableFuture<>();
2661              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3006 | Line 2669 | public class CompletableFutureTest exten
2669          }
2670      }
2671  
2672 +    public void testAllOf_backwards() throws Exception {
2673 +        for (int k = 1; k < 20; ++k) {
2674 +            CompletableFuture<Integer>[] fs
2675 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2676 +            for (int i = 0; i < k; ++i)
2677 +                fs[i] = new CompletableFuture<>();
2678 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2679 +            for (int i = k - 1; i >= 0; i--) {
2680 +                checkIncomplete(f);
2681 +                checkIncomplete(CompletableFuture.allOf(fs));
2682 +                fs[i].complete(one);
2683 +            }
2684 +            checkCompletedNormally(f, null);
2685 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2686 +        }
2687 +    }
2688 +
2689      /**
2690       * anyOf(no component futures) returns an incomplete future
2691       */
# Line 3064 | Line 2744 | public class CompletableFutureTest exten
2744          Runnable[] throwingActions = {
2745              () -> CompletableFuture.supplyAsync(null),
2746              () -> CompletableFuture.supplyAsync(null, exec),
2747 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2747 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2748  
2749              () -> CompletableFuture.runAsync(null),
2750              () -> CompletableFuture.runAsync(null, exec),
# Line 3137 | Line 2817 | public class CompletableFutureTest exten
2817  
2818              () -> f.thenCompose(null),
2819              () -> f.thenComposeAsync(null),
2820 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2820 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2821              () -> f.thenComposeAsync(null, exec),
2822  
2823              () -> f.exceptionally(null),
# Line 3173 | Line 2853 | public class CompletableFutureTest exten
2853       * whenComplete action executes on normal completion, propagating
2854       * source result.
2855       */
2856 <    public void testWhenComplete1() {
2857 <        final AtomicInteger a = new AtomicInteger();
2858 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2859 <        CompletableFuture<Integer> g =
2860 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
2861 <        f.complete(three);
2862 <        checkCompletedNormally(f, three);
2863 <        checkCompletedNormally(g, three);
2864 <        assertEquals(a.get(), 1);
2865 <    }
2866 <
2867 <    /**
2868 <     * whenComplete action executes on exceptional completion, propagating
2869 <     * source result.
2870 <     */
2871 <    public void testWhenComplete2() {
2872 <        final AtomicInteger a = new AtomicInteger();
3193 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3194 <        CompletableFuture<Integer> g =
3195 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3196 <        f.completeExceptionally(new CFException());
3197 <        assertTrue(f.isCompletedExceptionally());
3198 <        assertTrue(g.isCompletedExceptionally());
3199 <        assertEquals(a.get(), 1);
3200 <    }
3201 <
3202 <    /**
3203 <     * If a whenComplete action throws an exception when triggered by
3204 <     * a normal completion, it completes exceptionally
3205 <     */
3206 <    public void testWhenComplete3() {
3207 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3208 <        CompletableFuture<Integer> g =
3209 <            f.whenComplete((Integer x, Throwable t) ->
3210 <                           { throw new CFException(); } );
3211 <        f.complete(three);
3212 <        checkCompletedNormally(f, three);
3213 <        assertTrue(g.isCompletedExceptionally());
3214 <        checkCompletedWithWrappedCFException(g);
3215 <    }
3216 <
3217 <    /**
3218 <     * whenCompleteAsync action executes on normal completion, propagating
3219 <     * source result.
3220 <     */
3221 <    public void testWhenCompleteAsync1() {
3222 <        final AtomicInteger a = new AtomicInteger();
3223 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3224 <        CompletableFuture<Integer> g =
3225 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3226 <        f.complete(three);
3227 <        checkCompletedNormally(f, three);
3228 <        checkCompletedNormally(g, three);
3229 <        assertEquals(a.get(), 1);
3230 <    }
3231 <
3232 <    /**
3233 <     * whenCompleteAsync action executes on exceptional completion, propagating
3234 <     * source result.
3235 <     */
3236 <    public void testWhenCompleteAsync2() {
3237 <        final AtomicInteger a = new AtomicInteger();
3238 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3239 <        CompletableFuture<Integer> g =
3240 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3241 <        f.completeExceptionally(new CFException());
3242 <        checkCompletedWithWrappedCFException(f);
3243 <        checkCompletedWithWrappedCFException(g);
3244 <    }
2856 >    public void testWhenComplete_normalCompletion1() {
2857 >        for (ExecutionMode m : ExecutionMode.values())
2858 >        for (boolean createIncomplete : new boolean[] { true, false })
2859 >        for (Integer v1 : new Integer[] { 1, null })
2860 >    {
2861 >        final AtomicInteger a = new AtomicInteger(0);
2862 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2863 >        if (!createIncomplete) f.complete(v1);
2864 >        final CompletableFuture<Integer> g = m.whenComplete
2865 >            (f,
2866 >             (Integer x, Throwable t) -> {
2867 >                m.checkExecutionMode();
2868 >                threadAssertSame(x, v1);
2869 >                threadAssertNull(t);
2870 >                a.getAndIncrement();
2871 >            });
2872 >        if (createIncomplete) f.complete(v1);
2873  
2874 <    /**
2875 <     * If a whenCompleteAsync action throws an exception when
2876 <     * triggered by a normal completion, it completes exceptionally
2877 <     */
3250 <    public void testWhenCompleteAsync3() {
3251 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3252 <        CompletableFuture<Integer> g =
3253 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3254 <                           { throw new CFException(); } );
3255 <        f.complete(three);
3256 <        checkCompletedNormally(f, three);
3257 <        checkCompletedWithWrappedCFException(g);
3258 <    }
2874 >        checkCompletedNormally(g, v1);
2875 >        checkCompletedNormally(f, v1);
2876 >        assertEquals(1, a.get());
2877 >    }}
2878  
2879      /**
2880 <     * whenCompleteAsync action executes on normal completion, propagating
2880 >     * whenComplete action executes on exceptional completion, propagating
2881       * source result.
2882       */
2883 <    public void testWhenCompleteAsync1e() {
2884 <        final AtomicInteger a = new AtomicInteger();
2885 <        ThreadExecutor exec = new ThreadExecutor();
2886 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2887 <        CompletableFuture<Integer> g =
2888 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2889 <                                exec);
2890 <        f.complete(three);
2891 <        checkCompletedNormally(f, three);
2892 <        checkCompletedNormally(g, three);
2893 <        assertEquals(a.get(), 1);
2894 <    }
2883 >    public void testWhenComplete_exceptionalCompletion() {
2884 >        for (ExecutionMode m : ExecutionMode.values())
2885 >        for (boolean createIncomplete : new boolean[] { true, false })
2886 >        for (Integer v1 : new Integer[] { 1, null })
2887 >    {
2888 >        final AtomicInteger a = new AtomicInteger(0);
2889 >        final CFException ex = new CFException();
2890 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2891 >        if (!createIncomplete) f.completeExceptionally(ex);
2892 >        final CompletableFuture<Integer> g = m.whenComplete
2893 >            (f,
2894 >             (Integer x, Throwable t) -> {
2895 >                m.checkExecutionMode();
2896 >                threadAssertNull(x);
2897 >                threadAssertSame(t, ex);
2898 >                a.getAndIncrement();
2899 >            });
2900 >        if (createIncomplete) f.completeExceptionally(ex);
2901 >        checkCompletedExceptionally(f, ex);
2902 >        checkCompletedWithWrappedException(g, ex);
2903 >        assertEquals(1, a.get());
2904 >    }}
2905  
2906      /**
2907 <     * whenCompleteAsync action executes on exceptional completion, propagating
2908 <     * source result.
2907 >     * whenComplete action executes on cancelled source, propagating
2908 >     * CancellationException.
2909       */
2910 <    public void testWhenCompleteAsync2e() {
2911 <        final AtomicInteger a = new AtomicInteger();
2912 <        ThreadExecutor exec = new ThreadExecutor();
2913 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2914 <        CompletableFuture<Integer> g =
2915 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2916 <                                exec);
2917 <        f.completeExceptionally(new CFException());
2918 <        checkCompletedWithWrappedCFException(f);
2919 <        checkCompletedWithWrappedCFException(g);
2920 <    }
2910 >    public void testWhenComplete_sourceCancelled() {
2911 >        for (ExecutionMode m : ExecutionMode.values())
2912 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2913 >        for (boolean createIncomplete : new boolean[] { true, false })
2914 >    {
2915 >        final AtomicInteger a = new AtomicInteger(0);
2916 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2917 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2918 >        final CompletableFuture<Integer> g = m.whenComplete
2919 >            (f,
2920 >             (Integer x, Throwable t) -> {
2921 >                m.checkExecutionMode();
2922 >                threadAssertNull(x);
2923 >                threadAssertTrue(t instanceof CancellationException);
2924 >                a.getAndIncrement();
2925 >            });
2926 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2927  
2928 <    /**
2929 <     * If a whenCompleteAsync action throws an exception when triggered
2930 <     * by a normal completion, it completes exceptionally
2931 <     */
3297 <    public void testWhenCompleteAsync3e() {
3298 <        ThreadExecutor exec = new ThreadExecutor();
3299 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3300 <        CompletableFuture<Integer> g =
3301 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3302 <                                { throw new CFException(); },
3303 <                                exec);
3304 <        f.complete(three);
3305 <        checkCompletedNormally(f, three);
3306 <        checkCompletedWithWrappedCFException(g);
3307 <    }
2928 >        checkCompletedWithWrappedCancellationException(g);
2929 >        checkCancelled(f);
2930 >        assertEquals(1, a.get());
2931 >    }}
2932  
2933      /**
2934 <     * handleAsync action completes normally with function value on
2935 <     * either normal or exceptional completion of source
2934 >     * If a whenComplete action throws an exception when triggered by
2935 >     * a normal completion, it completes exceptionally
2936       */
2937 <    public void testHandleAsync() {
2938 <        CompletableFuture<Integer> f, g;
2939 <        IntegerHandler r;
2940 <
2941 <        f = new CompletableFuture<>();
2942 <        g = f.handleAsync(r = new IntegerHandler());
2943 <        assertFalse(r.ran);
2944 <        f.completeExceptionally(new CFException());
2945 <        checkCompletedWithWrappedCFException(f);
2946 <        checkCompletedNormally(g, three);
2947 <        assertTrue(r.ran);
2948 <
2949 <        f = new CompletableFuture<>();
2950 <        g = f.handleAsync(r = new IntegerHandler());
2951 <        assertFalse(r.ran);
2952 <        f.completeExceptionally(new CFException());
2953 <        checkCompletedWithWrappedCFException(f);
2954 <        checkCompletedNormally(g, three);
2955 <        assertTrue(r.ran);
2956 <
2957 <        f = new CompletableFuture<>();
2958 <        g = f.handleAsync(r = new IntegerHandler());
2959 <        assertFalse(r.ran);
3336 <        f.complete(one);
3337 <        checkCompletedNormally(f, one);
3338 <        checkCompletedNormally(g, two);
3339 <        assertTrue(r.ran);
3340 <
3341 <        f = new CompletableFuture<>();
3342 <        g = f.handleAsync(r = new IntegerHandler());
3343 <        assertFalse(r.ran);
3344 <        f.complete(one);
3345 <        checkCompletedNormally(f, one);
3346 <        checkCompletedNormally(g, two);
3347 <        assertTrue(r.ran);
3348 <    }
2937 >    public void testWhenComplete_actionFailed() {
2938 >        for (boolean createIncomplete : new boolean[] { true, false })
2939 >        for (ExecutionMode m : ExecutionMode.values())
2940 >        for (Integer v1 : new Integer[] { 1, null })
2941 >    {
2942 >        final AtomicInteger a = new AtomicInteger(0);
2943 >        final CFException ex = new CFException();
2944 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2945 >        if (!createIncomplete) f.complete(v1);
2946 >        final CompletableFuture<Integer> g = m.whenComplete
2947 >            (f,
2948 >             (Integer x, Throwable t) -> {
2949 >                m.checkExecutionMode();
2950 >                threadAssertSame(x, v1);
2951 >                threadAssertNull(t);
2952 >                a.getAndIncrement();
2953 >                throw ex;
2954 >            });
2955 >        if (createIncomplete) f.complete(v1);
2956 >        checkCompletedNormally(f, v1);
2957 >        checkCompletedWithWrappedException(g, ex);
2958 >        assertEquals(1, a.get());
2959 >    }}
2960  
2961      /**
2962 <     * handleAsync action with Executor completes normally with
2963 <     * function value on either normal or exceptional completion of
2964 <     * source
2962 >     * If a whenComplete action throws an exception when triggered by
2963 >     * a source completion that also throws an exception, the source
2964 >     * exception takes precedence.
2965       */
2966 <    public void testHandleAsync2() {
2967 <        CompletableFuture<Integer> f, g;
2968 <        ThreadExecutor exec = new ThreadExecutor();
2969 <        IntegerHandler r;
2970 <
2971 <        f = new CompletableFuture<>();
2972 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2973 <        assertFalse(r.ran);
2974 <        f.completeExceptionally(new CFException());
2975 <        checkCompletedWithWrappedCFException(f);
2976 <        checkCompletedNormally(g, three);
2977 <        assertTrue(r.ran);
2978 <
2979 <        f = new CompletableFuture<>();
2980 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2981 <        assertFalse(r.ran);
2982 <        f.completeExceptionally(new CFException());
2983 <        checkCompletedWithWrappedCFException(f);
2984 <        checkCompletedNormally(g, three);
2985 <        assertTrue(r.ran);
2986 <
2987 <        f = new CompletableFuture<>();
2988 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2989 <        assertFalse(r.ran);
2990 <        f.complete(one);
2991 <        checkCompletedNormally(f, one);
3381 <        checkCompletedNormally(g, two);
3382 <        assertTrue(r.ran);
3383 <
3384 <        f = new CompletableFuture<>();
3385 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3386 <        assertFalse(r.ran);
3387 <        f.complete(one);
3388 <        checkCompletedNormally(f, one);
3389 <        checkCompletedNormally(g, two);
3390 <        assertTrue(r.ran);
3391 <    }
2966 >    public void testWhenComplete_actionFailedSourceFailed() {
2967 >        for (boolean createIncomplete : new boolean[] { true, false })
2968 >        for (ExecutionMode m : ExecutionMode.values())
2969 >        for (Integer v1 : new Integer[] { 1, null })
2970 >    {
2971 >        final AtomicInteger a = new AtomicInteger(0);
2972 >        final CFException ex1 = new CFException();
2973 >        final CFException ex2 = new CFException();
2974 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2975 >
2976 >        if (!createIncomplete) f.completeExceptionally(ex1);
2977 >        final CompletableFuture<Integer> g = m.whenComplete
2978 >            (f,
2979 >             (Integer x, Throwable t) -> {
2980 >                m.checkExecutionMode();
2981 >                threadAssertSame(t, ex1);
2982 >                threadAssertNull(x);
2983 >                a.getAndIncrement();
2984 >                throw ex2;
2985 >            });
2986 >        if (createIncomplete) f.completeExceptionally(ex1);
2987 >
2988 >        checkCompletedExceptionally(f, ex1);
2989 >        checkCompletedWithWrappedException(g, ex1);
2990 >        assertEquals(1, a.get());
2991 >    }}
2992  
2993   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines