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.45 by jsr166, Mon Jun 2 06:07:34 2014 UTC vs.
Revision 1.74 by jsr166, Fri Jun 6 21:19:22 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines