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.44 by jsr166, Mon Jun 2 06:06:30 2014 UTC vs.
Revision 1.75 by jsr166, Sat Jun 7 21:14:42 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 //             /** Experimental way to do more testing */
518 //         REVERSE_DEFAULT {
519 //             public <T,U> CompletableFuture<Void> runAfterBoth
520 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
521 //                 return g.runAfterBoth(f, a);
522 //             }
523 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
524 //                 (CompletableFuture<T> f,
525 //                  CompletionStage<? extends U> g,
526 //                  BiConsumer<? super T,? super U> a) {
527 //                 return DEFAULT.thenAcceptBoth(f, g, a);
528 //             }
529 //         },
530
531        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 545 | 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 557 | 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              }
576        },
577
578 //         REVERSE_DEFAULT_ASYNC {
579 //             public <T,U> CompletableFuture<Void> runAfterBoth
580 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
581 //                 return f.runAfterBothAsync(g, a);
582 //             }
583 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
584 //                 (CompletableFuture<T> f,
585 //                  CompletionStage<? extends U> g,
586 //                  BiConsumer<? super T,? super U> a) {
587 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
588 //             }
589 //         },
590
591        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 605 | Line 765 | public class CompletableFutureTest exten
765                   BiFunction<? super T,? super U,? extends V> a) {
766                  return f.thenCombineAsync(g, a, new ThreadExecutor());
767              }
608            public <T,U> CompletableFuture<U> applyToEither
609                (CompletableFuture<T> f,
610                 CompletionStage<? extends T> g,
611                 Function<? super T,U> a) {
612                return f.applyToEitherAsync(g, a, new ThreadExecutor());
613            }
614            public <T> CompletableFuture<Void> acceptEither
615                (CompletableFuture<T> f,
616                 CompletionStage<? extends T> g,
617                 Consumer<? super T> a) {
618                return f.acceptEitherAsync(g, a, new ThreadExecutor());
619            }
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 645 | Line 813 | public class CompletableFutureTest exten
813              (CompletableFuture<T> f,
814               CompletionStage<? extends U> g,
815               BiFunction<? super T,? super U,? extends V> a);
648        public abstract <T,U> CompletableFuture<U> applyToEither
649            (CompletableFuture<T> f,
650             CompletionStage<? extends T> g,
651             Function<? super T,U> a);
652        public abstract <T> CompletableFuture<Void> acceptEither
653            (CompletableFuture<T> f,
654             CompletionStage<? extends T> g,
655             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);
827 <
667 <
826 >             CompletionStage<? extends T> g,
827 >             Function<? super T,U> a);
828      }
829  
830      /**
831 <     * exceptionally action completes with function value on source
832 <     * exception; otherwise with source value
831 >     * exceptionally action is not invoked when source completes
832 >     * normally, and source result is propagated
833       */
834 <    public void testExceptionally() {
835 <        CompletableFuture<Integer> f = new CompletableFuture<>();
836 <        ExceptionToInteger r = new ExceptionToInteger();
837 <        CompletableFuture<Integer> g = f.exceptionally(r);
838 <        f.completeExceptionally(new CFException());
839 <        checkCompletedNormally(g, three);
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 <        f = new CompletableFuture<>();
850 <        r = new ExceptionToInteger();
851 <        g = f.exceptionally(r);
852 <        f.complete(one);
685 <        checkCompletedNormally(g, one);
686 <    }
849 >        checkCompletedNormally(g, v1);
850 >        checkCompletedNormally(f, v1);
851 >        assertEquals(0, a.get());
852 >    }}
853  
854      /**
855 <     * handle action completes normally with function value on either
856 <     * normal or exceptional completion of source
855 >     * exceptionally action completes with function value on source
856 >     * exception
857       */
858 <    public void testHandle() {
859 <        CompletableFuture<Integer> f, g;
860 <        IntegerHandler r;
861 <
862 <        f = new CompletableFuture<>();
863 <        f.completeExceptionally(new CFException());
864 <        g = f.handle(r = new IntegerHandler());
865 <        assertEquals(1, r.invocationCount);
866 <        assertEquals(1, r.invocationCount);
867 <        checkCompletedNormally(g, three);
858 >    public void testExceptionally_exceptionalCompletion() {
859 >        for (boolean createIncomplete : new boolean[] { true, false })
860 >        for (Integer v1 : new Integer[] { 1, null })
861 >    {
862 >        final AtomicInteger a = new AtomicInteger(0);
863 >        final CFException ex = new CFException();
864 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
865 >        if (!createIncomplete) f.completeExceptionally(ex);
866 >        final CompletableFuture<Integer> g = f.exceptionally
867 >            ((Throwable t) -> {
868 >                ExecutionMode.DEFAULT.checkExecutionMode();
869 >                threadAssertSame(t, ex);
870 >                a.getAndIncrement();
871 >                return v1;
872 >            });
873 >        if (createIncomplete) f.completeExceptionally(ex);
874  
875 <        f = new CompletableFuture<>();
876 <        g = f.handle(r = new IntegerHandler());
877 <        assertEquals(0, r.invocationCount);
706 <        f.completeExceptionally(new CFException());
707 <        checkCompletedNormally(g, three);
708 <        assertEquals(1, r.invocationCount);
875 >        checkCompletedNormally(g, v1);
876 >        assertEquals(1, a.get());
877 >    }}
878  
879 <        f = new CompletableFuture<>();
880 <        f.complete(one);
881 <        g = f.handle(r = new IntegerHandler());
882 <        assertEquals(1, r.invocationCount);
883 <        checkCompletedNormally(g, two);
879 >    public void testExceptionally_exceptionalCompletionActionFailed() {
880 >        for (boolean createIncomplete : new boolean[] { true, false })
881 >        for (Integer v1 : new Integer[] { 1, null })
882 >    {
883 >        final AtomicInteger a = new AtomicInteger(0);
884 >        final CFException ex1 = new CFException();
885 >        final CFException ex2 = new CFException();
886 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
887 >        if (!createIncomplete) f.completeExceptionally(ex1);
888 >        final CompletableFuture<Integer> g = f.exceptionally
889 >            ((Throwable t) -> {
890 >                ExecutionMode.DEFAULT.checkExecutionMode();
891 >                threadAssertSame(t, ex1);
892 >                a.getAndIncrement();
893 >                throw ex2;
894 >            });
895 >        if (createIncomplete) f.completeExceptionally(ex1);
896  
897 <        f = new CompletableFuture<>();
898 <        g = f.handle(r = new IntegerHandler());
899 <        assertEquals(0, r.invocationCount);
719 <        f.complete(one);
720 <        assertEquals(1, r.invocationCount);
721 <        checkCompletedNormally(g, two);
722 <    }
897 >        checkCompletedWithWrappedException(g, ex2);
898 >        assertEquals(1, a.get());
899 >    }}
900  
901      /**
902 <     * runAsync completes after running Runnable
902 >     * whenComplete action executes on normal completion, propagating
903 >     * source result.
904       */
905 <    public void testRunAsync() {
906 <        Noop r = new Noop();
907 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
908 <        assertNull(f.join());
909 <        assertEquals(1, r.invocationCount);
910 <        checkCompletedNormally(f, null);
911 <    }
905 >    public void testWhenComplete_normalCompletion1() {
906 >        for (ExecutionMode m : ExecutionMode.values())
907 >        for (boolean createIncomplete : new boolean[] { true, false })
908 >        for (Integer v1 : new Integer[] { 1, null })
909 >    {
910 >        final AtomicInteger a = new AtomicInteger(0);
911 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
912 >        if (!createIncomplete) f.complete(v1);
913 >        final CompletableFuture<Integer> g = m.whenComplete
914 >            (f,
915 >             (Integer x, Throwable t) -> {
916 >                m.checkExecutionMode();
917 >                threadAssertSame(x, v1);
918 >                threadAssertNull(t);
919 >                a.getAndIncrement();
920 >            });
921 >        if (createIncomplete) f.complete(v1);
922  
923 <    /**
924 <     * runAsync with executor completes after running Runnable
925 <     */
926 <    public void testRunAsync2() {
739 <        Noop r = new Noop();
740 <        ThreadExecutor exec = new ThreadExecutor();
741 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
742 <        assertNull(f.join());
743 <        assertEquals(1, r.invocationCount);
744 <        checkCompletedNormally(f, null);
745 <        assertEquals(1, exec.count.get());
746 <    }
923 >        checkCompletedNormally(g, v1);
924 >        checkCompletedNormally(f, v1);
925 >        assertEquals(1, a.get());
926 >    }}
927  
928      /**
929 <     * failing runAsync completes exceptionally after running Runnable
929 >     * whenComplete action executes on exceptional completion, propagating
930 >     * source result.
931       */
932 <    public void testRunAsync3() {
933 <        FailingNoop r = new FailingNoop();
934 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
935 <        checkCompletedWithWrappedCFException(f);
936 <        assertEquals(1, r.invocationCount);
937 <    }
932 >    public void testWhenComplete_exceptionalCompletion() {
933 >        for (ExecutionMode m : ExecutionMode.values())
934 >        for (boolean createIncomplete : new boolean[] { true, false })
935 >        for (Integer v1 : new Integer[] { 1, null })
936 >    {
937 >        final AtomicInteger a = new AtomicInteger(0);
938 >        final CFException ex = new CFException();
939 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
940 >        if (!createIncomplete) f.completeExceptionally(ex);
941 >        final CompletableFuture<Integer> g = m.whenComplete
942 >            (f,
943 >             (Integer x, Throwable t) -> {
944 >                m.checkExecutionMode();
945 >                threadAssertNull(x);
946 >                threadAssertSame(t, ex);
947 >                a.getAndIncrement();
948 >            });
949 >        if (createIncomplete) f.completeExceptionally(ex);
950  
951 <    /**
952 <     * supplyAsync completes with result of supplier
953 <     */
954 <    public void testSupplyAsync() {
762 <        CompletableFuture<Integer> f;
763 <        f = CompletableFuture.supplyAsync(supplyOne);
764 <        assertEquals(f.join(), one);
765 <        checkCompletedNormally(f, one);
766 <    }
951 >        checkCompletedWithWrappedException(g, ex);
952 >        checkCompletedExceptionally(f, ex);
953 >        assertEquals(1, a.get());
954 >    }}
955  
956      /**
957 <     * supplyAsync with executor completes with result of supplier
957 >     * whenComplete action executes on cancelled source, propagating
958 >     * CancellationException.
959       */
960 <    public void testSupplyAsync2() {
961 <        CompletableFuture<Integer> f;
962 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
963 <        assertEquals(f.join(), one);
964 <        checkCompletedNormally(f, one);
965 <    }
960 >    public void testWhenComplete_sourceCancelled() {
961 >        for (ExecutionMode m : ExecutionMode.values())
962 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
963 >        for (boolean createIncomplete : new boolean[] { true, false })
964 >    {
965 >        final AtomicInteger a = new AtomicInteger(0);
966 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
967 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
968 >        final CompletableFuture<Integer> g = m.whenComplete
969 >            (f,
970 >             (Integer x, Throwable t) -> {
971 >                m.checkExecutionMode();
972 >                threadAssertNull(x);
973 >                threadAssertTrue(t instanceof CancellationException);
974 >                a.getAndIncrement();
975 >            });
976 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
977 >
978 >        checkCompletedWithWrappedCancellationException(g);
979 >        checkCancelled(f);
980 >        assertEquals(1, a.get());
981 >    }}
982  
983      /**
984 <     * Failing supplyAsync completes exceptionally
984 >     * If a whenComplete action throws an exception when triggered by
985 >     * a normal completion, it completes exceptionally
986       */
987 <    public void testSupplyAsync3() {
988 <        FailingSupplier r = new FailingSupplier();
989 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
990 <        checkCompletedWithWrappedCFException(f);
991 <        assertEquals(1, r.invocationCount);
992 <    }
987 >    public void testWhenComplete_actionFailed() {
988 >        for (boolean createIncomplete : new boolean[] { true, false })
989 >        for (ExecutionMode m : ExecutionMode.values())
990 >        for (Integer v1 : new Integer[] { 1, null })
991 >    {
992 >        final AtomicInteger a = new AtomicInteger(0);
993 >        final CFException ex = new CFException();
994 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
995 >        if (!createIncomplete) f.complete(v1);
996 >        final CompletableFuture<Integer> g = m.whenComplete
997 >            (f,
998 >             (Integer x, Throwable t) -> {
999 >                m.checkExecutionMode();
1000 >                threadAssertSame(x, v1);
1001 >                threadAssertNull(t);
1002 >                a.getAndIncrement();
1003 >                throw ex;
1004 >            });
1005 >        if (createIncomplete) f.complete(v1);
1006  
1007 <    // seq completion methods
1007 >        checkCompletedWithWrappedException(g, ex);
1008 >        checkCompletedNormally(f, v1);
1009 >        assertEquals(1, a.get());
1010 >    }}
1011  
1012      /**
1013 <     * thenRun result completes normally after normal completion of source
1013 >     * If a whenComplete action throws an exception when triggered by
1014 >     * a source completion that also throws an exception, the source
1015 >     * exception takes precedence.
1016       */
1017 <    public void testThenRun() {
1018 <        CompletableFuture<Integer> f;
1019 <        CompletableFuture<Void> g;
1020 <        Noop r;
1017 >    public void testWhenComplete_actionFailedSourceFailed() {
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (ExecutionMode m : ExecutionMode.values())
1020 >        for (Integer v1 : new Integer[] { 1, null })
1021 >    {
1022 >        final AtomicInteger a = new AtomicInteger(0);
1023 >        final CFException ex1 = new CFException();
1024 >        final CFException ex2 = new CFException();
1025 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1026  
1027 <        f = new CompletableFuture<>();
1028 <        g = f.thenRun(r = new Noop());
1029 <        f.complete(null);
1030 <        checkCompletedNormally(g, null);
1031 <        assertEquals(1, r.invocationCount);
1027 >        if (!createIncomplete) f.completeExceptionally(ex1);
1028 >        final CompletableFuture<Integer> g = m.whenComplete
1029 >            (f,
1030 >             (Integer x, Throwable t) -> {
1031 >                m.checkExecutionMode();
1032 >                threadAssertSame(t, ex1);
1033 >                threadAssertNull(x);
1034 >                a.getAndIncrement();
1035 >                throw ex2;
1036 >            });
1037 >        if (createIncomplete) f.completeExceptionally(ex1);
1038  
1039 <        f = new CompletableFuture<>();
1040 <        f.complete(null);
1041 <        g = f.thenRun(r = new Noop());
1042 <        checkCompletedNormally(g, null);
808 <        assertEquals(1, r.invocationCount);
809 <    }
1039 >        checkCompletedWithWrappedException(g, ex1);
1040 >        checkCompletedExceptionally(f, ex1);
1041 >        assertEquals(1, a.get());
1042 >    }}
1043  
1044      /**
1045 <     * thenRun result completes exceptionally after exceptional
1045 >     * handle action completes normally with function value on normal
1046       * completion of source
1047       */
1048 <    public void testThenRun2() {
1049 <        CompletableFuture<Integer> f;
1050 <        CompletableFuture<Void> g;
1051 <        Noop r;
1052 <
1053 <        f = new CompletableFuture<>();
1054 <        g = f.thenRun(r = new Noop());
1055 <        f.completeExceptionally(new CFException());
1056 <        checkCompletedWithWrappedCFException(g);
1057 <        assertEquals(0, r.invocationCount);
1048 >    public void testHandle_normalCompletion() {
1049 >        for (ExecutionMode m : ExecutionMode.values())
1050 >        for (boolean createIncomplete : new boolean[] { true, false })
1051 >        for (Integer v1 : new Integer[] { 1, null })
1052 >    {
1053 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1054 >        final AtomicInteger a = new AtomicInteger(0);
1055 >        if (!createIncomplete) f.complete(v1);
1056 >        final CompletableFuture<Integer> g = m.handle
1057 >            (f,
1058 >             (Integer x, Throwable t) -> {
1059 >                m.checkExecutionMode();
1060 >                threadAssertSame(x, v1);
1061 >                threadAssertNull(t);
1062 >                a.getAndIncrement();
1063 >                return inc(v1);
1064 >            });
1065 >        if (createIncomplete) f.complete(v1);
1066  
1067 <        f = new CompletableFuture<>();
1068 <        f.completeExceptionally(new CFException());
1069 <        g = f.thenRun(r = new Noop());
1070 <        checkCompletedWithWrappedCFException(g);
830 <        assertEquals(0, r.invocationCount);
831 <    }
1067 >        checkCompletedNormally(g, inc(v1));
1068 >        checkCompletedNormally(f, v1);
1069 >        assertEquals(1, a.get());
1070 >    }}
1071  
1072      /**
1073 <     * thenRun result completes exceptionally if action does
1073 >     * handle action completes normally with function value on
1074 >     * exceptional completion of source
1075       */
1076 <    public void testThenRun3() {
1077 <        CompletableFuture<Integer> f;
1078 <        CompletableFuture<Void> g;
1079 <        FailingNoop r;
1080 <
1081 <        f = new CompletableFuture<>();
1082 <        g = f.thenRun(r = new FailingNoop());
1083 <        f.complete(null);
1084 <        checkCompletedWithWrappedCFException(g);
1076 >    public void testHandle_exceptionalCompletion() {
1077 >        for (ExecutionMode m : ExecutionMode.values())
1078 >        for (boolean createIncomplete : new boolean[] { true, false })
1079 >        for (Integer v1 : new Integer[] { 1, null })
1080 >    {
1081 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1082 >        final AtomicInteger a = new AtomicInteger(0);
1083 >        final CFException ex = new CFException();
1084 >        if (!createIncomplete) f.completeExceptionally(ex);
1085 >        final CompletableFuture<Integer> g = m.handle
1086 >            (f,
1087 >             (Integer x, Throwable t) -> {
1088 >                m.checkExecutionMode();
1089 >                threadAssertNull(x);
1090 >                threadAssertSame(t, ex);
1091 >                a.getAndIncrement();
1092 >                return v1;
1093 >            });
1094 >        if (createIncomplete) f.completeExceptionally(ex);
1095  
1096 <        f = new CompletableFuture<>();
1097 <        f.complete(null);
1098 <        g = f.thenRun(r = new FailingNoop());
1099 <        checkCompletedWithWrappedCFException(g);
850 <    }
1096 >        checkCompletedNormally(g, v1);
1097 >        checkCompletedExceptionally(f, ex);
1098 >        assertEquals(1, a.get());
1099 >    }}
1100  
1101      /**
1102 <     * thenRun result completes exceptionally if source cancelled
1102 >     * handle action completes normally with function value on
1103 >     * cancelled source
1104       */
1105 <    public void testThenRun4() {
1106 <        CompletableFuture<Integer> f;
1107 <        CompletableFuture<Void> g;
1108 <        Noop r;
1109 <
1110 <        f = new CompletableFuture<>();
1111 <        g = f.thenRun(r = new Noop());
1112 <        assertTrue(f.cancel(true));
1113 <        checkCompletedWithWrappedCancellationException(g);
1105 >    public void testHandle_sourceCancelled() {
1106 >        for (ExecutionMode m : ExecutionMode.values())
1107 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1108 >        for (boolean createIncomplete : new boolean[] { true, false })
1109 >        for (Integer v1 : new Integer[] { 1, null })
1110 >    {
1111 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1112 >        final AtomicInteger a = new AtomicInteger(0);
1113 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1114 >        final CompletableFuture<Integer> g = m.handle
1115 >            (f,
1116 >             (Integer x, Throwable t) -> {
1117 >                m.checkExecutionMode();
1118 >                threadAssertNull(x);
1119 >                threadAssertTrue(t instanceof CancellationException);
1120 >                a.getAndIncrement();
1121 >                return v1;
1122 >            });
1123 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1124  
1125 <        f = new CompletableFuture<>();
1126 <        assertTrue(f.cancel(true));
1127 <        g = f.thenRun(r = new Noop());
1128 <        checkCompletedWithWrappedCancellationException(g);
869 <    }
1125 >        checkCompletedNormally(g, v1);
1126 >        checkCancelled(f);
1127 >        assertEquals(1, a.get());
1128 >    }}
1129  
1130      /**
1131 <     * thenApply result completes normally after normal completion of source
1131 >     * handle result completes exceptionally if action does
1132       */
1133 <    public void testThenApply() {
1134 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1135 <        CompletableFuture<Integer> g = f.thenApply(inc);
1136 <        f.complete(one);
1137 <        checkCompletedNormally(g, two);
1138 <    }
1133 >    public void testHandle_sourceFailedActionFailed() {
1134 >        for (ExecutionMode m : ExecutionMode.values())
1135 >        for (boolean createIncomplete : new boolean[] { true, false })
1136 >    {
1137 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1138 >        final AtomicInteger a = new AtomicInteger(0);
1139 >        final CFException ex1 = new CFException();
1140 >        final CFException ex2 = new CFException();
1141 >        if (!createIncomplete) f.completeExceptionally(ex1);
1142 >        final CompletableFuture<Integer> g = m.handle
1143 >            (f,
1144 >             (Integer x, Throwable t) -> {
1145 >                m.checkExecutionMode();
1146 >                threadAssertNull(x);
1147 >                threadAssertSame(ex1, t);
1148 >                a.getAndIncrement();
1149 >                throw ex2;
1150 >            });
1151 >        if (createIncomplete) f.completeExceptionally(ex1);
1152  
1153 <    /**
1154 <     * thenApply result completes exceptionally after exceptional
1155 <     * completion of source
1156 <     */
885 <    public void testThenApply2() {
886 <        CompletableFuture<Integer> f = new CompletableFuture<>();
887 <        CompletableFuture<Integer> g = f.thenApply(inc);
888 <        f.completeExceptionally(new CFException());
889 <        checkCompletedWithWrappedCFException(g);
890 <    }
1153 >        checkCompletedWithWrappedException(g, ex2);
1154 >        checkCompletedExceptionally(f, ex1);
1155 >        assertEquals(1, a.get());
1156 >    }}
1157  
1158 <    /**
1159 <     * thenApply result completes exceptionally if action does
1160 <     */
1161 <    public void testThenApply3() {
1162 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1163 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1164 <        f.complete(one);
1165 <        checkCompletedWithWrappedCFException(g);
1166 <    }
1158 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1159 >        for (ExecutionMode m : ExecutionMode.values())
1160 >        for (boolean createIncomplete : new boolean[] { true, false })
1161 >        for (Integer v1 : new Integer[] { 1, null })
1162 >    {
1163 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1164 >        final AtomicInteger a = new AtomicInteger(0);
1165 >        final CFException ex = new CFException();
1166 >        if (!createIncomplete) f.complete(v1);
1167 >        final CompletableFuture<Integer> g = m.handle
1168 >            (f,
1169 >             (Integer x, Throwable t) -> {
1170 >                m.checkExecutionMode();
1171 >                threadAssertSame(x, v1);
1172 >                threadAssertNull(t);
1173 >                a.getAndIncrement();
1174 >                throw ex;
1175 >            });
1176 >        if (createIncomplete) f.complete(v1);
1177  
1178 <    /**
1179 <     * thenApply result completes exceptionally if source cancelled
1180 <     */
1181 <    public void testThenApply4() {
906 <        CompletableFuture<Integer> f = new CompletableFuture<>();
907 <        CompletableFuture<Integer> g = f.thenApply(inc);
908 <        assertTrue(f.cancel(true));
909 <        checkCompletedWithWrappedCancellationException(g);
910 <    }
1178 >        checkCompletedWithWrappedException(g, ex);
1179 >        checkCompletedNormally(f, v1);
1180 >        assertEquals(1, a.get());
1181 >    }}
1182  
1183      /**
1184 <     * thenAccept result completes normally after normal completion of source
1184 >     * runAsync completes after running Runnable
1185       */
1186 <    public void testThenAccept() {
1187 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1188 <        IncAction r = new IncAction();
1189 <        CompletableFuture<Void> g = f.thenAccept(r);
1190 <        f.complete(one);
1191 <        checkCompletedNormally(g, null);
1192 <        assertEquals(r.value, (Integer) 2);
1193 <    }
1186 >    public void testRunAsync_normalCompletion() {
1187 >        ExecutionMode[] executionModes = {
1188 >            ExecutionMode.ASYNC,
1189 >            ExecutionMode.EXECUTOR,
1190 >        };
1191 >        for (ExecutionMode m : executionModes)
1192 >    {
1193 >        final Noop r = new Noop(m);
1194 >        final CompletableFuture<Void> f = m.runAsync(r);
1195 >        assertNull(f.join());
1196 >        checkCompletedNormally(f, null);
1197 >        r.assertInvoked();
1198 >    }}
1199  
1200      /**
1201 <     * thenAccept result completes exceptionally after exceptional
926 <     * completion of source
1201 >     * failing runAsync completes exceptionally after running Runnable
1202       */
1203 <    public void testThenAccept2() {
1204 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1205 <        IncAction r = new IncAction();
1206 <        CompletableFuture<Void> g = f.thenAccept(r);
1207 <        f.completeExceptionally(new CFException());
1208 <        checkCompletedWithWrappedCFException(g);
1209 <    }
1203 >    public void testRunAsync_exceptionalCompletion() {
1204 >        ExecutionMode[] executionModes = {
1205 >            ExecutionMode.ASYNC,
1206 >            ExecutionMode.EXECUTOR,
1207 >        };
1208 >        for (ExecutionMode m : executionModes)
1209 >    {
1210 >        final FailingRunnable r = new FailingRunnable(m);
1211 >        final CompletableFuture<Void> f = m.runAsync(r);
1212 >        checkCompletedWithWrappedCFException(f);
1213 >        r.assertInvoked();
1214 >    }}
1215  
1216      /**
1217 <     * thenAccept result completes exceptionally if action does
1217 >     * supplyAsync completes with result of supplier
1218       */
1219 <    public void testThenAccept3() {
1220 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1221 <        FailingConsumer r = new FailingConsumer();
1222 <        CompletableFuture<Void> g = f.thenAccept(r);
1223 <        f.complete(one);
1224 <        checkCompletedWithWrappedCFException(g);
1225 <        assertEquals(1, r.invocationCount);
1226 <    }
1219 >    public void testSupplyAsync_normalCompletion() {
1220 >        ExecutionMode[] executionModes = {
1221 >            ExecutionMode.ASYNC,
1222 >            ExecutionMode.EXECUTOR,
1223 >        };
1224 >        for (ExecutionMode m : executionModes)
1225 >        for (Integer v1 : new Integer[] { 1, null })
1226 >    {
1227 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1228 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1229 >        assertSame(v1, f.join());
1230 >        checkCompletedNormally(f, v1);
1231 >        r.assertInvoked();
1232 >    }}
1233  
1234      /**
1235 <     * thenAccept result completes exceptionally if source cancelled
1235 >     * Failing supplyAsync completes exceptionally
1236       */
1237 <    public void testThenAccept4() {
1238 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1239 <        IncAction r = new IncAction();
1240 <        CompletableFuture<Void> g = f.thenAccept(r);
1241 <        assertTrue(f.cancel(true));
1242 <        checkCompletedWithWrappedCancellationException(g);
1243 <    }
1237 >    public void testSupplyAsync_exceptionalCompletion() {
1238 >        ExecutionMode[] executionModes = {
1239 >            ExecutionMode.ASYNC,
1240 >            ExecutionMode.EXECUTOR,
1241 >        };
1242 >        for (ExecutionMode m : executionModes)
1243 >    {
1244 >        FailingSupplier r = new FailingSupplier(m);
1245 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1246 >        checkCompletedWithWrappedCFException(f);
1247 >        r.assertInvoked();
1248 >    }}
1249 >
1250 >    // seq completion methods
1251  
1252      /**
1253 <     * thenCombine result completes normally after normal completion
961 <     * of sources
1253 >     * thenRun result completes normally after normal completion of source
1254       */
1255 <    public void testThenCombine_normalCompletion1() {
964 <        for (boolean createIncomplete : new boolean[] { true, false })
965 <        for (boolean fFirst : new boolean[] { true, false })
1255 >    public void testThenRun_normalCompletion() {
1256          for (ExecutionMode m : ExecutionMode.values())
1257 +        for (boolean createIncomplete : new boolean[] { true, false })
1258          for (Integer v1 : new Integer[] { 1, null })
1259 <        for (Integer v2 : new Integer[] { 2, null }) {
969 <
1259 >    {
1260          final CompletableFuture<Integer> f = new CompletableFuture<>();
1261 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1262 <        final SubtractFunction r = new SubtractFunction();
1263 <        CompletableFuture<Integer> h = null;
1264 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1265 <
976 <        if (fFirst)
977 <            f.complete(v1);
978 <        else
979 <            g.complete(v2);
980 <        if (createIncomplete) checkIncomplete(h);
981 <        assertEquals(0, r.invocationCount);
982 <        if (!fFirst)
1261 >        final Noop r = new Noop(m);
1262 >        if (!createIncomplete) f.complete(v1);
1263 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1264 >        if (createIncomplete) {
1265 >            checkIncomplete(g);
1266              f.complete(v1);
1267 <        else
985 <            g.complete(v2);
986 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1267 >        }
1268  
1269 <        checkCompletedNormally(h, subtract(v1, v2));
1269 >        checkCompletedNormally(g, null);
1270          checkCompletedNormally(f, v1);
1271 <        checkCompletedNormally(g, v2);
1272 <        assertEquals(1, r.invocationCount);
992 <        }
993 <    }
1271 >        r.assertInvoked();
1272 >    }}
1273  
1274      /**
1275 <     * thenCombine result completes exceptionally after exceptional
1276 <     * completion of either source
1275 >     * thenRun result completes exceptionally after exceptional
1276 >     * completion of source
1277       */
1278 <    public void testThenCombine_exceptionalCompletion1() {
1278 >    public void testThenRun_exceptionalCompletion() {
1279          for (ExecutionMode m : ExecutionMode.values())
1280 <        for (Integer v1 : new Integer[] { 1, null }) {
1281 <
1003 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1004 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1005 <        final SubtractFunction r = new SubtractFunction();
1006 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1280 >        for (boolean createIncomplete : new boolean[] { true, false })
1281 >    {
1282          final CFException ex = new CFException();
1008
1009        f.completeExceptionally(ex);
1010        checkIncomplete(h);
1011        g.complete(v1);
1012
1013        checkCompletedWithWrappedCFException(h, ex);
1014        checkCompletedWithWrappedCFException(f, ex);
1015        assertEquals(0, r.invocationCount);
1016        checkCompletedNormally(g, v1);
1017        }
1018    }
1019
1020    public void testThenCombine_exceptionalCompletion2() {
1021        for (ExecutionMode m : ExecutionMode.values())
1022        for (Integer v1 : new Integer[] { 1, null }) {
1023
1283          final CompletableFuture<Integer> f = new CompletableFuture<>();
1284 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1285 <        final SubtractFunction r = new SubtractFunction();
1286 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1287 <        final CFException ex = new CFException();
1288 <
1289 <        g.completeExceptionally(ex);
1031 <        checkIncomplete(h);
1032 <        f.complete(v1);
1033 <
1034 <        checkCompletedWithWrappedCFException(h, ex);
1035 <        checkCompletedWithWrappedCFException(g, ex);
1036 <        assertEquals(0, r.invocationCount);
1037 <        checkCompletedNormally(f, v1);
1284 >        final Noop r = new Noop(m);
1285 >        if (!createIncomplete) f.completeExceptionally(ex);
1286 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1287 >        if (createIncomplete) {
1288 >            checkIncomplete(g);
1289 >            f.completeExceptionally(ex);
1290          }
1039    }
1291  
1292 <    public void testThenCombine_exceptionalCompletion3() {
1293 <        for (ExecutionMode m : ExecutionMode.values())
1294 <        for (Integer v1 : new Integer[] { 1, null }) {
1292 >        checkCompletedWithWrappedException(g, ex);
1293 >        checkCompletedExceptionally(f, ex);
1294 >        r.assertNotInvoked();
1295 >    }}
1296  
1297 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1298 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1299 <        final SubtractFunction r = new SubtractFunction();
1300 <        final CFException ex = new CFException();
1049 <
1050 <        g.completeExceptionally(ex);
1051 <        f.complete(v1);
1052 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1053 <
1054 <        checkCompletedWithWrappedCFException(h, ex);
1055 <        checkCompletedWithWrappedCFException(g, ex);
1056 <        assertEquals(0, r.invocationCount);
1057 <        checkCompletedNormally(f, v1);
1058 <        }
1059 <    }
1060 <
1061 <    public void testThenCombine_exceptionalCompletion4() {
1297 >    /**
1298 >     * thenRun result completes exceptionally if source cancelled
1299 >     */
1300 >    public void testThenRun_sourceCancelled() {
1301          for (ExecutionMode m : ExecutionMode.values())
1302 <        for (Integer v1 : new Integer[] { 1, null }) {
1303 <
1302 >        for (boolean createIncomplete : new boolean[] { true, false })
1303 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1304 >    {
1305          final CompletableFuture<Integer> f = new CompletableFuture<>();
1306 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1307 <        final SubtractFunction r = new SubtractFunction();
1308 <        final CFException ex = new CFException();
1309 <
1310 <        f.completeExceptionally(ex);
1311 <        g.complete(v1);
1072 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1073 <
1074 <        checkCompletedWithWrappedCFException(h, ex);
1075 <        checkCompletedWithWrappedCFException(f, ex);
1076 <        assertEquals(0, r.invocationCount);
1077 <        checkCompletedNormally(g, v1);
1306 >        final Noop r = new Noop(m);
1307 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1308 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1309 >        if (createIncomplete) {
1310 >            checkIncomplete(g);
1311 >            assertTrue(f.cancel(mayInterruptIfRunning));
1312          }
1313 <    }
1313 >
1314 >        checkCompletedWithWrappedCancellationException(g);
1315 >        checkCancelled(f);
1316 >        r.assertNotInvoked();
1317 >    }}
1318  
1319      /**
1320 <     * thenCombine result completes exceptionally if action does
1320 >     * thenRun result completes exceptionally if action does
1321       */
1322 <    public void testThenCombine_actionFailed1() {
1322 >    public void testThenRun_actionFailed() {
1323          for (ExecutionMode m : ExecutionMode.values())
1324 +        for (boolean createIncomplete : new boolean[] { true, false })
1325          for (Integer v1 : new Integer[] { 1, null })
1326 <        for (Integer v2 : new Integer[] { 2, null }) {
1088 <
1326 >    {
1327          final CompletableFuture<Integer> f = new CompletableFuture<>();
1328 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1329 <        final FailingBiFunction r = new FailingBiFunction();
1330 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1331 <
1332 <        f.complete(v1);
1333 <        checkIncomplete(h);
1334 <        g.complete(v2);
1328 >        final FailingRunnable r = new FailingRunnable(m);
1329 >        if (!createIncomplete) f.complete(v1);
1330 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1331 >        if (createIncomplete) {
1332 >            checkIncomplete(g);
1333 >            f.complete(v1);
1334 >        }
1335  
1336 <        checkCompletedWithWrappedCFException(h);
1336 >        checkCompletedWithWrappedCFException(g);
1337          checkCompletedNormally(f, v1);
1338 <        checkCompletedNormally(g, v2);
1101 <        }
1102 <    }
1338 >    }}
1339  
1340 <    public void testThenCombine_actionFailed2() {
1340 >    /**
1341 >     * thenApply result completes normally after normal completion of source
1342 >     */
1343 >    public void testThenApply_normalCompletion() {
1344          for (ExecutionMode m : ExecutionMode.values())
1345 +        for (boolean createIncomplete : new boolean[] { true, false })
1346          for (Integer v1 : new Integer[] { 1, null })
1347 <        for (Integer v2 : new Integer[] { 2, null }) {
1108 <
1347 >    {
1348          final CompletableFuture<Integer> f = new CompletableFuture<>();
1349 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1350 <        final FailingBiFunction r = new FailingBiFunction();
1351 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1352 <
1353 <        g.complete(v2);
1354 <        checkIncomplete(h);
1355 <        f.complete(v1);
1349 >        final IncFunction r = new IncFunction(m);
1350 >        if (!createIncomplete) f.complete(v1);
1351 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1352 >        if (createIncomplete) {
1353 >            checkIncomplete(g);
1354 >            f.complete(v1);
1355 >        }
1356  
1357 <        checkCompletedWithWrappedCFException(h);
1357 >        checkCompletedNormally(g, inc(v1));
1358          checkCompletedNormally(f, v1);
1359 <        checkCompletedNormally(g, v2);
1360 <        }
1122 <    }
1359 >        r.assertValue(inc(v1));
1360 >    }}
1361  
1362      /**
1363 <     * thenCombine result completes exceptionally if either source cancelled
1363 >     * thenApply result completes exceptionally after exceptional
1364 >     * completion of source
1365       */
1366 <    public void testThenCombine_sourceCancelled1() {
1366 >    public void testThenApply_exceptionalCompletion() {
1367          for (ExecutionMode m : ExecutionMode.values())
1368 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1369 <        for (Integer v1 : new Integer[] { 1, null }) {
1370 <
1368 >        for (boolean createIncomplete : new boolean[] { true, false })
1369 >    {
1370 >        final CFException ex = new CFException();
1371          final CompletableFuture<Integer> f = new CompletableFuture<>();
1372 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1373 <        final SubtractFunction r = new SubtractFunction();
1374 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1375 <
1376 <        assertTrue(f.cancel(mayInterruptIfRunning));
1377 <        checkIncomplete(h);
1139 <        g.complete(v1);
1140 <
1141 <        checkCompletedWithWrappedCancellationException(h);
1142 <        checkCancelled(f);
1143 <        assertEquals(0, r.invocationCount);
1144 <        checkCompletedNormally(g, v1);
1372 >        final IncFunction r = new IncFunction(m);
1373 >        if (!createIncomplete) f.completeExceptionally(ex);
1374 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1375 >        if (createIncomplete) {
1376 >            checkIncomplete(g);
1377 >            f.completeExceptionally(ex);
1378          }
1146    }
1147
1148    public void testThenCombine_sourceCancelled2() {
1149        for (ExecutionMode m : ExecutionMode.values())
1150        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1151        for (Integer v1 : new Integer[] { 1, null }) {
1379  
1380 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1381 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1382 <        final SubtractFunction r = new SubtractFunction();
1383 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1157 <
1158 <        assertTrue(g.cancel(mayInterruptIfRunning));
1159 <        checkIncomplete(h);
1160 <        f.complete(v1);
1161 <
1162 <        checkCompletedWithWrappedCancellationException(h);
1163 <        checkCancelled(g);
1164 <        assertEquals(0, r.invocationCount);
1165 <        checkCompletedNormally(f, v1);
1166 <        }
1167 <    }
1380 >        checkCompletedWithWrappedException(g, ex);
1381 >        checkCompletedExceptionally(f, ex);
1382 >        r.assertNotInvoked();
1383 >    }}
1384  
1385 <    public void testThenCombine_sourceCancelled3() {
1385 >    /**
1386 >     * thenApply result completes exceptionally if source cancelled
1387 >     */
1388 >    public void testThenApply_sourceCancelled() {
1389          for (ExecutionMode m : ExecutionMode.values())
1390 +        for (boolean createIncomplete : new boolean[] { true, false })
1391          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1392 <        for (Integer v1 : new Integer[] { 1, null }) {
1173 <
1392 >    {
1393          final CompletableFuture<Integer> f = new CompletableFuture<>();
1394 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1395 <        final SubtractFunction r = new SubtractFunction();
1396 <
1397 <        assertTrue(g.cancel(mayInterruptIfRunning));
1398 <        f.complete(v1);
1399 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1181 <
1182 <        checkCompletedWithWrappedCancellationException(h);
1183 <        checkCancelled(g);
1184 <        assertEquals(0, r.invocationCount);
1185 <        checkCompletedNormally(f, v1);
1394 >        final IncFunction r = new IncFunction(m);
1395 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1396 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1397 >        if (createIncomplete) {
1398 >            checkIncomplete(g);
1399 >            assertTrue(f.cancel(mayInterruptIfRunning));
1400          }
1187    }
1188
1189    public void testThenCombine_sourceCancelled4() {
1190        for (ExecutionMode m : ExecutionMode.values())
1191        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1192        for (Integer v1 : new Integer[] { 1, null }) {
1193
1194        final CompletableFuture<Integer> f = new CompletableFuture<>();
1195        final CompletableFuture<Integer> g = new CompletableFuture<>();
1196        final SubtractFunction r = new SubtractFunction();
1197
1198        assertTrue(f.cancel(mayInterruptIfRunning));
1199        g.complete(v1);
1200        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1401  
1402 <        checkCompletedWithWrappedCancellationException(h);
1402 >        checkCompletedWithWrappedCancellationException(g);
1403          checkCancelled(f);
1404 <        assertEquals(0, r.invocationCount);
1405 <        checkCompletedNormally(g, v1);
1206 <        }
1207 <    }
1404 >        r.assertNotInvoked();
1405 >    }}
1406  
1407      /**
1408 <     * thenAcceptBoth result completes normally after normal
1211 <     * completion of sources
1408 >     * thenApply result completes exceptionally if action does
1409       */
1410 <    public void testThenAcceptBoth_normalCompletion1() {
1410 >    public void testThenApply_actionFailed() {
1411          for (ExecutionMode m : ExecutionMode.values())
1412 +        for (boolean createIncomplete : new boolean[] { true, false })
1413          for (Integer v1 : new Integer[] { 1, null })
1414 <        for (Integer v2 : new Integer[] { 2, null }) {
1217 <
1414 >    {
1415          final CompletableFuture<Integer> f = new CompletableFuture<>();
1416 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1417 <        final SubtractAction r = new SubtractAction();
1418 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1419 <
1420 <        f.complete(v1);
1421 <        checkIncomplete(h);
1225 <        assertEquals(0, r.invocationCount);
1226 <        g.complete(v2);
1227 <
1228 <        checkCompletedNormally(h, null);
1229 <        assertEquals(r.value, subtract(v1, v2));
1230 <        checkCompletedNormally(f, v1);
1231 <        checkCompletedNormally(g, v2);
1416 >        final FailingFunction r = new FailingFunction(m);
1417 >        if (!createIncomplete) f.complete(v1);
1418 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1419 >        if (createIncomplete) {
1420 >            checkIncomplete(g);
1421 >            f.complete(v1);
1422          }
1233    }
1423  
1424 <    public void testThenAcceptBoth_normalCompletion2() {
1236 <        for (ExecutionMode m : ExecutionMode.values())
1237 <        for (Integer v1 : new Integer[] { 1, null })
1238 <        for (Integer v2 : new Integer[] { 2, null }) {
1239 <
1240 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1241 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1242 <        final SubtractAction r = new SubtractAction();
1243 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1244 <
1245 <        g.complete(v2);
1246 <        checkIncomplete(h);
1247 <        assertEquals(0, r.invocationCount);
1248 <        f.complete(v1);
1249 <
1250 <        checkCompletedNormally(h, null);
1251 <        assertEquals(r.value, subtract(v1, v2));
1424 >        checkCompletedWithWrappedCFException(g);
1425          checkCompletedNormally(f, v1);
1426 <        checkCompletedNormally(g, v2);
1254 <        }
1255 <    }
1426 >    }}
1427  
1428 <    public void testThenAcceptBoth_normalCompletion3() {
1428 >    /**
1429 >     * thenAccept result completes normally after normal completion of source
1430 >     */
1431 >    public void testThenAccept_normalCompletion() {
1432          for (ExecutionMode m : ExecutionMode.values())
1433 +        for (boolean createIncomplete : new boolean[] { true, false })
1434          for (Integer v1 : new Integer[] { 1, null })
1435 <        for (Integer v2 : new Integer[] { 2, null }) {
1261 <
1435 >    {
1436          final CompletableFuture<Integer> f = new CompletableFuture<>();
1437 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1438 <        final SubtractAction r = new SubtractAction();
1439 <
1440 <        g.complete(v2);
1441 <        f.complete(v1);
1442 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1269 <
1270 <        checkCompletedNormally(h, null);
1271 <        assertEquals(r.value, subtract(v1, v2));
1272 <        checkCompletedNormally(f, v1);
1273 <        checkCompletedNormally(g, v2);
1437 >        final NoopConsumer r = new NoopConsumer(m);
1438 >        if (!createIncomplete) f.complete(v1);
1439 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1440 >        if (createIncomplete) {
1441 >            checkIncomplete(g);
1442 >            f.complete(v1);
1443          }
1275    }
1276
1277    public void testThenAcceptBoth_normalCompletion4() {
1278        for (ExecutionMode m : ExecutionMode.values())
1279        for (Integer v1 : new Integer[] { 1, null })
1280        for (Integer v2 : new Integer[] { 2, null }) {
1281
1282        final CompletableFuture<Integer> f = new CompletableFuture<>();
1283        final CompletableFuture<Integer> g = new CompletableFuture<>();
1284        final SubtractAction r = new SubtractAction();
1285
1286        f.complete(v1);
1287        g.complete(v2);
1288        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1444  
1445 <        checkCompletedNormally(h, null);
1446 <        assertEquals(r.value, subtract(v1, v2));
1445 >        checkCompletedNormally(g, null);
1446 >        r.assertValue(v1);
1447          checkCompletedNormally(f, v1);
1448 <        checkCompletedNormally(g, v2);
1294 <        }
1295 <    }
1448 >    }}
1449  
1450      /**
1451 <     * thenAcceptBoth result completes exceptionally after exceptional
1452 <     * completion of either source
1451 >     * thenAccept result completes exceptionally after exceptional
1452 >     * completion of source
1453       */
1454 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1454 >    public void testThenAccept_exceptionalCompletion() {
1455          for (ExecutionMode m : ExecutionMode.values())
1456 <        for (Integer v1 : new Integer[] { 1, null }) {
1457 <
1305 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1306 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1307 <        final SubtractAction r = new SubtractAction();
1308 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1456 >        for (boolean createIncomplete : new boolean[] { true, false })
1457 >    {
1458          final CFException ex = new CFException();
1310
1311        f.completeExceptionally(ex);
1312        checkIncomplete(h);
1313        g.complete(v1);
1314
1315        checkCompletedWithWrappedCFException(h, ex);
1316        checkCompletedWithWrappedCFException(f, ex);
1317        assertEquals(0, r.invocationCount);
1318        checkCompletedNormally(g, v1);
1319        }
1320    }
1321
1322    public void testThenAcceptBoth_exceptionalCompletion2() {
1323        for (ExecutionMode m : ExecutionMode.values())
1324        for (Integer v1 : new Integer[] { 1, null }) {
1325
1459          final CompletableFuture<Integer> f = new CompletableFuture<>();
1460 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1461 <        final SubtractAction r = new SubtractAction();
1462 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1463 <        final CFException ex = new CFException();
1464 <
1465 <        g.completeExceptionally(ex);
1333 <        checkIncomplete(h);
1334 <        f.complete(v1);
1335 <
1336 <        checkCompletedWithWrappedCFException(h, ex);
1337 <        checkCompletedWithWrappedCFException(g, ex);
1338 <        assertEquals(0, r.invocationCount);
1339 <        checkCompletedNormally(f, v1);
1460 >        final NoopConsumer r = new NoopConsumer(m);
1461 >        if (!createIncomplete) f.completeExceptionally(ex);
1462 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1463 >        if (createIncomplete) {
1464 >            checkIncomplete(g);
1465 >            f.completeExceptionally(ex);
1466          }
1341    }
1342
1343    public void testThenAcceptBoth_exceptionalCompletion3() {
1344        for (ExecutionMode m : ExecutionMode.values())
1345        for (Integer v1 : new Integer[] { 1, null }) {
1346
1347        final CompletableFuture<Integer> f = new CompletableFuture<>();
1348        final CompletableFuture<Integer> g = new CompletableFuture<>();
1349        final SubtractAction r = new SubtractAction();
1350        final CFException ex = new CFException();
1351
1352        g.completeExceptionally(ex);
1353        f.complete(v1);
1354        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1467  
1468 <        checkCompletedWithWrappedCFException(h, ex);
1469 <        checkCompletedWithWrappedCFException(g, ex);
1470 <        assertEquals(0, r.invocationCount);
1471 <        checkCompletedNormally(f, v1);
1360 <        }
1361 <    }
1468 >        checkCompletedWithWrappedException(g, ex);
1469 >        checkCompletedExceptionally(f, ex);
1470 >        r.assertNotInvoked();
1471 >    }}
1472  
1473 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1473 >    /**
1474 >     * thenAccept result completes exceptionally if source cancelled
1475 >     */
1476 >    public void testThenAccept_sourceCancelled() {
1477          for (ExecutionMode m : ExecutionMode.values())
1478 <        for (Integer v1 : new Integer[] { 1, null }) {
1479 <
1478 >        for (boolean createIncomplete : new boolean[] { true, false })
1479 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1480 >    {
1481          final CompletableFuture<Integer> f = new CompletableFuture<>();
1482 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1483 <        final SubtractAction r = new SubtractAction();
1484 <        final CFException ex = new CFException();
1485 <
1486 <        f.completeExceptionally(ex);
1487 <        g.complete(v1);
1374 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1375 <
1376 <        checkCompletedWithWrappedCFException(h, ex);
1377 <        checkCompletedWithWrappedCFException(f, ex);
1378 <        assertEquals(0, r.invocationCount);
1379 <        checkCompletedNormally(g, v1);
1482 >        final NoopConsumer r = new NoopConsumer(m);
1483 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1484 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1485 >        if (createIncomplete) {
1486 >            checkIncomplete(g);
1487 >            assertTrue(f.cancel(mayInterruptIfRunning));
1488          }
1489 <    }
1489 >
1490 >        checkCompletedWithWrappedCancellationException(g);
1491 >        checkCancelled(f);
1492 >        r.assertNotInvoked();
1493 >    }}
1494  
1495      /**
1496 <     * thenAcceptBoth result completes exceptionally if action does
1496 >     * thenAccept result completes exceptionally if action does
1497       */
1498 <    public void testThenAcceptBoth_actionFailed1() {
1498 >    public void testThenAccept_actionFailed() {
1499          for (ExecutionMode m : ExecutionMode.values())
1500 +        for (boolean createIncomplete : new boolean[] { true, false })
1501          for (Integer v1 : new Integer[] { 1, null })
1502 <        for (Integer v2 : new Integer[] { 2, null }) {
1390 <
1502 >    {
1503          final CompletableFuture<Integer> f = new CompletableFuture<>();
1504 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1505 <        final FailingBiConsumer r = new FailingBiConsumer();
1506 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1507 <
1508 <        f.complete(v1);
1509 <        checkIncomplete(h);
1510 <        g.complete(v2);
1504 >        final FailingConsumer r = new FailingConsumer(m);
1505 >        if (!createIncomplete) f.complete(v1);
1506 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1507 >        if (createIncomplete) {
1508 >            checkIncomplete(g);
1509 >            f.complete(v1);
1510 >        }
1511  
1512 <        checkCompletedWithWrappedCFException(h);
1512 >        checkCompletedWithWrappedCFException(g);
1513          checkCompletedNormally(f, v1);
1514 <        checkCompletedNormally(g, v2);
1403 <        }
1404 <    }
1514 >    }}
1515  
1516 <    public void testThenAcceptBoth_actionFailed2() {
1516 >    /**
1517 >     * thenCombine result completes normally after normal completion
1518 >     * of sources
1519 >     */
1520 >    public void testThenCombine_normalCompletion() {
1521          for (ExecutionMode m : ExecutionMode.values())
1522 +        for (boolean createIncomplete : new boolean[] { true, false })
1523 +        for (boolean fFirst : new boolean[] { true, false })
1524          for (Integer v1 : new Integer[] { 1, null })
1525 <        for (Integer v2 : new Integer[] { 2, null }) {
1526 <
1525 >        for (Integer v2 : new Integer[] { 2, null })
1526 >    {
1527          final CompletableFuture<Integer> f = new CompletableFuture<>();
1528          final CompletableFuture<Integer> g = new CompletableFuture<>();
1529 <        final FailingBiConsumer r = new FailingBiConsumer();
1414 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1529 >        final SubtractFunction r = new SubtractFunction(m);
1530  
1531 <        g.complete(v2);
1532 <        checkIncomplete(h);
1533 <        f.complete(v1);
1531 >        if (fFirst) f.complete(v1); else g.complete(v2);
1532 >        if (!createIncomplete)
1533 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1534 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1535 >        if (createIncomplete) {
1536 >            checkIncomplete(h);
1537 >            r.assertNotInvoked();
1538 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1539 >        }
1540  
1541 <        checkCompletedWithWrappedCFException(h);
1541 >        checkCompletedNormally(h, subtract(v1, v2));
1542          checkCompletedNormally(f, v1);
1543          checkCompletedNormally(g, v2);
1544 <        }
1545 <    }
1544 >        r.assertValue(subtract(v1, v2));
1545 >    }}
1546  
1547      /**
1548 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1548 >     * thenCombine result completes exceptionally after exceptional
1549 >     * completion of either source
1550       */
1551 <    public void testThenAcceptBoth_sourceCancelled1() {
1551 >    public void testThenCombine_exceptionalCompletion() {
1552          for (ExecutionMode m : ExecutionMode.values())
1553 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1554 <        for (Integer v1 : new Integer[] { 1, null }) {
1555 <
1553 >        for (boolean createIncomplete : new boolean[] { true, false })
1554 >        for (boolean fFirst : new boolean[] { true, false })
1555 >        for (Integer v1 : new Integer[] { 1, null })
1556 >    {
1557          final CompletableFuture<Integer> f = new CompletableFuture<>();
1558          final CompletableFuture<Integer> g = new CompletableFuture<>();
1559 <        final SubtractAction r = new SubtractAction();
1560 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1438 <
1439 <        assertTrue(f.cancel(mayInterruptIfRunning));
1440 <        checkIncomplete(h);
1441 <        g.complete(v1);
1559 >        final CFException ex = new CFException();
1560 >        final SubtractFunction r = new SubtractFunction(m);
1561  
1562 <        checkCompletedWithWrappedCancellationException(h);
1563 <        checkCancelled(f);
1564 <        assertEquals(0, r.invocationCount);
1565 <        checkCompletedNormally(g, v1);
1562 >        (fFirst ? f : g).complete(v1);
1563 >        if (!createIncomplete)
1564 >            (!fFirst ? f : g).completeExceptionally(ex);
1565 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1566 >        if (createIncomplete) {
1567 >            checkIncomplete(h);
1568 >            (!fFirst ? f : g).completeExceptionally(ex);
1569          }
1448    }
1449
1450    public void testThenAcceptBoth_sourceCancelled2() {
1451        for (ExecutionMode m : ExecutionMode.values())
1452        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1453        for (Integer v1 : new Integer[] { 1, null }) {
1454
1455        final CompletableFuture<Integer> f = new CompletableFuture<>();
1456        final CompletableFuture<Integer> g = new CompletableFuture<>();
1457        final SubtractAction r = new SubtractAction();
1458        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1459
1460        assertTrue(g.cancel(mayInterruptIfRunning));
1461        checkIncomplete(h);
1462        f.complete(v1);
1570  
1571 <        checkCompletedWithWrappedCancellationException(h);
1572 <        checkCancelled(g);
1573 <        assertEquals(0, r.invocationCount);
1574 <        checkCompletedNormally(f, v1);
1575 <        }
1469 <    }
1571 >        checkCompletedWithWrappedException(h, ex);
1572 >        r.assertNotInvoked();
1573 >        checkCompletedNormally(fFirst ? f : g, v1);
1574 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1575 >    }}
1576  
1577 <    public void testThenAcceptBoth_sourceCancelled3() {
1577 >    /**
1578 >     * thenCombine result completes exceptionally if either source cancelled
1579 >     */
1580 >    public void testThenCombine_sourceCancelled() {
1581          for (ExecutionMode m : ExecutionMode.values())
1582          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1583 <        for (Integer v1 : new Integer[] { 1, null }) {
1584 <
1583 >        for (boolean createIncomplete : new boolean[] { true, false })
1584 >        for (boolean fFirst : new boolean[] { true, false })
1585 >        for (Integer v1 : new Integer[] { 1, null })
1586 >    {
1587          final CompletableFuture<Integer> f = new CompletableFuture<>();
1588          final CompletableFuture<Integer> g = new CompletableFuture<>();
1589 <        final SubtractAction r = new SubtractAction();
1479 <
1480 <        assertTrue(g.cancel(mayInterruptIfRunning));
1481 <        f.complete(v1);
1482 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1589 >        final SubtractFunction r = new SubtractFunction(m);
1590  
1591 <        checkCompletedWithWrappedCancellationException(h);
1592 <        checkCancelled(g);
1593 <        assertEquals(0, r.invocationCount);
1594 <        checkCompletedNormally(f, v1);
1591 >        (fFirst ? f : g).complete(v1);
1592 >        if (!createIncomplete)
1593 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1594 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1595 >        if (createIncomplete) {
1596 >            checkIncomplete(h);
1597 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1598          }
1489    }
1490
1491    public void testThenAcceptBoth_sourceCancelled4() {
1492        for (ExecutionMode m : ExecutionMode.values())
1493        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1494        for (Integer v1 : new Integer[] { 1, null }) {
1495
1496        final CompletableFuture<Integer> f = new CompletableFuture<>();
1497        final CompletableFuture<Integer> g = new CompletableFuture<>();
1498        final SubtractAction r = new SubtractAction();
1499
1500        assertTrue(f.cancel(mayInterruptIfRunning));
1501        g.complete(v1);
1502        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1599  
1600          checkCompletedWithWrappedCancellationException(h);
1601 <        checkCancelled(f);
1602 <        assertEquals(0, r.invocationCount);
1603 <        checkCompletedNormally(g, v1);
1604 <        }
1509 <    }
1601 >        checkCancelled(!fFirst ? f : g);
1602 >        r.assertNotInvoked();
1603 >        checkCompletedNormally(fFirst ? f : g, v1);
1604 >    }}
1605  
1606      /**
1607 <     * runAfterBoth result completes normally after normal
1513 <     * completion of sources
1607 >     * thenCombine result completes exceptionally if action does
1608       */
1609 <    public void testRunAfterBoth_normalCompletion1() {
1609 >    public void testThenCombine_actionFailed() {
1610          for (ExecutionMode m : ExecutionMode.values())
1611 +        for (boolean fFirst : new boolean[] { true, false })
1612          for (Integer v1 : new Integer[] { 1, null })
1613 <        for (Integer v2 : new Integer[] { 2, null }) {
1614 <
1613 >        for (Integer v2 : new Integer[] { 2, null })
1614 >    {
1615          final CompletableFuture<Integer> f = new CompletableFuture<>();
1616          final CompletableFuture<Integer> g = new CompletableFuture<>();
1617 <        final Noop r = new Noop();
1618 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1524 <
1525 <        f.complete(v1);
1526 <        checkIncomplete(h);
1527 <        assertEquals(0, r.invocationCount);
1528 <        g.complete(v2);
1617 >        final FailingBiFunction r = new FailingBiFunction(m);
1618 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1619  
1620 <        checkCompletedNormally(h, null);
1621 <        assertEquals(1, r.invocationCount);
1622 <        checkCompletedNormally(f, v1);
1623 <        checkCompletedNormally(g, v2);
1620 >        if (fFirst) {
1621 >            f.complete(v1);
1622 >            g.complete(v2);
1623 >        } else {
1624 >            g.complete(v2);
1625 >            f.complete(v1);
1626          }
1535    }
1536
1537    public void testRunAfterBoth_normalCompletion2() {
1538        for (ExecutionMode m : ExecutionMode.values())
1539        for (Integer v1 : new Integer[] { 1, null })
1540        for (Integer v2 : new Integer[] { 2, null }) {
1541
1542        final CompletableFuture<Integer> f = new CompletableFuture<>();
1543        final CompletableFuture<Integer> g = new CompletableFuture<>();
1544        final Noop r = new Noop();
1545        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1627  
1628 <        g.complete(v2);
1548 <        checkIncomplete(h);
1549 <        assertEquals(0, r.invocationCount);
1550 <        f.complete(v1);
1551 <
1552 <        checkCompletedNormally(h, null);
1553 <        assertEquals(1, r.invocationCount);
1628 >        checkCompletedWithWrappedCFException(h);
1629          checkCompletedNormally(f, v1);
1630          checkCompletedNormally(g, v2);
1631 <        }
1557 <    }
1631 >    }}
1632  
1633 <    public void testRunAfterBoth_normalCompletion3() {
1633 >    /**
1634 >     * thenAcceptBoth result completes normally after normal
1635 >     * completion of sources
1636 >     */
1637 >    public void testThenAcceptBoth_normalCompletion() {
1638          for (ExecutionMode m : ExecutionMode.values())
1639 +        for (boolean createIncomplete : new boolean[] { true, false })
1640 +        for (boolean fFirst : new boolean[] { true, false })
1641          for (Integer v1 : new Integer[] { 1, null })
1642 <        for (Integer v2 : new Integer[] { 2, null }) {
1643 <
1642 >        for (Integer v2 : new Integer[] { 2, null })
1643 >    {
1644          final CompletableFuture<Integer> f = new CompletableFuture<>();
1645          final CompletableFuture<Integer> g = new CompletableFuture<>();
1646 <        final Noop r = new Noop();
1646 >        final SubtractAction r = new SubtractAction(m);
1647  
1648 <        g.complete(v2);
1649 <        f.complete(v1);
1650 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1651 <
1652 <        checkCompletedNormally(h, null);
1653 <        assertEquals(1, r.invocationCount);
1654 <        checkCompletedNormally(f, v1);
1655 <        checkCompletedNormally(g, v2);
1648 >        if (fFirst) f.complete(v1); else g.complete(v2);
1649 >        if (!createIncomplete)
1650 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1651 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1652 >        if (createIncomplete) {
1653 >            checkIncomplete(h);
1654 >            r.assertNotInvoked();
1655 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1656          }
1577    }
1578
1579    public void testRunAfterBoth_normalCompletion4() {
1580        for (ExecutionMode m : ExecutionMode.values())
1581        for (Integer v1 : new Integer[] { 1, null })
1582        for (Integer v2 : new Integer[] { 2, null }) {
1583
1584        final CompletableFuture<Integer> f = new CompletableFuture<>();
1585        final CompletableFuture<Integer> g = new CompletableFuture<>();
1586        final Noop r = new Noop();
1587
1588        f.complete(v1);
1589        g.complete(v2);
1590        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1657  
1658          checkCompletedNormally(h, null);
1659 <        assertEquals(1, r.invocationCount);
1659 >        r.assertValue(subtract(v1, v2));
1660          checkCompletedNormally(f, v1);
1661          checkCompletedNormally(g, v2);
1662 <        }
1597 <    }
1662 >    }}
1663  
1664      /**
1665 <     * runAfterBoth result completes exceptionally after exceptional
1665 >     * thenAcceptBoth result completes exceptionally after exceptional
1666       * completion of either source
1667       */
1668 <    public void testRunAfterBoth_exceptionalCompletion1() {
1668 >    public void testThenAcceptBoth_exceptionalCompletion() {
1669          for (ExecutionMode m : ExecutionMode.values())
1670 <        for (Integer v1 : new Integer[] { 1, null }) {
1671 <
1670 >        for (boolean createIncomplete : new boolean[] { true, false })
1671 >        for (boolean fFirst : new boolean[] { true, false })
1672 >        for (Integer v1 : new Integer[] { 1, null })
1673 >    {
1674          final CompletableFuture<Integer> f = new CompletableFuture<>();
1675          final CompletableFuture<Integer> g = new CompletableFuture<>();
1609        final Noop r = new Noop();
1610        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1676          final CFException ex = new CFException();
1677 +        final SubtractAction r = new SubtractAction(m);
1678  
1679 <        f.completeExceptionally(ex);
1680 <        checkIncomplete(h);
1681 <        g.complete(v1);
1682 <
1683 <        checkCompletedWithWrappedCFException(h, ex);
1684 <        checkCompletedWithWrappedCFException(f, ex);
1685 <        assertEquals(0, r.invocationCount);
1620 <        checkCompletedNormally(g, v1);
1679 >        (fFirst ? f : g).complete(v1);
1680 >        if (!createIncomplete)
1681 >            (!fFirst ? f : g).completeExceptionally(ex);
1682 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1683 >        if (createIncomplete) {
1684 >            checkIncomplete(h);
1685 >            (!fFirst ? f : g).completeExceptionally(ex);
1686          }
1622    }
1623
1624    public void testRunAfterBoth_exceptionalCompletion2() {
1625        for (ExecutionMode m : ExecutionMode.values())
1626        for (Integer v1 : new Integer[] { 1, null }) {
1627
1628        final CompletableFuture<Integer> f = new CompletableFuture<>();
1629        final CompletableFuture<Integer> g = new CompletableFuture<>();
1630        final Noop r = new Noop();
1631        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1632        final CFException ex = new CFException();
1687  
1688 <        g.completeExceptionally(ex);
1689 <        checkIncomplete(h);
1690 <        f.complete(v1);
1691 <
1692 <        checkCompletedWithWrappedCFException(h, ex);
1639 <        checkCompletedWithWrappedCFException(g, ex);
1640 <        assertEquals(0, r.invocationCount);
1641 <        checkCompletedNormally(f, v1);
1642 <        }
1643 <    }
1688 >        checkCompletedWithWrappedException(h, ex);
1689 >        r.assertNotInvoked();
1690 >        checkCompletedNormally(fFirst ? f : g, v1);
1691 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1692 >    }}
1693  
1694 <    public void testRunAfterBoth_exceptionalCompletion3() {
1694 >    /**
1695 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1696 >     */
1697 >    public void testThenAcceptBoth_sourceCancelled() {
1698          for (ExecutionMode m : ExecutionMode.values())
1699 <        for (Integer v1 : new Integer[] { 1, null }) {
1700 <
1699 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1700 >        for (boolean createIncomplete : new boolean[] { true, false })
1701 >        for (boolean fFirst : new boolean[] { true, false })
1702 >        for (Integer v1 : new Integer[] { 1, null })
1703 >    {
1704          final CompletableFuture<Integer> f = new CompletableFuture<>();
1705          final CompletableFuture<Integer> g = new CompletableFuture<>();
1706 <        final Noop r = new Noop();
1652 <        final CFException ex = new CFException();
1653 <
1654 <        g.completeExceptionally(ex);
1655 <        f.complete(v1);
1656 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1706 >        final SubtractAction r = new SubtractAction(m);
1707  
1708 <        checkCompletedWithWrappedCFException(h, ex);
1709 <        checkCompletedWithWrappedCFException(g, ex);
1710 <        assertEquals(0, r.invocationCount);
1711 <        checkCompletedNormally(f, v1);
1708 >        (fFirst ? f : g).complete(v1);
1709 >        if (!createIncomplete)
1710 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1711 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1712 >        if (createIncomplete) {
1713 >            checkIncomplete(h);
1714 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1715          }
1663    }
1664
1665    public void testRunAfterBoth_exceptionalCompletion4() {
1666        for (ExecutionMode m : ExecutionMode.values())
1667        for (Integer v1 : new Integer[] { 1, null }) {
1668
1669        final CompletableFuture<Integer> f = new CompletableFuture<>();
1670        final CompletableFuture<Integer> g = new CompletableFuture<>();
1671        final Noop r = new Noop();
1672        final CFException ex = new CFException();
1673
1674        f.completeExceptionally(ex);
1675        g.complete(v1);
1676        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1716  
1717 <        checkCompletedWithWrappedCFException(h, ex);
1718 <        checkCompletedWithWrappedCFException(f, ex);
1719 <        assertEquals(0, r.invocationCount);
1720 <        checkCompletedNormally(g, v1);
1721 <        }
1683 <    }
1717 >        checkCompletedWithWrappedCancellationException(h);
1718 >        checkCancelled(!fFirst ? f : g);
1719 >        r.assertNotInvoked();
1720 >        checkCompletedNormally(fFirst ? f : g, v1);
1721 >    }}
1722  
1723      /**
1724 <     * runAfterBoth result completes exceptionally if action does
1724 >     * thenAcceptBoth result completes exceptionally if action does
1725       */
1726 <    public void testRunAfterBoth_actionFailed1() {
1726 >    public void testThenAcceptBoth_actionFailed() {
1727          for (ExecutionMode m : ExecutionMode.values())
1728 +        for (boolean fFirst : new boolean[] { true, false })
1729          for (Integer v1 : new Integer[] { 1, null })
1730 <        for (Integer v2 : new Integer[] { 2, null }) {
1731 <
1730 >        for (Integer v2 : new Integer[] { 2, null })
1731 >    {
1732          final CompletableFuture<Integer> f = new CompletableFuture<>();
1733          final CompletableFuture<Integer> g = new CompletableFuture<>();
1734 <        final FailingNoop r = new FailingNoop();
1735 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1734 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1735 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1736  
1737 <        f.complete(v1);
1738 <        checkIncomplete(h);
1739 <        g.complete(v2);
1737 >        if (fFirst) {
1738 >            f.complete(v1);
1739 >            g.complete(v2);
1740 >        } else {
1741 >            g.complete(v2);
1742 >            f.complete(v1);
1743 >        }
1744  
1745          checkCompletedWithWrappedCFException(h);
1746          checkCompletedNormally(f, v1);
1747          checkCompletedNormally(g, v2);
1748 <        }
1706 <    }
1748 >    }}
1749  
1750 <    public void testRunAfterBoth_actionFailed2() {
1750 >    /**
1751 >     * runAfterBoth result completes normally after normal
1752 >     * completion of sources
1753 >     */
1754 >    public void testRunAfterBoth_normalCompletion() {
1755          for (ExecutionMode m : ExecutionMode.values())
1756 +        for (boolean createIncomplete : new boolean[] { true, false })
1757 +        for (boolean fFirst : new boolean[] { true, false })
1758          for (Integer v1 : new Integer[] { 1, null })
1759 <        for (Integer v2 : new Integer[] { 2, null }) {
1760 <
1759 >        for (Integer v2 : new Integer[] { 2, null })
1760 >    {
1761          final CompletableFuture<Integer> f = new CompletableFuture<>();
1762          final CompletableFuture<Integer> g = new CompletableFuture<>();
1763 <        final FailingNoop r = new FailingNoop();
1716 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1763 >        final Noop r = new Noop(m);
1764  
1765 <        g.complete(v2);
1766 <        checkIncomplete(h);
1767 <        f.complete(v1);
1765 >        if (fFirst) f.complete(v1); else g.complete(v2);
1766 >        if (!createIncomplete)
1767 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1768 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1769 >        if (createIncomplete) {
1770 >            checkIncomplete(h);
1771 >            r.assertNotInvoked();
1772 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1773 >        }
1774  
1775 <        checkCompletedWithWrappedCFException(h);
1775 >        checkCompletedNormally(h, null);
1776 >        r.assertInvoked();
1777          checkCompletedNormally(f, v1);
1778          checkCompletedNormally(g, v2);
1779 <        }
1726 <    }
1779 >    }}
1780  
1781      /**
1782 <     * runAfterBoth result completes exceptionally if either source cancelled
1782 >     * runAfterBoth result completes exceptionally after exceptional
1783 >     * completion of either source
1784       */
1785 <    public void testRunAfterBoth_sourceCancelled1() {
1785 >    public void testRunAfterBoth_exceptionalCompletion() {
1786          for (ExecutionMode m : ExecutionMode.values())
1787 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1788 <        for (Integer v1 : new Integer[] { 1, null }) {
1789 <
1787 >        for (boolean createIncomplete : new boolean[] { true, false })
1788 >        for (boolean fFirst : new boolean[] { true, false })
1789 >        for (Integer v1 : new Integer[] { 1, null })
1790 >    {
1791          final CompletableFuture<Integer> f = new CompletableFuture<>();
1792          final CompletableFuture<Integer> g = new CompletableFuture<>();
1793 <        final Noop r = new Noop();
1794 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1740 <
1741 <        assertTrue(f.cancel(mayInterruptIfRunning));
1742 <        checkIncomplete(h);
1743 <        g.complete(v1);
1744 <
1745 <        checkCompletedWithWrappedCancellationException(h);
1746 <        checkCancelled(f);
1747 <        assertEquals(0, r.invocationCount);
1748 <        checkCompletedNormally(g, v1);
1749 <        }
1750 <    }
1751 <
1752 <    public void testRunAfterBoth_sourceCancelled2() {
1753 <        for (ExecutionMode m : ExecutionMode.values())
1754 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1755 <        for (Integer v1 : new Integer[] { 1, null }) {
1793 >        final CFException ex = new CFException();
1794 >        final Noop r = new Noop(m);
1795  
1796 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1797 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1798 <        final Noop r = new Noop();
1796 >        (fFirst ? f : g).complete(v1);
1797 >        if (!createIncomplete)
1798 >            (!fFirst ? f : g).completeExceptionally(ex);
1799          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1800 <
1801 <        assertTrue(g.cancel(mayInterruptIfRunning));
1802 <        checkIncomplete(h);
1764 <        f.complete(v1);
1765 <
1766 <        checkCompletedWithWrappedCancellationException(h);
1767 <        checkCancelled(g);
1768 <        assertEquals(0, r.invocationCount);
1769 <        checkCompletedNormally(f, v1);
1800 >        if (createIncomplete) {
1801 >            checkIncomplete(h);
1802 >            (!fFirst ? f : g).completeExceptionally(ex);
1803          }
1771    }
1772
1773    public void testRunAfterBoth_sourceCancelled3() {
1774        for (ExecutionMode m : ExecutionMode.values())
1775        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1776        for (Integer v1 : new Integer[] { 1, null }) {
1777
1778        final CompletableFuture<Integer> f = new CompletableFuture<>();
1779        final CompletableFuture<Integer> g = new CompletableFuture<>();
1780        final Noop r = new Noop();
1804  
1805 <        assertTrue(g.cancel(mayInterruptIfRunning));
1806 <        f.complete(v1);
1807 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1805 >        checkCompletedWithWrappedException(h, ex);
1806 >        r.assertNotInvoked();
1807 >        checkCompletedNormally(fFirst ? f : g, v1);
1808 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1809 >    }}
1810  
1811 <        checkCompletedWithWrappedCancellationException(h);
1812 <        checkCancelled(g);
1813 <        assertEquals(0, r.invocationCount);
1814 <        checkCompletedNormally(f, v1);
1790 <        }
1791 <    }
1792 <
1793 <    public void testRunAfterBoth_sourceCancelled4() {
1811 >    /**
1812 >     * runAfterBoth result completes exceptionally if either source cancelled
1813 >     */
1814 >    public void testRunAfterBoth_sourceCancelled() {
1815          for (ExecutionMode m : ExecutionMode.values())
1816          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1817 <        for (Integer v1 : new Integer[] { 1, null }) {
1818 <
1817 >        for (boolean createIncomplete : new boolean[] { true, false })
1818 >        for (boolean fFirst : new boolean[] { true, false })
1819 >        for (Integer v1 : new Integer[] { 1, null })
1820 >    {
1821          final CompletableFuture<Integer> f = new CompletableFuture<>();
1822          final CompletableFuture<Integer> g = new CompletableFuture<>();
1823 <        final Noop r = new Noop();
1823 >        final Noop r = new Noop(m);
1824  
1825 <        assertTrue(f.cancel(mayInterruptIfRunning));
1826 <        g.complete(v1);
1825 >        (fFirst ? f : g).complete(v1);
1826 >        if (!createIncomplete)
1827 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1828          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1829 +        if (createIncomplete) {
1830 +            checkIncomplete(h);
1831 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1832 +        }
1833  
1834          checkCompletedWithWrappedCancellationException(h);
1835 <        checkCancelled(f);
1836 <        assertEquals(0, r.invocationCount);
1837 <        checkCompletedNormally(g, v1);
1838 <        }
1811 <    }
1835 >        checkCancelled(!fFirst ? f : g);
1836 >        r.assertNotInvoked();
1837 >        checkCompletedNormally(fFirst ? f : g, v1);
1838 >    }}
1839  
1840      /**
1841 <     * applyToEither result completes normally after normal completion
1815 <     * of either source
1841 >     * runAfterBoth result completes exceptionally if action does
1842       */
1843 <    public void testApplyToEither_normalCompletion1() {
1843 >    public void testRunAfterBoth_actionFailed() {
1844          for (ExecutionMode m : ExecutionMode.values())
1845 +        for (boolean fFirst : new boolean[] { true, false })
1846          for (Integer v1 : new Integer[] { 1, null })
1847 <        for (Integer v2 : new Integer[] { 2, null }) {
1848 <
1847 >        for (Integer v2 : new Integer[] { 2, null })
1848 >    {
1849          final CompletableFuture<Integer> f = new CompletableFuture<>();
1850          final CompletableFuture<Integer> g = new CompletableFuture<>();
1851 <        final IncFunction r = new IncFunction();
1852 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1851 >        final FailingRunnable r1 = new FailingRunnable(m);
1852 >        final FailingRunnable r2 = new FailingRunnable(m);
1853  
1854 <        f.complete(v1);
1855 <        checkCompletedNormally(h, inc(v1));
1856 <        g.complete(v2);
1857 <
1858 <        checkCompletedNormally(f, v1);
1859 <        checkCompletedNormally(g, v2);
1860 <        checkCompletedNormally(h, inc(v1));
1854 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1855 >        if (fFirst) {
1856 >            f.complete(v1);
1857 >            g.complete(v2);
1858 >        } else {
1859 >            g.complete(v2);
1860 >            f.complete(v1);
1861          }
1862 <    }
1836 <
1837 <    public void testApplyToEither_normalCompletion2() {
1838 <        for (ExecutionMode m : ExecutionMode.values())
1839 <        for (Integer v1 : new Integer[] { 1, null })
1840 <        for (Integer v2 : new Integer[] { 2, null }) {
1841 <
1842 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1843 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1844 <        final IncFunction r = new IncFunction();
1845 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1846 <
1847 <        g.complete(v2);
1848 <        checkCompletedNormally(h, inc(v2));
1849 <        f.complete(v1);
1862 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1863  
1864 +        checkCompletedWithWrappedCFException(h1);
1865 +        checkCompletedWithWrappedCFException(h2);
1866          checkCompletedNormally(f, v1);
1867          checkCompletedNormally(g, v2);
1868 <        checkCompletedNormally(h, inc(v2));
1869 <        }
1870 <    }
1871 <    public void testApplyToEither_normalCompletion3() {
1868 >    }}
1869 >
1870 >    /**
1871 >     * applyToEither result completes normally after normal completion
1872 >     * of either source
1873 >     */
1874 >    public void testApplyToEither_normalCompletion() {
1875          for (ExecutionMode m : ExecutionMode.values())
1876          for (Integer v1 : new Integer[] { 1, null })
1877 <        for (Integer v2 : new Integer[] { 2, null }) {
1878 <
1877 >        for (Integer v2 : new Integer[] { 2, null })
1878 >    {
1879          final CompletableFuture<Integer> f = new CompletableFuture<>();
1880          final CompletableFuture<Integer> g = new CompletableFuture<>();
1881 <        final IncFunction r = new IncFunction();
1881 >        final IncFunction[] rs = new IncFunction[6];
1882 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1883  
1884 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1885 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1886 +        checkIncomplete(h0);
1887 +        checkIncomplete(h1);
1888 +        rs[0].assertNotInvoked();
1889 +        rs[1].assertNotInvoked();
1890          f.complete(v1);
1891 +        checkCompletedNormally(h0, inc(v1));
1892 +        checkCompletedNormally(h1, inc(v1));
1893 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1894 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1895 +        checkCompletedNormally(h2, inc(v1));
1896 +        checkCompletedNormally(h3, inc(v1));
1897          g.complete(v2);
1898 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1898 >
1899 >        // unspecified behavior - both source completions available
1900 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1901 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1902 >        rs[4].assertValue(h4.join());
1903 >        rs[5].assertValue(h5.join());
1904 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1905 >                   Objects.equals(inc(v2), h4.join()));
1906 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1907 >                   Objects.equals(inc(v2), h5.join()));
1908  
1909          checkCompletedNormally(f, v1);
1910          checkCompletedNormally(g, v2);
1911 <
1912 <        // unspecified behavior
1913 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1914 <                   Objects.equals(h.join(), inc(v2)));
1915 <        assertEquals(1, r.invocationCount);
1916 <        }
1877 <    }
1911 >        checkCompletedNormally(h0, inc(v1));
1912 >        checkCompletedNormally(h1, inc(v1));
1913 >        checkCompletedNormally(h2, inc(v1));
1914 >        checkCompletedNormally(h3, inc(v1));
1915 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1916 >    }}
1917  
1918      /**
1919       * applyToEither result completes exceptionally after exceptional
1920       * completion of either source
1921       */
1922 <    public void testApplyToEither_exceptionalCompletion1() {
1922 >    public void testApplyToEither_exceptionalCompletion() {
1923          for (ExecutionMode m : ExecutionMode.values())
1924 <        for (Integer v1 : new Integer[] { 1, null }) {
1925 <
1924 >        for (Integer v1 : new Integer[] { 1, null })
1925 >    {
1926          final CompletableFuture<Integer> f = new CompletableFuture<>();
1927          final CompletableFuture<Integer> g = new CompletableFuture<>();
1889        final IncFunction r = new IncFunction();
1890        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1928          final CFException ex = new CFException();
1929 +        final IncFunction[] rs = new IncFunction[6];
1930 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1931  
1932 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1933 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1934 +        checkIncomplete(h0);
1935 +        checkIncomplete(h1);
1936 +        rs[0].assertNotInvoked();
1937 +        rs[1].assertNotInvoked();
1938          f.completeExceptionally(ex);
1939 <        checkCompletedWithWrappedCFException(h, ex);
1939 >        checkCompletedWithWrappedException(h0, ex);
1940 >        checkCompletedWithWrappedException(h1, ex);
1941 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1942 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1943 >        checkCompletedWithWrappedException(h2, ex);
1944 >        checkCompletedWithWrappedException(h3, ex);
1945          g.complete(v1);
1946  
1947 <        assertEquals(0, r.invocationCount);
1948 <        checkCompletedNormally(g, v1);
1949 <        checkCompletedWithWrappedCFException(f, ex);
1950 <        checkCompletedWithWrappedCFException(h, ex);
1947 >        // unspecified behavior - both source completions available
1948 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1949 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1950 >        try {
1951 >            assertEquals(inc(v1), h4.join());
1952 >            rs[4].assertValue(inc(v1));
1953 >        } catch (CompletionException ok) {
1954 >            checkCompletedWithWrappedException(h4, ex);
1955 >            rs[4].assertNotInvoked();
1956 >        }
1957 >        try {
1958 >            assertEquals(inc(v1), h5.join());
1959 >            rs[5].assertValue(inc(v1));
1960 >        } catch (CompletionException ok) {
1961 >            checkCompletedWithWrappedException(h5, ex);
1962 >            rs[5].assertNotInvoked();
1963          }
1964 <    }
1964 >
1965 >        checkCompletedExceptionally(f, ex);
1966 >        checkCompletedNormally(g, v1);
1967 >        checkCompletedWithWrappedException(h0, ex);
1968 >        checkCompletedWithWrappedException(h1, ex);
1969 >        checkCompletedWithWrappedException(h2, ex);
1970 >        checkCompletedWithWrappedException(h3, ex);
1971 >        checkCompletedWithWrappedException(h4, ex);
1972 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1973 >    }}
1974  
1975      public void testApplyToEither_exceptionalCompletion2() {
1976          for (ExecutionMode m : ExecutionMode.values())
1977 <        for (Integer v1 : new Integer[] { 1, null }) {
1978 <
1977 >        for (boolean fFirst : new boolean[] { true, false })
1978 >        for (Integer v1 : new Integer[] { 1, null })
1979 >    {
1980          final CompletableFuture<Integer> f = new CompletableFuture<>();
1981          final CompletableFuture<Integer> g = new CompletableFuture<>();
1910        final IncFunction r = new IncFunction();
1911        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1982          final CFException ex = new CFException();
1983 +        final IncFunction[] rs = new IncFunction[6];
1984 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1985  
1986 <        g.completeExceptionally(ex);
1987 <        checkCompletedWithWrappedCFException(h, ex);
1988 <        f.complete(v1);
1989 <
1990 <        assertEquals(0, r.invocationCount);
1991 <        checkCompletedNormally(f, v1);
1992 <        checkCompletedWithWrappedCFException(g, ex);
1993 <        checkCompletedWithWrappedCFException(h, ex);
1986 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1987 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1988 >        if (fFirst) {
1989 >            f.complete(v1);
1990 >            g.completeExceptionally(ex);
1991 >        } else {
1992 >            g.completeExceptionally(ex);
1993 >            f.complete(v1);
1994          }
1995 <    }
1996 <
1925 <    public void testApplyToEither_exceptionalCompletion3() {
1926 <        for (ExecutionMode m : ExecutionMode.values())
1927 <        for (Integer v1 : new Integer[] { 1, null }) {
1928 <
1929 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1930 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 <        final IncFunction r = new IncFunction();
1932 <        final CFException ex = new CFException();
1933 <
1934 <        g.completeExceptionally(ex);
1935 <        f.complete(v1);
1936 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1995 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1996 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1997  
1998 <        // unspecified behavior
1939 <        Integer v;
1998 >        // unspecified behavior - both source completions available
1999          try {
2000 <            assertEquals(h.join(), inc(v1));
2001 <            assertEquals(1, r.invocationCount);
2000 >            assertEquals(inc(v1), h0.join());
2001 >            rs[0].assertValue(inc(v1));
2002          } catch (CompletionException ok) {
2003 <            checkCompletedWithWrappedCFException(h, ex);
2004 <            assertEquals(0, r.invocationCount);
2003 >            checkCompletedWithWrappedException(h0, ex);
2004 >            rs[0].assertNotInvoked();
2005          }
1947
1948        checkCompletedWithWrappedCFException(g, ex);
1949        checkCompletedNormally(f, v1);
1950        }
1951    }
1952
1953    public void testApplyToEither_exceptionalCompletion4() {
1954        for (ExecutionMode m : ExecutionMode.values())
1955        for (Integer v1 : new Integer[] { 1, null }) {
1956
1957        final CompletableFuture<Integer> f = new CompletableFuture<>();
1958        final CompletableFuture<Integer> g = new CompletableFuture<>();
1959        final IncFunction r = new IncFunction();
1960        final CFException ex = new CFException();
1961
1962        f.completeExceptionally(ex);
1963        g.complete(v1);
1964        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1965
1966        // unspecified behavior
1967        Integer v;
2006          try {
2007 <            assertEquals(h.join(), inc(v1));
2008 <            assertEquals(1, r.invocationCount);
2007 >            assertEquals(inc(v1), h1.join());
2008 >            rs[1].assertValue(inc(v1));
2009          } catch (CompletionException ok) {
2010 <            checkCompletedWithWrappedCFException(h, ex);
2011 <            assertEquals(0, r.invocationCount);
2010 >            checkCompletedWithWrappedException(h1, ex);
2011 >            rs[1].assertNotInvoked();
2012          }
2013 <
2014 <        checkCompletedWithWrappedCFException(f, ex);
2015 <        checkCompletedNormally(g, v1);
2013 >        try {
2014 >            assertEquals(inc(v1), h2.join());
2015 >            rs[2].assertValue(inc(v1));
2016 >        } catch (CompletionException ok) {
2017 >            checkCompletedWithWrappedException(h2, ex);
2018 >            rs[2].assertNotInvoked();
2019          }
2020 <    }
2021 <
2022 <    /**
2023 <     * applyToEither result completes exceptionally if action does
2024 <     */
2025 <    public void testApplyToEither_actionFailed1() {
1985 <        for (ExecutionMode m : ExecutionMode.values())
1986 <        for (Integer v1 : new Integer[] { 1, null })
1987 <        for (Integer v2 : new Integer[] { 2, null }) {
1988 <
1989 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1990 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1991 <        final FailingFunction r = new FailingFunction();
1992 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1993 <
1994 <        f.complete(v1);
1995 <        checkCompletedWithWrappedCFException(h);
1996 <        g.complete(v2);
1997 <        checkCompletedNormally(f, v1);
1998 <        checkCompletedNormally(g, v2);
2020 >        try {
2021 >            assertEquals(inc(v1), h3.join());
2022 >            rs[3].assertValue(inc(v1));
2023 >        } catch (CompletionException ok) {
2024 >            checkCompletedWithWrappedException(h3, ex);
2025 >            rs[3].assertNotInvoked();
2026          }
2000    }
2001
2002    public void testApplyToEither_actionFailed2() {
2003        for (ExecutionMode m : ExecutionMode.values())
2004        for (Integer v1 : new Integer[] { 1, null })
2005        for (Integer v2 : new Integer[] { 2, null }) {
2027  
2007        final CompletableFuture<Integer> f = new CompletableFuture<>();
2008        final CompletableFuture<Integer> g = new CompletableFuture<>();
2009        final FailingFunction r = new FailingFunction();
2010        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2011
2012        g.complete(v2);
2013        checkCompletedWithWrappedCFException(h);
2014        f.complete(v1);
2028          checkCompletedNormally(f, v1);
2029 <        checkCompletedNormally(g, v2);
2030 <        }
2018 <    }
2029 >        checkCompletedExceptionally(g, ex);
2030 >    }}
2031  
2032      /**
2033       * applyToEither result completes exceptionally if either source cancelled
2034       */
2035 <    public void testApplyToEither_sourceCancelled1() {
2035 >    public void testApplyToEither_sourceCancelled() {
2036          for (ExecutionMode m : ExecutionMode.values())
2037          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2038 <        for (Integer v1 : new Integer[] { 1, null }) {
2039 <
2038 >        for (Integer v1 : new Integer[] { 1, null })
2039 >    {
2040          final CompletableFuture<Integer> f = new CompletableFuture<>();
2041          final CompletableFuture<Integer> g = new CompletableFuture<>();
2042 <        final IncFunction r = new IncFunction();
2043 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2042 >        final IncFunction[] rs = new IncFunction[6];
2043 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2044  
2045 <        assertTrue(f.cancel(mayInterruptIfRunning));
2046 <        checkCompletedWithWrappedCancellationException(h);
2045 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2046 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2047 >        checkIncomplete(h0);
2048 >        checkIncomplete(h1);
2049 >        rs[0].assertNotInvoked();
2050 >        rs[1].assertNotInvoked();
2051 >        f.cancel(mayInterruptIfRunning);
2052 >        checkCompletedWithWrappedCancellationException(h0);
2053 >        checkCompletedWithWrappedCancellationException(h1);
2054 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2055 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2056 >        checkCompletedWithWrappedCancellationException(h2);
2057 >        checkCompletedWithWrappedCancellationException(h3);
2058          g.complete(v1);
2059  
2060 +        // unspecified behavior - both source completions available
2061 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2062 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2063 +        try {
2064 +            assertEquals(inc(v1), h4.join());
2065 +            rs[4].assertValue(inc(v1));
2066 +        } catch (CompletionException ok) {
2067 +            checkCompletedWithWrappedCancellationException(h4);
2068 +            rs[4].assertNotInvoked();
2069 +        }
2070 +        try {
2071 +            assertEquals(inc(v1), h5.join());
2072 +            rs[5].assertValue(inc(v1));
2073 +        } catch (CompletionException ok) {
2074 +            checkCompletedWithWrappedCancellationException(h5);
2075 +            rs[5].assertNotInvoked();
2076 +        }
2077 +
2078          checkCancelled(f);
2038        assertEquals(0, r.invocationCount);
2079          checkCompletedNormally(g, v1);
2080 <        checkCompletedWithWrappedCancellationException(h);
2081 <        }
2082 <    }
2080 >        checkCompletedWithWrappedCancellationException(h0);
2081 >        checkCompletedWithWrappedCancellationException(h1);
2082 >        checkCompletedWithWrappedCancellationException(h2);
2083 >        checkCompletedWithWrappedCancellationException(h3);
2084 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2085 >    }}
2086  
2087      public void testApplyToEither_sourceCancelled2() {
2088          for (ExecutionMode m : ExecutionMode.values())
2089          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2090 <        for (Integer v1 : new Integer[] { 1, null }) {
2091 <
2090 >        for (boolean fFirst : new boolean[] { true, false })
2091 >        for (Integer v1 : new Integer[] { 1, null })
2092 >    {
2093          final CompletableFuture<Integer> f = new CompletableFuture<>();
2094          final CompletableFuture<Integer> g = new CompletableFuture<>();
2095 <        final IncFunction r = new IncFunction();
2096 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2053 <
2054 <        assertTrue(g.cancel(mayInterruptIfRunning));
2055 <        checkCompletedWithWrappedCancellationException(h);
2056 <        f.complete(v1);
2095 >        final IncFunction[] rs = new IncFunction[6];
2096 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2097  
2098 <        checkCancelled(g);
2099 <        assertEquals(0, r.invocationCount);
2100 <        checkCompletedNormally(f, v1);
2101 <        checkCompletedWithWrappedCancellationException(h);
2098 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2099 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2100 >        if (fFirst) {
2101 >            f.complete(v1);
2102 >            g.cancel(mayInterruptIfRunning);
2103 >        } else {
2104 >            g.cancel(mayInterruptIfRunning);
2105 >            f.complete(v1);
2106          }
2107 <    }
2108 <
2065 <    public void testApplyToEither_sourceCancelled3() {
2066 <        for (ExecutionMode m : ExecutionMode.values())
2067 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2068 <        for (Integer v1 : new Integer[] { 1, null }) {
2069 <
2070 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2071 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2072 <        final IncFunction r = new IncFunction();
2073 <
2074 <        assertTrue(g.cancel(mayInterruptIfRunning));
2075 <        f.complete(v1);
2076 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2107 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2108 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2109  
2110 <        // unspecified behavior
2079 <        Integer v;
2110 >        // unspecified behavior - both source completions available
2111          try {
2112 <            assertEquals(h.join(), inc(v1));
2113 <            assertEquals(1, r.invocationCount);
2112 >            assertEquals(inc(v1), h0.join());
2113 >            rs[0].assertValue(inc(v1));
2114          } catch (CompletionException ok) {
2115 <            checkCompletedWithWrappedCancellationException(h);
2116 <            assertEquals(0, r.invocationCount);
2115 >            checkCompletedWithWrappedCancellationException(h0);
2116 >            rs[0].assertNotInvoked();
2117          }
2118 <
2119 <        checkCancelled(g);
2120 <        checkCompletedNormally(f, v1);
2118 >        try {
2119 >            assertEquals(inc(v1), h1.join());
2120 >            rs[1].assertValue(inc(v1));
2121 >        } catch (CompletionException ok) {
2122 >            checkCompletedWithWrappedCancellationException(h1);
2123 >            rs[1].assertNotInvoked();
2124          }
2091    }
2092
2093    public void testApplyToEither_sourceCancelled4() {
2094        for (ExecutionMode m : ExecutionMode.values())
2095        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2096        for (Integer v1 : new Integer[] { 1, null }) {
2097
2098        final CompletableFuture<Integer> f = new CompletableFuture<>();
2099        final CompletableFuture<Integer> g = new CompletableFuture<>();
2100        final IncFunction r = new IncFunction();
2101
2102        assertTrue(f.cancel(mayInterruptIfRunning));
2103        g.complete(v1);
2104        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2105
2106        // unspecified behavior
2107        Integer v;
2125          try {
2126 <            assertEquals(h.join(), inc(v1));
2127 <            assertEquals(1, r.invocationCount);
2126 >            assertEquals(inc(v1), h2.join());
2127 >            rs[2].assertValue(inc(v1));
2128          } catch (CompletionException ok) {
2129 <            checkCompletedWithWrappedCancellationException(h);
2130 <            assertEquals(0, r.invocationCount);
2129 >            checkCompletedWithWrappedCancellationException(h2);
2130 >            rs[2].assertNotInvoked();
2131          }
2132 <
2133 <        checkCancelled(f);
2134 <        checkCompletedNormally(g, v1);
2132 >        try {
2133 >            assertEquals(inc(v1), h3.join());
2134 >            rs[3].assertValue(inc(v1));
2135 >        } catch (CompletionException ok) {
2136 >            checkCompletedWithWrappedCancellationException(h3);
2137 >            rs[3].assertNotInvoked();
2138          }
2139 <    }
2139 >
2140 >        checkCompletedNormally(f, v1);
2141 >        checkCancelled(g);
2142 >    }}
2143  
2144      /**
2145 <     * acceptEither result completes normally after normal completion
2123 <     * of either source
2145 >     * applyToEither result completes exceptionally if action does
2146       */
2147 <    public void testAcceptEither_normalCompletion1() {
2147 >    public void testApplyToEither_actionFailed() {
2148          for (ExecutionMode m : ExecutionMode.values())
2149          for (Integer v1 : new Integer[] { 1, null })
2150 <        for (Integer v2 : new Integer[] { 2, null }) {
2151 <
2150 >        for (Integer v2 : new Integer[] { 2, null })
2151 >    {
2152          final CompletableFuture<Integer> f = new CompletableFuture<>();
2153          final CompletableFuture<Integer> g = new CompletableFuture<>();
2154 <        final IncAction r = new IncAction();
2155 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2154 >        final FailingFunction[] rs = new FailingFunction[6];
2155 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2156  
2157 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2158 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2159          f.complete(v1);
2160 <        checkCompletedNormally(h, null);
2161 <        assertEquals(r.value, inc(v1));
2162 <        g.complete(v2);
2160 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2161 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2162 >        checkCompletedWithWrappedCFException(h0);
2163 >        checkCompletedWithWrappedCFException(h1);
2164 >        checkCompletedWithWrappedCFException(h2);
2165 >        checkCompletedWithWrappedCFException(h3);
2166 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2167  
2168 <        checkCompletedNormally(f, v1);
2141 <        checkCompletedNormally(g, v2);
2142 <        checkCompletedNormally(h, null);
2143 <        }
2144 <    }
2145 <
2146 <    public void testAcceptEither_normalCompletion2() {
2147 <        for (ExecutionMode m : ExecutionMode.values())
2148 <        for (Integer v1 : new Integer[] { 1, null })
2149 <        for (Integer v2 : new Integer[] { 2, null }) {
2168 >        g.complete(v2);
2169  
2170 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2171 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2172 <        final IncAction r = new IncAction();
2154 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2170 >        // unspecified behavior - both source completions available
2171 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2172 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2173  
2174 <        g.complete(v2);
2175 <        checkCompletedNormally(h, null);
2176 <        assertEquals(r.value, inc(v2));
2177 <        f.complete(v1);
2174 >        checkCompletedWithWrappedCFException(h4);
2175 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2176 >                   Objects.equals(v2, rs[4].value));
2177 >        checkCompletedWithWrappedCFException(h5);
2178 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2179 >                   Objects.equals(v2, rs[5].value));
2180  
2181          checkCompletedNormally(f, v1);
2182          checkCompletedNormally(g, v2);
2183 <        checkCompletedNormally(h, null);
2184 <        }
2185 <    }
2186 <    public void testAcceptEither_normalCompletion3() {
2183 >    }}
2184 >
2185 >    /**
2186 >     * acceptEither result completes normally after normal completion
2187 >     * of either source
2188 >     */
2189 >    public void testAcceptEither_normalCompletion() {
2190          for (ExecutionMode m : ExecutionMode.values())
2191          for (Integer v1 : new Integer[] { 1, null })
2192 <        for (Integer v2 : new Integer[] { 2, null }) {
2193 <
2192 >        for (Integer v2 : new Integer[] { 2, null })
2193 >    {
2194          final CompletableFuture<Integer> f = new CompletableFuture<>();
2195          final CompletableFuture<Integer> g = new CompletableFuture<>();
2196 <        final IncAction r = new IncAction();
2197 <
2198 <        f.complete(v1);
2199 <        g.complete(v2);
2200 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2196 >        final NoopConsumer[] rs = new NoopConsumer[6];
2197 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2198 >
2199 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2200 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2201 >        checkIncomplete(h0);
2202 >        checkIncomplete(h1);
2203 >        rs[0].assertNotInvoked();
2204 >        rs[1].assertNotInvoked();
2205 >        f.complete(v1);
2206 >        checkCompletedNormally(h0, null);
2207 >        checkCompletedNormally(h1, null);
2208 >        rs[0].assertValue(v1);
2209 >        rs[1].assertValue(v1);
2210 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2211 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2212 >        checkCompletedNormally(h2, null);
2213 >        checkCompletedNormally(h3, null);
2214 >        rs[2].assertValue(v1);
2215 >        rs[3].assertValue(v1);
2216 >        g.complete(v2);
2217 >
2218 >        // unspecified behavior - both source completions available
2219 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2220 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2221 >        checkCompletedNormally(h4, null);
2222 >        checkCompletedNormally(h5, null);
2223 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2224 >                   Objects.equals(v2, rs[4].value));
2225 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2226 >                   Objects.equals(v2, rs[5].value));
2227  
2179        checkCompletedNormally(h, null);
2228          checkCompletedNormally(f, v1);
2229          checkCompletedNormally(g, v2);
2230 <
2231 <        // unspecified behavior
2232 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2233 <                   Objects.equals(r.value, inc(v2)));
2234 <        }
2235 <    }
2230 >        checkCompletedNormally(h0, null);
2231 >        checkCompletedNormally(h1, null);
2232 >        checkCompletedNormally(h2, null);
2233 >        checkCompletedNormally(h3, null);
2234 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2235 >    }}
2236  
2237      /**
2238       * acceptEither result completes exceptionally after exceptional
2239       * completion of either source
2240       */
2241 <    public void testAcceptEither_exceptionalCompletion1() {
2241 >    public void testAcceptEither_exceptionalCompletion() {
2242          for (ExecutionMode m : ExecutionMode.values())
2243 <        for (Integer v1 : new Integer[] { 1, null }) {
2244 <
2243 >        for (Integer v1 : new Integer[] { 1, null })
2244 >    {
2245          final CompletableFuture<Integer> f = new CompletableFuture<>();
2246          final CompletableFuture<Integer> g = new CompletableFuture<>();
2199        final IncAction r = new IncAction();
2200        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2247          final CFException ex = new CFException();
2248 +        final NoopConsumer[] rs = new NoopConsumer[6];
2249 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2250  
2251 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2252 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2253 +        checkIncomplete(h0);
2254 +        checkIncomplete(h1);
2255 +        rs[0].assertNotInvoked();
2256 +        rs[1].assertNotInvoked();
2257          f.completeExceptionally(ex);
2258 <        checkCompletedWithWrappedCFException(h, ex);
2258 >        checkCompletedWithWrappedException(h0, ex);
2259 >        checkCompletedWithWrappedException(h1, ex);
2260 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2261 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2262 >        checkCompletedWithWrappedException(h2, ex);
2263 >        checkCompletedWithWrappedException(h3, ex);
2264 >
2265          g.complete(v1);
2266  
2267 <        assertEquals(0, r.invocationCount);
2268 <        checkCompletedNormally(g, v1);
2269 <        checkCompletedWithWrappedCFException(f, ex);
2270 <        checkCompletedWithWrappedCFException(h, ex);
2267 >        // unspecified behavior - both source completions available
2268 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2269 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2270 >        try {
2271 >            assertNull(h4.join());
2272 >            rs[4].assertValue(v1);
2273 >        } catch (CompletionException ok) {
2274 >            checkCompletedWithWrappedException(h4, ex);
2275 >            rs[4].assertNotInvoked();
2276          }
2277 <    }
2277 >        try {
2278 >            assertNull(h5.join());
2279 >            rs[5].assertValue(v1);
2280 >        } catch (CompletionException ok) {
2281 >            checkCompletedWithWrappedException(h5, ex);
2282 >            rs[5].assertNotInvoked();
2283 >        }
2284 >
2285 >        checkCompletedExceptionally(f, ex);
2286 >        checkCompletedNormally(g, v1);
2287 >        checkCompletedWithWrappedException(h0, ex);
2288 >        checkCompletedWithWrappedException(h1, ex);
2289 >        checkCompletedWithWrappedException(h2, ex);
2290 >        checkCompletedWithWrappedException(h3, ex);
2291 >        checkCompletedWithWrappedException(h4, ex);
2292 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2293 >    }}
2294  
2295      public void testAcceptEither_exceptionalCompletion2() {
2296          for (ExecutionMode m : ExecutionMode.values())
2297 <        for (Integer v1 : new Integer[] { 1, null }) {
2298 <
2297 >        for (boolean fFirst : new boolean[] { true, false })
2298 >        for (Integer v1 : new Integer[] { 1, null })
2299 >    {
2300          final CompletableFuture<Integer> f = new CompletableFuture<>();
2301          final CompletableFuture<Integer> g = new CompletableFuture<>();
2220        final IncAction r = new IncAction();
2221        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2302          final CFException ex = new CFException();
2303 +        final NoopConsumer[] rs = new NoopConsumer[6];
2304 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2305  
2306 <        g.completeExceptionally(ex);
2307 <        checkCompletedWithWrappedCFException(h, ex);
2308 <        f.complete(v1);
2309 <
2310 <        assertEquals(0, r.invocationCount);
2311 <        checkCompletedNormally(f, v1);
2312 <        checkCompletedWithWrappedCFException(g, ex);
2313 <        checkCompletedWithWrappedCFException(h, ex);
2306 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2307 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2308 >        if (fFirst) {
2309 >            f.complete(v1);
2310 >            g.completeExceptionally(ex);
2311 >        } else {
2312 >            g.completeExceptionally(ex);
2313 >            f.complete(v1);
2314          }
2315 <    }
2316 <
2235 <    public void testAcceptEither_exceptionalCompletion3() {
2236 <        for (ExecutionMode m : ExecutionMode.values())
2237 <        for (Integer v1 : new Integer[] { 1, null }) {
2238 <
2239 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2240 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2241 <        final IncAction r = new IncAction();
2242 <        final CFException ex = new CFException();
2315 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2316 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2317  
2318 <        g.completeExceptionally(ex);
2245 <        f.complete(v1);
2246 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2247 <
2248 <        // unspecified behavior
2249 <        Integer v;
2318 >        // unspecified behavior - both source completions available
2319          try {
2320 <            assertEquals(h.join(), null);
2321 <            assertEquals(1, r.invocationCount);
2253 <            assertEquals(inc(v1), r.value);
2320 >            assertEquals(null, h0.join());
2321 >            rs[0].assertValue(v1);
2322          } catch (CompletionException ok) {
2323 <            checkCompletedWithWrappedCFException(h, ex);
2324 <            assertEquals(0, r.invocationCount);
2257 <        }
2258 <
2259 <        checkCompletedWithWrappedCFException(g, ex);
2260 <        checkCompletedNormally(f, v1);
2323 >            checkCompletedWithWrappedException(h0, ex);
2324 >            rs[0].assertNotInvoked();
2325          }
2262    }
2263
2264    public void testAcceptEither_exceptionalCompletion4() {
2265        for (ExecutionMode m : ExecutionMode.values())
2266        for (Integer v1 : new Integer[] { 1, null }) {
2267
2268        final CompletableFuture<Integer> f = new CompletableFuture<>();
2269        final CompletableFuture<Integer> g = new CompletableFuture<>();
2270        final IncAction r = new IncAction();
2271        final CFException ex = new CFException();
2272
2273        f.completeExceptionally(ex);
2274        g.complete(v1);
2275        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2276
2277        // unspecified behavior
2278        Integer v;
2326          try {
2327 <            assertEquals(h.join(), null);
2328 <            assertEquals(1, r.invocationCount);
2282 <            assertEquals(inc(v1), r.value);
2327 >            assertEquals(null, h1.join());
2328 >            rs[1].assertValue(v1);
2329          } catch (CompletionException ok) {
2330 <            checkCompletedWithWrappedCFException(h, ex);
2331 <            assertEquals(0, r.invocationCount);
2330 >            checkCompletedWithWrappedException(h1, ex);
2331 >            rs[1].assertNotInvoked();
2332          }
2333 <
2334 <        checkCompletedWithWrappedCFException(f, ex);
2335 <        checkCompletedNormally(g, v1);
2333 >        try {
2334 >            assertEquals(null, h2.join());
2335 >            rs[2].assertValue(v1);
2336 >        } catch (CompletionException ok) {
2337 >            checkCompletedWithWrappedException(h2, ex);
2338 >            rs[2].assertNotInvoked();
2339          }
2340 <    }
2341 <
2342 <    /**
2343 <     * acceptEither result completes exceptionally if action does
2344 <     */
2345 <    public void testAcceptEither_actionFailed1() {
2297 <        for (ExecutionMode m : ExecutionMode.values())
2298 <        for (Integer v1 : new Integer[] { 1, null })
2299 <        for (Integer v2 : new Integer[] { 2, null }) {
2300 <
2301 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2302 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2303 <        final FailingConsumer r = new FailingConsumer();
2304 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2305 <
2306 <        f.complete(v1);
2307 <        checkCompletedWithWrappedCFException(h);
2308 <        g.complete(v2);
2309 <        checkCompletedNormally(f, v1);
2310 <        checkCompletedNormally(g, v2);
2340 >        try {
2341 >            assertEquals(null, h3.join());
2342 >            rs[3].assertValue(v1);
2343 >        } catch (CompletionException ok) {
2344 >            checkCompletedWithWrappedException(h3, ex);
2345 >            rs[3].assertNotInvoked();
2346          }
2312    }
2313
2314    public void testAcceptEither_actionFailed2() {
2315        for (ExecutionMode m : ExecutionMode.values())
2316        for (Integer v1 : new Integer[] { 1, null })
2317        for (Integer v2 : new Integer[] { 2, null }) {
2318
2319        final CompletableFuture<Integer> f = new CompletableFuture<>();
2320        final CompletableFuture<Integer> g = new CompletableFuture<>();
2321        final FailingConsumer r = new FailingConsumer();
2322        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2347  
2324        g.complete(v2);
2325        checkCompletedWithWrappedCFException(h);
2326        f.complete(v1);
2348          checkCompletedNormally(f, v1);
2349 <        checkCompletedNormally(g, v2);
2350 <        }
2330 <    }
2349 >        checkCompletedExceptionally(g, ex);
2350 >    }}
2351  
2352      /**
2353       * acceptEither result completes exceptionally if either source cancelled
2354       */
2355 <    public void testAcceptEither_sourceCancelled1() {
2355 >    public void testAcceptEither_sourceCancelled() {
2356          for (ExecutionMode m : ExecutionMode.values())
2357          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2358 <        for (Integer v1 : new Integer[] { 1, null }) {
2359 <
2340 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2341 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2342 <        final IncAction r = new IncAction();
2343 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2344 <
2345 <        assertTrue(f.cancel(mayInterruptIfRunning));
2346 <        checkCompletedWithWrappedCancellationException(h);
2347 <        g.complete(v1);
2348 <
2349 <        checkCancelled(f);
2350 <        assertEquals(0, r.invocationCount);
2351 <        checkCompletedNormally(g, v1);
2352 <        checkCompletedWithWrappedCancellationException(h);
2353 <        }
2354 <    }
2355 <
2356 <    public void testAcceptEither_sourceCancelled2() {
2357 <        for (ExecutionMode m : ExecutionMode.values())
2358 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2359 <        for (Integer v1 : new Integer[] { 1, null }) {
2360 <
2358 >        for (Integer v1 : new Integer[] { 1, null })
2359 >    {
2360          final CompletableFuture<Integer> f = new CompletableFuture<>();
2361          final CompletableFuture<Integer> g = new CompletableFuture<>();
2362 <        final IncAction r = new IncAction();
2363 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2365 <
2366 <        assertTrue(g.cancel(mayInterruptIfRunning));
2367 <        checkCompletedWithWrappedCancellationException(h);
2368 <        f.complete(v1);
2369 <
2370 <        checkCancelled(g);
2371 <        assertEquals(0, r.invocationCount);
2372 <        checkCompletedNormally(f, v1);
2373 <        checkCompletedWithWrappedCancellationException(h);
2374 <        }
2375 <    }
2376 <
2377 <    public void testAcceptEither_sourceCancelled3() {
2378 <        for (ExecutionMode m : ExecutionMode.values())
2379 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2380 <        for (Integer v1 : new Integer[] { 1, null }) {
2362 >        final NoopConsumer[] rs = new NoopConsumer[6];
2363 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2364  
2365 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2366 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2367 <        final IncAction r = new IncAction();
2365 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2366 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2367 >        checkIncomplete(h0);
2368 >        checkIncomplete(h1);
2369 >        rs[0].assertNotInvoked();
2370 >        rs[1].assertNotInvoked();
2371 >        f.cancel(mayInterruptIfRunning);
2372 >        checkCompletedWithWrappedCancellationException(h0);
2373 >        checkCompletedWithWrappedCancellationException(h1);
2374 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2375 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2376 >        checkCompletedWithWrappedCancellationException(h2);
2377 >        checkCompletedWithWrappedCancellationException(h3);
2378  
2379 <        assertTrue(g.cancel(mayInterruptIfRunning));
2387 <        f.complete(v1);
2388 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2379 >        g.complete(v1);
2380  
2381 <        // unspecified behavior
2382 <        Integer v;
2381 >        // unspecified behavior - both source completions available
2382 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2383 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2384          try {
2385 <            assertEquals(h.join(), null);
2386 <            assertEquals(1, r.invocationCount);
2395 <            assertEquals(inc(v1), r.value);
2385 >            assertNull(h4.join());
2386 >            rs[4].assertValue(v1);
2387          } catch (CompletionException ok) {
2388 <            checkCompletedWithWrappedCancellationException(h);
2389 <            assertEquals(0, r.invocationCount);
2399 <        }
2400 <
2401 <        checkCancelled(g);
2402 <        checkCompletedNormally(f, v1);
2388 >            checkCompletedWithWrappedCancellationException(h4);
2389 >            rs[4].assertNotInvoked();
2390          }
2404    }
2405
2406    public void testAcceptEither_sourceCancelled4() {
2407        for (ExecutionMode m : ExecutionMode.values())
2408        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2409        for (Integer v1 : new Integer[] { 1, null }) {
2410
2411        final CompletableFuture<Integer> f = new CompletableFuture<>();
2412        final CompletableFuture<Integer> g = new CompletableFuture<>();
2413        final IncAction r = new IncAction();
2414
2415        assertTrue(f.cancel(mayInterruptIfRunning));
2416        g.complete(v1);
2417        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2418
2419        // unspecified behavior
2420        Integer v;
2391          try {
2392 <            assertEquals(h.join(), null);
2393 <            assertEquals(1, r.invocationCount);
2424 <            assertEquals(inc(v1), r.value);
2392 >            assertNull(h5.join());
2393 >            rs[5].assertValue(v1);
2394          } catch (CompletionException ok) {
2395 <            checkCompletedWithWrappedCancellationException(h);
2396 <            assertEquals(0, r.invocationCount);
2395 >            checkCompletedWithWrappedCancellationException(h5);
2396 >            rs[5].assertNotInvoked();
2397          }
2398  
2399          checkCancelled(f);
2400          checkCompletedNormally(g, v1);
2401 <        }
2402 <    }
2401 >        checkCompletedWithWrappedCancellationException(h0);
2402 >        checkCompletedWithWrappedCancellationException(h1);
2403 >        checkCompletedWithWrappedCancellationException(h2);
2404 >        checkCompletedWithWrappedCancellationException(h3);
2405 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2406 >    }}
2407  
2408      /**
2409 <     * runAfterEither result completes normally after normal completion
2437 <     * of either source
2409 >     * acceptEither result completes exceptionally if action does
2410       */
2411 <    public void testRunAfterEither_normalCompletion1() {
2411 >    public void testAcceptEither_actionFailed() {
2412          for (ExecutionMode m : ExecutionMode.values())
2413          for (Integer v1 : new Integer[] { 1, null })
2414 <        for (Integer v2 : new Integer[] { 2, null }) {
2415 <
2414 >        for (Integer v2 : new Integer[] { 2, null })
2415 >    {
2416          final CompletableFuture<Integer> f = new CompletableFuture<>();
2417          final CompletableFuture<Integer> g = new CompletableFuture<>();
2418 <        final Noop r = new Noop();
2419 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2418 >        final FailingConsumer[] rs = new FailingConsumer[6];
2419 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2420  
2421 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2422 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2423          f.complete(v1);
2424 <        checkCompletedNormally(h, null);
2425 <        assertEquals(1, r.invocationCount);
2426 <        g.complete(v2);
2424 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2425 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2426 >        checkCompletedWithWrappedCFException(h0);
2427 >        checkCompletedWithWrappedCFException(h1);
2428 >        checkCompletedWithWrappedCFException(h2);
2429 >        checkCompletedWithWrappedCFException(h3);
2430 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2431  
2432 <        checkCompletedNormally(f, v1);
2455 <        checkCompletedNormally(g, v2);
2456 <        checkCompletedNormally(h, null);
2457 <        assertEquals(1, r.invocationCount);
2458 <        }
2459 <    }
2460 <
2461 <    public void testRunAfterEither_normalCompletion2() {
2462 <        for (ExecutionMode m : ExecutionMode.values())
2463 <        for (Integer v1 : new Integer[] { 1, null })
2464 <        for (Integer v2 : new Integer[] { 2, null }) {
2432 >        g.complete(v2);
2433  
2434 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2435 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2436 <        final Noop r = new Noop();
2469 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2434 >        // unspecified behavior - both source completions available
2435 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2436 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2437  
2438 <        g.complete(v2);
2439 <        checkCompletedNormally(h, null);
2440 <        assertEquals(1, r.invocationCount);
2441 <        f.complete(v1);
2438 >        checkCompletedWithWrappedCFException(h4);
2439 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2440 >                   Objects.equals(v2, rs[4].value));
2441 >        checkCompletedWithWrappedCFException(h5);
2442 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2443 >                   Objects.equals(v2, rs[5].value));
2444  
2445          checkCompletedNormally(f, v1);
2446          checkCompletedNormally(g, v2);
2447 <        checkCompletedNormally(h, null);
2448 <        assertEquals(1, r.invocationCount);
2449 <        }
2450 <    }
2451 <    public void testRunAfterEither_normalCompletion3() {
2447 >    }}
2448 >
2449 >    /**
2450 >     * runAfterEither result completes normally after normal completion
2451 >     * of either source
2452 >     */
2453 >    public void testRunAfterEither_normalCompletion() {
2454          for (ExecutionMode m : ExecutionMode.values())
2455          for (Integer v1 : new Integer[] { 1, null })
2456 <        for (Integer v2 : new Integer[] { 2, null }) {
2457 <
2456 >        for (Integer v2 : new Integer[] { 2, null })
2457 >    {
2458          final CompletableFuture<Integer> f = new CompletableFuture<>();
2459          final CompletableFuture<Integer> g = new CompletableFuture<>();
2460 <        final Noop r = new Noop();
2460 >        final Noop[] rs = new Noop[6];
2461 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2462  
2463 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2464 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2465 +        checkIncomplete(h0);
2466 +        checkIncomplete(h1);
2467 +        rs[0].assertNotInvoked();
2468 +        rs[1].assertNotInvoked();
2469          f.complete(v1);
2470 +        checkCompletedNormally(h0, null);
2471 +        checkCompletedNormally(h1, null);
2472 +        rs[0].assertInvoked();
2473 +        rs[1].assertInvoked();
2474 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2475 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2476 +        checkCompletedNormally(h2, null);
2477 +        checkCompletedNormally(h3, null);
2478 +        rs[2].assertInvoked();
2479 +        rs[3].assertInvoked();
2480 +
2481          g.complete(v2);
2493        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2482  
2483 <        checkCompletedNormally(h, null);
2483 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2484 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2485 >
2486          checkCompletedNormally(f, v1);
2487          checkCompletedNormally(g, v2);
2488 <        assertEquals(1, r.invocationCount);
2489 <        }
2490 <    }
2488 >        checkCompletedNormally(h0, null);
2489 >        checkCompletedNormally(h1, null);
2490 >        checkCompletedNormally(h2, null);
2491 >        checkCompletedNormally(h3, null);
2492 >        checkCompletedNormally(h4, null);
2493 >        checkCompletedNormally(h5, null);
2494 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2495 >    }}
2496  
2497      /**
2498       * runAfterEither result completes exceptionally after exceptional
2499       * completion of either source
2500       */
2501 <    public void testRunAfterEither_exceptionalCompletion1() {
2501 >    public void testRunAfterEither_exceptionalCompletion() {
2502          for (ExecutionMode m : ExecutionMode.values())
2503 <        for (Integer v1 : new Integer[] { 1, null }) {
2504 <
2503 >        for (Integer v1 : new Integer[] { 1, null })
2504 >    {
2505          final CompletableFuture<Integer> f = new CompletableFuture<>();
2506          final CompletableFuture<Integer> g = new CompletableFuture<>();
2512        final Noop r = new Noop();
2513        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2507          final CFException ex = new CFException();
2508 +        final Noop[] rs = new Noop[6];
2509 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2510  
2511 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2512 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2513 +        checkIncomplete(h0);
2514 +        checkIncomplete(h1);
2515 +        rs[0].assertNotInvoked();
2516 +        rs[1].assertNotInvoked();
2517          f.completeExceptionally(ex);
2518 <        checkCompletedWithWrappedCFException(h, ex);
2518 >        checkCompletedWithWrappedException(h0, ex);
2519 >        checkCompletedWithWrappedException(h1, ex);
2520 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2521 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2522 >        checkCompletedWithWrappedException(h2, ex);
2523 >        checkCompletedWithWrappedException(h3, ex);
2524 >
2525          g.complete(v1);
2526  
2527 <        assertEquals(0, r.invocationCount);
2528 <        checkCompletedNormally(g, v1);
2529 <        checkCompletedWithWrappedCFException(f, ex);
2530 <        checkCompletedWithWrappedCFException(h, ex);
2527 >        // unspecified behavior - both source completions available
2528 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2529 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2530 >        try {
2531 >            assertNull(h4.join());
2532 >            rs[4].assertInvoked();
2533 >        } catch (CompletionException ok) {
2534 >            checkCompletedWithWrappedException(h4, ex);
2535 >            rs[4].assertNotInvoked();
2536          }
2537 <    }
2537 >        try {
2538 >            assertNull(h5.join());
2539 >            rs[5].assertInvoked();
2540 >        } catch (CompletionException ok) {
2541 >            checkCompletedWithWrappedException(h5, ex);
2542 >            rs[5].assertNotInvoked();
2543 >        }
2544 >
2545 >        checkCompletedExceptionally(f, ex);
2546 >        checkCompletedNormally(g, v1);
2547 >        checkCompletedWithWrappedException(h0, ex);
2548 >        checkCompletedWithWrappedException(h1, ex);
2549 >        checkCompletedWithWrappedException(h2, ex);
2550 >        checkCompletedWithWrappedException(h3, ex);
2551 >        checkCompletedWithWrappedException(h4, ex);
2552 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2553 >    }}
2554  
2555      public void testRunAfterEither_exceptionalCompletion2() {
2556          for (ExecutionMode m : ExecutionMode.values())
2557 <        for (Integer v1 : new Integer[] { 1, null }) {
2558 <
2557 >        for (boolean fFirst : new boolean[] { true, false })
2558 >        for (Integer v1 : new Integer[] { 1, null })
2559 >    {
2560          final CompletableFuture<Integer> f = new CompletableFuture<>();
2561          final CompletableFuture<Integer> g = new CompletableFuture<>();
2533        final Noop r = new Noop();
2534        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2562          final CFException ex = new CFException();
2563 +        final Noop[] rs = new Noop[6];
2564 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2565  
2566 <        g.completeExceptionally(ex);
2567 <        checkCompletedWithWrappedCFException(h, ex);
2568 <        f.complete(v1);
2569 <
2570 <        assertEquals(0, r.invocationCount);
2571 <        checkCompletedNormally(f, v1);
2572 <        checkCompletedWithWrappedCFException(g, ex);
2573 <        checkCompletedWithWrappedCFException(h, ex);
2566 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2567 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2568 >        if (fFirst) {
2569 >            f.complete(v1);
2570 >            g.completeExceptionally(ex);
2571 >        } else {
2572 >            g.completeExceptionally(ex);
2573 >            f.complete(v1);
2574          }
2575 <    }
2576 <
2548 <    public void testRunAfterEither_exceptionalCompletion3() {
2549 <        for (ExecutionMode m : ExecutionMode.values())
2550 <        for (Integer v1 : new Integer[] { 1, null }) {
2551 <
2552 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2553 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2554 <        final Noop r = new Noop();
2555 <        final CFException ex = new CFException();
2556 <
2557 <        g.completeExceptionally(ex);
2558 <        f.complete(v1);
2559 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2575 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2576 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2577  
2578 <        // unspecified behavior
2562 <        Integer v;
2578 >        // unspecified behavior - both source completions available
2579          try {
2580 <            assertEquals(h.join(), null);
2581 <            assertEquals(1, r.invocationCount);
2580 >            assertEquals(null, h0.join());
2581 >            rs[0].assertInvoked();
2582          } catch (CompletionException ok) {
2583 <            checkCompletedWithWrappedCFException(h, ex);
2584 <            assertEquals(0, r.invocationCount);
2569 <        }
2570 <
2571 <        checkCompletedWithWrappedCFException(g, ex);
2572 <        checkCompletedNormally(f, v1);
2583 >            checkCompletedWithWrappedException(h0, ex);
2584 >            rs[0].assertNotInvoked();
2585          }
2574    }
2575
2576    public void testRunAfterEither_exceptionalCompletion4() {
2577        for (ExecutionMode m : ExecutionMode.values())
2578        for (Integer v1 : new Integer[] { 1, null }) {
2579
2580        final CompletableFuture<Integer> f = new CompletableFuture<>();
2581        final CompletableFuture<Integer> g = new CompletableFuture<>();
2582        final Noop r = new Noop();
2583        final CFException ex = new CFException();
2584
2585        f.completeExceptionally(ex);
2586        g.complete(v1);
2587        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2588
2589        // unspecified behavior
2590        Integer v;
2586          try {
2587 <            assertEquals(h.join(), null);
2588 <            assertEquals(1, r.invocationCount);
2587 >            assertEquals(null, h1.join());
2588 >            rs[1].assertInvoked();
2589          } catch (CompletionException ok) {
2590 <            checkCompletedWithWrappedCFException(h, ex);
2591 <            assertEquals(0, r.invocationCount);
2590 >            checkCompletedWithWrappedException(h1, ex);
2591 >            rs[1].assertNotInvoked();
2592          }
2593 <
2594 <        checkCompletedWithWrappedCFException(f, ex);
2595 <        checkCompletedNormally(g, v1);
2593 >        try {
2594 >            assertEquals(null, h2.join());
2595 >            rs[2].assertInvoked();
2596 >        } catch (CompletionException ok) {
2597 >            checkCompletedWithWrappedException(h2, ex);
2598 >            rs[2].assertNotInvoked();
2599          }
2600 <    }
2601 <
2602 <    /**
2603 <     * runAfterEither result completes exceptionally if action does
2604 <     */
2605 <    public void testRunAfterEither_actionFailed1() {
2608 <        for (ExecutionMode m : ExecutionMode.values())
2609 <        for (Integer v1 : new Integer[] { 1, null })
2610 <        for (Integer v2 : new Integer[] { 2, null }) {
2611 <
2612 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2613 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2614 <        final FailingNoop r = new FailingNoop();
2615 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2616 <
2617 <        f.complete(v1);
2618 <        checkCompletedWithWrappedCFException(h);
2619 <        g.complete(v2);
2620 <        checkCompletedNormally(f, v1);
2621 <        checkCompletedNormally(g, v2);
2600 >        try {
2601 >            assertEquals(null, h3.join());
2602 >            rs[3].assertInvoked();
2603 >        } catch (CompletionException ok) {
2604 >            checkCompletedWithWrappedException(h3, ex);
2605 >            rs[3].assertNotInvoked();
2606          }
2623    }
2624
2625    public void testRunAfterEither_actionFailed2() {
2626        for (ExecutionMode m : ExecutionMode.values())
2627        for (Integer v1 : new Integer[] { 1, null })
2628        for (Integer v2 : new Integer[] { 2, null }) {
2629
2630        final CompletableFuture<Integer> f = new CompletableFuture<>();
2631        final CompletableFuture<Integer> g = new CompletableFuture<>();
2632        final FailingNoop r = new FailingNoop();
2633        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2607  
2635        g.complete(v2);
2636        checkCompletedWithWrappedCFException(h);
2637        f.complete(v1);
2608          checkCompletedNormally(f, v1);
2609 <        checkCompletedNormally(g, v2);
2610 <        }
2641 <    }
2609 >        checkCompletedExceptionally(g, ex);
2610 >    }}
2611  
2612      /**
2613       * runAfterEither result completes exceptionally if either source cancelled
2614       */
2615 <    public void testRunAfterEither_sourceCancelled1() {
2647 <        for (ExecutionMode m : ExecutionMode.values())
2648 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2649 <        for (Integer v1 : new Integer[] { 1, null }) {
2650 <
2651 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2652 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2653 <        final Noop r = new Noop();
2654 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2655 <
2656 <        assertTrue(f.cancel(mayInterruptIfRunning));
2657 <        checkCompletedWithWrappedCancellationException(h);
2658 <        g.complete(v1);
2659 <
2660 <        checkCancelled(f);
2661 <        assertEquals(0, r.invocationCount);
2662 <        checkCompletedNormally(g, v1);
2663 <        checkCompletedWithWrappedCancellationException(h);
2664 <        }
2665 <    }
2666 <
2667 <    public void testRunAfterEither_sourceCancelled2() {
2615 >    public void testRunAfterEither_sourceCancelled() {
2616          for (ExecutionMode m : ExecutionMode.values())
2617          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2618 <        for (Integer v1 : new Integer[] { 1, null }) {
2619 <
2618 >        for (Integer v1 : new Integer[] { 1, null })
2619 >    {
2620          final CompletableFuture<Integer> f = new CompletableFuture<>();
2621          final CompletableFuture<Integer> g = new CompletableFuture<>();
2622 <        final Noop r = new Noop();
2623 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2622 >        final Noop[] rs = new Noop[6];
2623 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2624  
2625 <        assertTrue(g.cancel(mayInterruptIfRunning));
2626 <        checkCompletedWithWrappedCancellationException(h);
2627 <        f.complete(v1);
2628 <
2629 <        checkCancelled(g);
2630 <        assertEquals(0, r.invocationCount);
2631 <        checkCompletedNormally(f, v1);
2632 <        checkCompletedWithWrappedCancellationException(h);
2633 <        }
2634 <    }
2625 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2626 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2627 >        checkIncomplete(h0);
2628 >        checkIncomplete(h1);
2629 >        rs[0].assertNotInvoked();
2630 >        rs[1].assertNotInvoked();
2631 >        f.cancel(mayInterruptIfRunning);
2632 >        checkCompletedWithWrappedCancellationException(h0);
2633 >        checkCompletedWithWrappedCancellationException(h1);
2634 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2635 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2636 >        checkCompletedWithWrappedCancellationException(h2);
2637 >        checkCompletedWithWrappedCancellationException(h3);
2638  
2639 <    public void testRunAfterEither_sourceCancelled3() {
2689 <        for (ExecutionMode m : ExecutionMode.values())
2690 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2691 <        for (Integer v1 : new Integer[] { 1, null }) {
2692 <
2693 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2694 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2695 <        final Noop r = new Noop();
2696 <
2697 <        assertTrue(g.cancel(mayInterruptIfRunning));
2698 <        f.complete(v1);
2699 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2639 >        g.complete(v1);
2640  
2641 <        // unspecified behavior
2642 <        Integer v;
2641 >        // unspecified behavior - both source completions available
2642 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2643 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2644          try {
2645 <            assertEquals(h.join(), null);
2646 <            assertEquals(1, r.invocationCount);
2645 >            assertNull(h4.join());
2646 >            rs[4].assertInvoked();
2647          } catch (CompletionException ok) {
2648 <            checkCompletedWithWrappedCancellationException(h);
2649 <            assertEquals(0, r.invocationCount);
2648 >            checkCompletedWithWrappedCancellationException(h4);
2649 >            rs[4].assertNotInvoked();
2650          }
2710
2711        checkCancelled(g);
2712        checkCompletedNormally(f, v1);
2713        }
2714    }
2715
2716    public void testRunAfterEither_sourceCancelled4() {
2717        for (ExecutionMode m : ExecutionMode.values())
2718        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2719        for (Integer v1 : new Integer[] { 1, null }) {
2720
2721        final CompletableFuture<Integer> f = new CompletableFuture<>();
2722        final CompletableFuture<Integer> g = new CompletableFuture<>();
2723        final Noop r = new Noop();
2724
2725        assertTrue(f.cancel(mayInterruptIfRunning));
2726        g.complete(v1);
2727        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2728
2729        // unspecified behavior
2730        Integer v;
2651          try {
2652 <            assertEquals(h.join(), null);
2653 <            assertEquals(1, r.invocationCount);
2652 >            assertNull(h5.join());
2653 >            rs[5].assertInvoked();
2654          } catch (CompletionException ok) {
2655 <            checkCompletedWithWrappedCancellationException(h);
2656 <            assertEquals(0, r.invocationCount);
2655 >            checkCompletedWithWrappedCancellationException(h5);
2656 >            rs[5].assertNotInvoked();
2657          }
2658  
2659          checkCancelled(f);
2660          checkCompletedNormally(g, v1);
2661 <        }
2662 <    }
2661 >        checkCompletedWithWrappedCancellationException(h0);
2662 >        checkCompletedWithWrappedCancellationException(h1);
2663 >        checkCompletedWithWrappedCancellationException(h2);
2664 >        checkCompletedWithWrappedCancellationException(h3);
2665 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2666 >    }}
2667  
2668      /**
2669 <     * thenCompose result completes normally after normal completion of source
2669 >     * runAfterEither result completes exceptionally if action does
2670       */
2671 <    public void testThenCompose_normalCompletion1() {
2671 >    public void testRunAfterEither_actionFailed() {
2672          for (ExecutionMode m : ExecutionMode.values())
2673 <        for (Integer v1 : new Integer[] { 1, null }) {
2674 <
2673 >        for (Integer v1 : new Integer[] { 1, null })
2674 >        for (Integer v2 : new Integer[] { 2, null })
2675 >    {
2676          final CompletableFuture<Integer> f = new CompletableFuture<>();
2677 <        final CompletableFutureInc r = new CompletableFutureInc();
2678 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2677 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2678 >        final FailingRunnable[] rs = new FailingRunnable[6];
2679 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2680 >
2681 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2682 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2683          f.complete(v1);
2684 <        checkCompletedNormally(g, inc(v1));
2684 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2685 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2686 >        checkCompletedWithWrappedCFException(h0);
2687 >        checkCompletedWithWrappedCFException(h1);
2688 >        checkCompletedWithWrappedCFException(h2);
2689 >        checkCompletedWithWrappedCFException(h3);
2690 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2691 >        g.complete(v2);
2692 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2693 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2694 >        checkCompletedWithWrappedCFException(h4);
2695 >        checkCompletedWithWrappedCFException(h5);
2696 >
2697          checkCompletedNormally(f, v1);
2698 <        assertEquals(1, r.invocationCount);
2699 <        }
2700 <    }
2698 >        checkCompletedNormally(g, v2);
2699 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2700 >    }}
2701  
2702 <    public void testThenCompose_normalCompletion2() {
2702 >    /**
2703 >     * thenCompose result completes normally after normal completion of source
2704 >     */
2705 >    public void testThenCompose_normalCompletion() {
2706          for (ExecutionMode m : ExecutionMode.values())
2707 <        for (Integer v1 : new Integer[] { 1, null }) {
2708 <
2707 >        for (boolean createIncomplete : new boolean[] { true, false })
2708 >        for (Integer v1 : new Integer[] { 1, null })
2709 >    {
2710          final CompletableFuture<Integer> f = new CompletableFuture<>();
2711 <        final CompletableFutureInc r = new CompletableFutureInc();
2712 <        f.complete(v1);
2713 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2711 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2712 >        if (!createIncomplete) f.complete(v1);
2713 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2714 >        if (createIncomplete) f.complete(v1);
2715 >
2716          checkCompletedNormally(g, inc(v1));
2717          checkCompletedNormally(f, v1);
2718 <        assertEquals(1, r.invocationCount);
2719 <        }
2773 <    }
2718 >        r.assertValue(v1);
2719 >    }}
2720  
2721      /**
2722       * thenCompose result completes exceptionally after exceptional
2723       * completion of source
2724       */
2725 <    public void testThenCompose_exceptionalCompletion1() {
2726 <        for (ExecutionMode m : ExecutionMode.values()) {
2727 <
2725 >    public void testThenCompose_exceptionalCompletion() {
2726 >        for (ExecutionMode m : ExecutionMode.values())
2727 >        for (boolean createIncomplete : new boolean[] { true, false })
2728 >    {
2729          final CFException ex = new CFException();
2730 <        final CompletableFutureInc r = new CompletableFutureInc();
2730 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2731          final CompletableFuture<Integer> f = new CompletableFuture<>();
2732 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2733 <        f.completeExceptionally(ex);
2734 <        checkCompletedWithWrappedCFException(g, ex);
2788 <        checkCompletedWithWrappedCFException(f, ex);
2789 <        }
2790 <    }
2791 <
2792 <    public void testThenCompose_exceptionalCompletion2() {
2793 <        for (ExecutionMode m : ExecutionMode.values()) {
2732 >        if (!createIncomplete) f.completeExceptionally(ex);
2733 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2734 >        if (createIncomplete) f.completeExceptionally(ex);
2735  
2736 <        final CFException ex = new CFException();
2737 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2738 <        f.completeExceptionally(ex);
2739 <        final CompletableFutureInc r = new CompletableFutureInc();
2799 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2800 <        checkCompletedWithWrappedCFException(g, ex);
2801 <        checkCompletedWithWrappedCFException(f, ex);
2802 <        }
2803 <    }
2736 >        checkCompletedWithWrappedException(g, ex);
2737 >        checkCompletedExceptionally(f, ex);
2738 >        r.assertNotInvoked();
2739 >    }}
2740  
2741      /**
2742       * thenCompose result completes exceptionally if action does
2743       */
2744 <    public void testThenCompose_actionFailed1() {
2744 >    public void testThenCompose_actionFailed() {
2745          for (ExecutionMode m : ExecutionMode.values())
2746 <        for (Integer v1 : new Integer[] { 1, null }) {
2747 <
2746 >        for (boolean createIncomplete : new boolean[] { true, false })
2747 >        for (Integer v1 : new Integer[] { 1, null })
2748 >    {
2749          final CompletableFuture<Integer> f = new CompletableFuture<>();
2750          final FailingCompletableFutureFunction r
2751 <            = new FailingCompletableFutureFunction();
2752 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2753 <        f.complete(v1);
2754 <        checkCompletedWithWrappedCFException(g);
2818 <        checkCompletedNormally(f, v1);
2819 <        }
2820 <    }
2821 <
2822 <    public void testThenCompose_actionFailed2() {
2823 <        for (ExecutionMode m : ExecutionMode.values())
2824 <        for (Integer v1 : new Integer[] { 1, null }) {
2751 >            = new FailingCompletableFutureFunction(m);
2752 >        if (!createIncomplete) f.complete(v1);
2753 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2754 >        if (createIncomplete) f.complete(v1);
2755  
2826        final CompletableFuture<Integer> f = new CompletableFuture<>();
2827        f.complete(v1);
2828        final FailingCompletableFutureFunction r
2829            = new FailingCompletableFutureFunction();
2830        final CompletableFuture<Integer> g = f.thenCompose(r);
2756          checkCompletedWithWrappedCFException(g);
2757          checkCompletedNormally(f, v1);
2758 <        }
2834 <    }
2758 >    }}
2759  
2760      /**
2761       * thenCompose result completes exceptionally if source cancelled
2762       */
2763 <    public void testThenCompose_sourceCancelled1() {
2763 >    public void testThenCompose_sourceCancelled() {
2764          for (ExecutionMode m : ExecutionMode.values())
2765 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2766 <
2765 >        for (boolean createIncomplete : new boolean[] { true, false })
2766 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2767 >    {
2768          final CompletableFuture<Integer> f = new CompletableFuture<>();
2769 <        final CompletableFutureInc r = new CompletableFutureInc();
2770 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2771 <        assertTrue(f.cancel(mayInterruptIfRunning));
2772 <        checkCompletedWithWrappedCancellationException(g);
2773 <        checkCancelled(f);
2769 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2770 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2771 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2772 >        if (createIncomplete) {
2773 >            checkIncomplete(g);
2774 >            assertTrue(f.cancel(mayInterruptIfRunning));
2775          }
2850    }
2851
2852    public void testThenCompose_sourceCancelled2() {
2853        for (ExecutionMode m : ExecutionMode.values())
2854        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2776  
2856        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857        assertTrue(f.cancel(mayInterruptIfRunning));
2858        final CompletableFutureInc r = new CompletableFutureInc();
2859        final CompletableFuture<Integer> g = f.thenCompose(r);
2777          checkCompletedWithWrappedCancellationException(g);
2778          checkCancelled(f);
2779 <        }
2863 <    }
2864 <
2865 <    // asyncs
2866 <
2867 <    /**
2868 <     * thenRunAsync result completes normally after normal completion of source
2869 <     */
2870 <    public void testThenRunAsync() {
2871 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2872 <        Noop r = new Noop();
2873 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2874 <        f.complete(null);
2875 <        checkCompletedNormally(g, null);
2876 <
2877 <        // reordered version
2878 <        f = new CompletableFuture<>();
2879 <        f.complete(null);
2880 <        r = new Noop();
2881 <        g = f.thenRunAsync(r);
2882 <        checkCompletedNormally(g, null);
2883 <    }
2884 <
2885 <    /**
2886 <     * thenRunAsync result completes exceptionally after exceptional
2887 <     * completion of source
2888 <     */
2889 <    public void testThenRunAsync2() {
2890 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2891 <        Noop r = new Noop();
2892 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2893 <        f.completeExceptionally(new CFException());
2894 <        try {
2895 <            g.join();
2896 <            shouldThrow();
2897 <        } catch (CompletionException success) {}
2898 <        checkCompletedWithWrappedCFException(g);
2899 <    }
2900 <
2901 <    /**
2902 <     * thenRunAsync result completes exceptionally if action does
2903 <     */
2904 <    public void testThenRunAsync3() {
2905 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2906 <        FailingNoop r = new FailingNoop();
2907 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2908 <        f.complete(null);
2909 <        checkCompletedWithWrappedCFException(g);
2910 <    }
2911 <
2912 <    /**
2913 <     * thenRunAsync result completes exceptionally if source cancelled
2914 <     */
2915 <    public void testThenRunAsync4() {
2916 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2917 <        Noop r = new Noop();
2918 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2919 <        assertTrue(f.cancel(true));
2920 <        checkCompletedWithWrappedCancellationException(g);
2921 <    }
2922 <
2923 <    /**
2924 <     * thenApplyAsync result completes normally after normal completion of source
2925 <     */
2926 <    public void testThenApplyAsync() {
2927 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2928 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2929 <        f.complete(one);
2930 <        checkCompletedNormally(g, two);
2931 <    }
2932 <
2933 <    /**
2934 <     * thenApplyAsync result completes exceptionally after exceptional
2935 <     * completion of source
2936 <     */
2937 <    public void testThenApplyAsync2() {
2938 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2939 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2940 <        f.completeExceptionally(new CFException());
2941 <        checkCompletedWithWrappedCFException(g);
2942 <    }
2943 <
2944 <    /**
2945 <     * thenApplyAsync result completes exceptionally if action does
2946 <     */
2947 <    public void testThenApplyAsync3() {
2948 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2949 <        FailingFunction r = new FailingFunction();
2950 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2951 <        f.complete(null);
2952 <        checkCompletedWithWrappedCFException(g);
2953 <    }
2954 <
2955 <    /**
2956 <     * thenApplyAsync result completes exceptionally if source cancelled
2957 <     */
2958 <    public void testThenApplyAsync4() {
2959 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2960 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2961 <        assertTrue(f.cancel(true));
2962 <        checkCompletedWithWrappedCancellationException(g);
2963 <    }
2964 <
2965 <    /**
2966 <     * thenAcceptAsync result completes normally after normal
2967 <     * completion of source
2968 <     */
2969 <    public void testThenAcceptAsync() {
2970 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2971 <        IncAction r = new IncAction();
2972 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2973 <        f.complete(one);
2974 <        checkCompletedNormally(g, null);
2975 <        assertEquals(r.value, (Integer) 2);
2976 <    }
2977 <
2978 <    /**
2979 <     * thenAcceptAsync result completes exceptionally after exceptional
2980 <     * completion of source
2981 <     */
2982 <    public void testThenAcceptAsync2() {
2983 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2984 <        IncAction r = new IncAction();
2985 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2986 <        f.completeExceptionally(new CFException());
2987 <        checkCompletedWithWrappedCFException(g);
2988 <    }
2989 <
2990 <    /**
2991 <     * thenAcceptAsync result completes exceptionally if action does
2992 <     */
2993 <    public void testThenAcceptAsync3() {
2994 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2995 <        FailingConsumer r = new FailingConsumer();
2996 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2997 <        f.complete(null);
2998 <        checkCompletedWithWrappedCFException(g);
2999 <    }
3000 <
3001 <    /**
3002 <     * thenAcceptAsync result completes exceptionally if source cancelled
3003 <     */
3004 <    public void testThenAcceptAsync4() {
3005 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3006 <        IncAction r = new IncAction();
3007 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3008 <        assertTrue(f.cancel(true));
3009 <        checkCompletedWithWrappedCancellationException(g);
3010 <    }
3011 <
3012 <    // async with explicit executors
3013 <
3014 <    /**
3015 <     * thenRunAsync result completes normally after normal completion of source
3016 <     */
3017 <    public void testThenRunAsyncE() {
3018 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3019 <        Noop r = new Noop();
3020 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3021 <        f.complete(null);
3022 <        checkCompletedNormally(g, null);
3023 <
3024 <        // reordered version
3025 <        f = new CompletableFuture<>();
3026 <        f.complete(null);
3027 <        r = new Noop();
3028 <        g = f.thenRunAsync(r, new ThreadExecutor());
3029 <        checkCompletedNormally(g, null);
3030 <    }
3031 <
3032 <    /**
3033 <     * thenRunAsync result completes exceptionally after exceptional
3034 <     * completion of source
3035 <     */
3036 <    public void testThenRunAsync2E() {
3037 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3038 <        Noop r = new Noop();
3039 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3040 <        f.completeExceptionally(new CFException());
3041 <        try {
3042 <            g.join();
3043 <            shouldThrow();
3044 <        } catch (CompletionException success) {}
3045 <        checkCompletedWithWrappedCFException(g);
3046 <    }
3047 <
3048 <    /**
3049 <     * thenRunAsync result completes exceptionally if action does
3050 <     */
3051 <    public void testThenRunAsync3E() {
3052 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3053 <        FailingNoop r = new FailingNoop();
3054 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3055 <        f.complete(null);
3056 <        checkCompletedWithWrappedCFException(g);
3057 <    }
3058 <
3059 <    /**
3060 <     * thenRunAsync result completes exceptionally if source cancelled
3061 <     */
3062 <    public void testThenRunAsync4E() {
3063 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3064 <        Noop r = new Noop();
3065 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3066 <        assertTrue(f.cancel(true));
3067 <        checkCompletedWithWrappedCancellationException(g);
3068 <    }
3069 <
3070 <    /**
3071 <     * thenApplyAsync result completes normally after normal completion of source
3072 <     */
3073 <    public void testThenApplyAsyncE() {
3074 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3075 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3076 <        f.complete(one);
3077 <        checkCompletedNormally(g, two);
3078 <    }
3079 <
3080 <    /**
3081 <     * thenApplyAsync result completes exceptionally after exceptional
3082 <     * completion of source
3083 <     */
3084 <    public void testThenApplyAsync2E() {
3085 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3086 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3087 <        f.completeExceptionally(new CFException());
3088 <        checkCompletedWithWrappedCFException(g);
3089 <    }
3090 <
3091 <    /**
3092 <     * thenApplyAsync result completes exceptionally if action does
3093 <     */
3094 <    public void testThenApplyAsync3E() {
3095 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3096 <        FailingFunction r = new FailingFunction();
3097 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3098 <        f.complete(null);
3099 <        checkCompletedWithWrappedCFException(g);
3100 <    }
3101 <
3102 <    /**
3103 <     * thenApplyAsync result completes exceptionally if source cancelled
3104 <     */
3105 <    public void testThenApplyAsync4E() {
3106 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3107 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3108 <        assertTrue(f.cancel(true));
3109 <        checkCompletedWithWrappedCancellationException(g);
3110 <    }
3111 <
3112 <    /**
3113 <     * thenAcceptAsync result completes normally after normal
3114 <     * completion of source
3115 <     */
3116 <    public void testThenAcceptAsyncE() {
3117 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3118 <        IncAction r = new IncAction();
3119 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3120 <        f.complete(one);
3121 <        checkCompletedNormally(g, null);
3122 <        assertEquals(r.value, (Integer) 2);
3123 <    }
3124 <
3125 <    /**
3126 <     * thenAcceptAsync result completes exceptionally after exceptional
3127 <     * completion of source
3128 <     */
3129 <    public void testThenAcceptAsync2E() {
3130 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3131 <        IncAction r = new IncAction();
3132 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3133 <        f.completeExceptionally(new CFException());
3134 <        checkCompletedWithWrappedCFException(g);
3135 <    }
3136 <
3137 <    /**
3138 <     * thenAcceptAsync result completes exceptionally if action does
3139 <     */
3140 <    public void testThenAcceptAsync3E() {
3141 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3142 <        FailingConsumer r = new FailingConsumer();
3143 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3144 <        f.complete(null);
3145 <        checkCompletedWithWrappedCFException(g);
3146 <    }
3147 <
3148 <    /**
3149 <     * thenAcceptAsync result completes exceptionally if source cancelled
3150 <     */
3151 <    public void testThenAcceptAsync4E() {
3152 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3153 <        IncAction r = new IncAction();
3154 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3155 <        assertTrue(f.cancel(true));
3156 <        checkCompletedWithWrappedCancellationException(g);
3157 <    }
2779 >    }}
2780  
2781      // other static methods
2782  
# Line 3173 | Line 2795 | public class CompletableFutureTest exten
2795       */
2796      public void testAllOf_normal() throws Exception {
2797          for (int k = 1; k < 20; ++k) {
2798 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2798 >            CompletableFuture<Integer>[] fs
2799 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2800              for (int i = 0; i < k; ++i)
2801                  fs[i] = new CompletableFuture<>();
2802              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3187 | Line 2810 | public class CompletableFutureTest exten
2810          }
2811      }
2812  
2813 +    public void testAllOf_backwards() throws Exception {
2814 +        for (int k = 1; k < 20; ++k) {
2815 +            CompletableFuture<Integer>[] fs
2816 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2817 +            for (int i = 0; i < k; ++i)
2818 +                fs[i] = new CompletableFuture<>();
2819 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2820 +            for (int i = k - 1; i >= 0; i--) {
2821 +                checkIncomplete(f);
2822 +                checkIncomplete(CompletableFuture.allOf(fs));
2823 +                fs[i].complete(one);
2824 +            }
2825 +            checkCompletedNormally(f, null);
2826 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2827 +        }
2828 +    }
2829 +
2830      /**
2831       * anyOf(no component futures) returns an incomplete future
2832       */
# Line 3245 | Line 2885 | public class CompletableFutureTest exten
2885          Runnable[] throwingActions = {
2886              () -> CompletableFuture.supplyAsync(null),
2887              () -> CompletableFuture.supplyAsync(null, exec),
2888 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2888 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2889  
2890              () -> CompletableFuture.runAsync(null),
2891              () -> CompletableFuture.runAsync(null, exec),
# Line 3318 | Line 2958 | public class CompletableFutureTest exten
2958  
2959              () -> f.thenCompose(null),
2960              () -> f.thenComposeAsync(null),
2961 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2961 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2962              () -> f.thenComposeAsync(null, exec),
2963  
2964              () -> f.exceptionally(null),
# Line 3350 | Line 2990 | public class CompletableFutureTest exten
2990          assertSame(f, f.toCompletableFuture());
2991      }
2992  
3353    /**
3354     * whenComplete action executes on normal completion, propagating
3355     * source result.
3356     */
3357    public void testWhenComplete_normalCompletion1() {
3358        for (boolean createIncomplete : new boolean[] { true, false })
3359        for (ExecutionMode m : ExecutionMode.values())
3360        for (Integer v1 : new Integer[] { 1, null }) {
3361
3362        final AtomicInteger a = new AtomicInteger();
3363        final CompletableFuture<Integer> f = new CompletableFuture<>();
3364        if (!createIncomplete) f.complete(v1);
3365        final CompletableFuture<Integer> g =
3366            m.whenComplete(f,
3367                           (Integer x, Throwable t) -> {
3368                               threadAssertSame(x, v1);
3369                               threadAssertNull(t);
3370                               a.getAndIncrement();
3371                           });
3372        if (createIncomplete) f.complete(v1);
3373        checkCompletedNormally(f, v1);
3374        checkCompletedNormally(g, v1);
3375        assertEquals(a.get(), 1);
3376        }
3377    }
3378
3379    /**
3380     * whenComplete action executes on exceptional completion, propagating
3381     * source result.
3382     */
3383    public void testWhenComplete_exceptionalCompletion() {
3384        for (boolean createIncomplete : new boolean[] { true, false })
3385        for (ExecutionMode m : ExecutionMode.values())
3386        for (Integer v1 : new Integer[] { 1, null }) {
3387
3388        final AtomicInteger a = new AtomicInteger();
3389        final CFException ex = new CFException();
3390        final CompletableFuture<Integer> f = new CompletableFuture<>();
3391        if (!createIncomplete) f.completeExceptionally(ex);
3392        final CompletableFuture<Integer> g = m.whenComplete
3393            (f,
3394             (Integer x, Throwable t) -> {
3395                threadAssertNull(x);
3396                threadAssertSame(t, ex);
3397                a.getAndIncrement();
3398            });
3399        if (createIncomplete) f.completeExceptionally(ex);
3400        checkCompletedWithWrappedCFException(f, ex);
3401        checkCompletedWithWrappedCFException(g, ex);
3402        assertEquals(a.get(), 1);
3403        }
3404    }
3405
3406    /**
3407     * If a whenComplete action throws an exception when triggered by
3408     * a normal completion, it completes exceptionally
3409     */
3410    public void testWhenComplete_actionFailed() {
3411        for (boolean createIncomplete : new boolean[] { true, false })
3412        for (ExecutionMode m : ExecutionMode.values())
3413        for (Integer v1 : new Integer[] { 1, null }) {
3414
3415        final CFException ex = new CFException();
3416        final CompletableFuture<Integer> f = new CompletableFuture<>();
3417        if (!createIncomplete) f.complete(v1);
3418        final CompletableFuture<Integer> g = m.whenComplete
3419            (f,
3420             (Integer x, Throwable t) -> {
3421                threadAssertSame(x, v1);
3422                threadAssertNull(t);
3423                throw ex;
3424            });
3425        if (createIncomplete) f.complete(v1);
3426        checkCompletedNormally(f, v1);
3427        checkCompletedWithWrappedCFException(g, ex);
3428        }
3429    }
3430
3431    /**
3432     * If a whenComplete action throws an exception when triggered by
3433     * a source completion that also throws an exception, the source
3434     * exception takes precedence.
3435     */
3436    public void testWhenComplete_actionFailedSourceFailed() {
3437        for (boolean createIncomplete : new boolean[] { true, false })
3438        for (ExecutionMode m : ExecutionMode.values())
3439        for (Integer v1 : new Integer[] { 1, null }) {
3440
3441        final CFException ex1 = new CFException();
3442        final CFException ex2 = new CFException();
3443        final CompletableFuture<Integer> f = new CompletableFuture<>();
3444
3445        if (!createIncomplete) f.completeExceptionally(ex1);
3446        final CompletableFuture<Integer> g = m.whenComplete
3447            (f,
3448             (Integer x, Throwable t) -> {
3449                threadAssertSame(t, ex1);
3450                threadAssertNull(x);
3451                throw ex2;
3452            });
3453        if (createIncomplete) f.completeExceptionally(ex1);
3454
3455        checkCompletedWithWrappedCFException(f, ex1);
3456        checkCompletedWithWrappedCFException(g, ex1);
3457        }
3458    }
3459
3460    /**
3461     * handleAsync action completes normally with function value on
3462     * either normal or exceptional completion of source
3463     */
3464    public void testHandleAsync() {
3465        CompletableFuture<Integer> f, g;
3466        IntegerHandler r;
3467
3468        f = new CompletableFuture<>();
3469        g = f.handleAsync(r = new IntegerHandler());
3470        assertEquals(0, r.invocationCount);
3471        f.completeExceptionally(new CFException());
3472        checkCompletedWithWrappedCFException(f);
3473        checkCompletedNormally(g, three);
3474        assertEquals(1, r.invocationCount);
3475
3476        f = new CompletableFuture<>();
3477        g = f.handleAsync(r = new IntegerHandler());
3478        assertEquals(0, r.invocationCount);
3479        f.completeExceptionally(new CFException());
3480        checkCompletedWithWrappedCFException(f);
3481        checkCompletedNormally(g, three);
3482        assertEquals(1, r.invocationCount);
3483
3484        f = new CompletableFuture<>();
3485        g = f.handleAsync(r = new IntegerHandler());
3486        assertEquals(0, r.invocationCount);
3487        f.complete(one);
3488        checkCompletedNormally(f, one);
3489        checkCompletedNormally(g, two);
3490        assertEquals(1, r.invocationCount);
3491
3492        f = new CompletableFuture<>();
3493        g = f.handleAsync(r = new IntegerHandler());
3494        assertEquals(0, r.invocationCount);
3495        f.complete(one);
3496        checkCompletedNormally(f, one);
3497        checkCompletedNormally(g, two);
3498        assertEquals(1, r.invocationCount);
3499    }
3500
3501    /**
3502     * handleAsync action with Executor completes normally with
3503     * function value on either normal or exceptional completion of
3504     * source
3505     */
3506    public void testHandleAsync2() {
3507        CompletableFuture<Integer> f, g;
3508        ThreadExecutor exec = new ThreadExecutor();
3509        IntegerHandler r;
3510
3511        f = new CompletableFuture<>();
3512        g = f.handleAsync(r = new IntegerHandler(), exec);
3513        assertEquals(0, r.invocationCount);
3514        f.completeExceptionally(new CFException());
3515        checkCompletedWithWrappedCFException(f);
3516        checkCompletedNormally(g, three);
3517        assertEquals(1, r.invocationCount);
3518
3519        f = new CompletableFuture<>();
3520        g = f.handleAsync(r = new IntegerHandler(), exec);
3521        assertEquals(0, r.invocationCount);
3522        f.completeExceptionally(new CFException());
3523        checkCompletedWithWrappedCFException(f);
3524        checkCompletedNormally(g, three);
3525        assertEquals(1, r.invocationCount);
3526
3527        f = new CompletableFuture<>();
3528        g = f.handleAsync(r = new IntegerHandler(), exec);
3529        assertEquals(0, r.invocationCount);
3530        f.complete(one);
3531        checkCompletedNormally(f, one);
3532        checkCompletedNormally(g, two);
3533        assertEquals(1, r.invocationCount);
3534
3535        f = new CompletableFuture<>();
3536        g = f.handleAsync(r = new IntegerHandler(), exec);
3537        assertEquals(0, r.invocationCount);
3538        f.complete(one);
3539        checkCompletedNormally(f, one);
3540        checkCompletedNormally(g, two);
3541        assertEquals(1, r.invocationCount);
3542    }
3543
2993   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines