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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines