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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines