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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines