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

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.42 by jsr166, Mon Jun 2 02:19:23 2014 UTC vs.
Revision 1.89 by jsr166, Mon Jun 16 21:34:49 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;
342 <        public boolean ran() { return invocationCount == 1; }
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;
428 <        public boolean ran() { return invocationCount == 1; }
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.
439 <        public boolean ran() { return invocationCount == 1; }
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.
457 <        public boolean ran() { return invocationCount == 1; }
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;
465 <        boolean ran;
463 >
464 >    class Noop extends CheckedAction implements Runnable {
465 >        Noop(ExecutionMode m) { super(m); }
466          public void run() {
467 <            invocationCount++;
382 <            ran = true;
467 >            invoked();
468          }
469      }
470  
471 <    static final class FailingSupplier implements Supplier<Integer> {
472 <        boolean ran;
473 <        public Integer get() { ran = true; throw new CFException(); }
471 >    class FailingSupplier extends CheckedAction
472 >        implements Supplier<Integer>
473 >    {
474 >        FailingSupplier(ExecutionMode m) { super(m); }
475 >        public Integer get() {
476 >            invoked();
477 >            throw new CFException();
478 >        }
479      }
480 <    static final class FailingConsumer implements Consumer<Integer> {
481 <        boolean ran;
482 <        public void accept(Integer x) { ran = true; throw new CFException(); }
480 >
481 >    class FailingConsumer extends CheckedIntegerAction
482 >        implements Consumer<Integer>
483 >    {
484 >        FailingConsumer(ExecutionMode m) { super(m); }
485 >        public void accept(Integer x) {
486 >            invoked();
487 >            value = x;
488 >            throw new CFException();
489 >        }
490      }
491 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
492 <        boolean ran;
493 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
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 >            invoked();
498 >            value = subtract(x, y);
499 >            throw new CFException();
500 >        }
501      }
502 <    static final class FailingFunction implements Function<Integer, Integer> {
503 <        boolean ran;
504 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
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 >            invoked();
509 >            value = x;
510 >            throw new CFException();
511 >        }
512      }
513 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
514 <        boolean ran;
515 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
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 >            invoked();
520 >            value = subtract(x, y);
521 >            throw new CFException();
522 >        }
523      }
524 <    static final class FailingNoop implements Runnable {
525 <        boolean ran;
526 <        public void run() { ran = true; throw new CFException(); }
524 >
525 >    class FailingRunnable extends CheckedAction implements Runnable {
526 >        FailingRunnable(ExecutionMode m) { super(m); }
527 >        public void run() {
528 >            invoked();
529 >            throw new CFException();
530 >        }
531      }
532  
533 <    static final class CompletableFutureInc
534 <        implements Function<Integer, CompletableFuture<Integer>> {
535 <        boolean ran;
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 <            ran = true;
539 >            invoked();
540 >            value = x;
541              CompletableFuture<Integer> f = new CompletableFuture<>();
542 <            f.complete(Integer.valueOf(x.intValue() + 1));
542 >            assertTrue(f.complete(inc(x)));
543              return f;
544          }
545      }
546  
547 <    static final class FailingCompletableFutureFunction
548 <        implements Function<Integer, CompletableFuture<Integer>> {
549 <        boolean ran;
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 <            ran = true; throw new CFException();
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();
437 <        }
438 <    }
439 <
440 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
441 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
442 <    }
443 <
444 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
445 <        boolean ran;
446 <        public Integer apply(Integer x, Throwable t) {
447 <            ran = true;
448 <            return (t == null) ? two : three;
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 471 | 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 483 | 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              }
502        },
503
504 //             /** Experimental way to do more testing */
505 //         REVERSE_DEFAULT {
506 //             public <T,U> CompletableFuture<Void> runAfterBoth
507 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
508 //                 return g.runAfterBoth(f, a);
509 //             }
510 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
511 //                 (CompletableFuture<T> f,
512 //                  CompletionStage<? extends U> g,
513 //                  BiConsumer<? super T,? super U> a) {
514 //                 return DEFAULT.thenAcceptBoth(f, g, a);
515 //             }
516 //         },
517
518        DEFAULT_ASYNC {
689              public <T,U> CompletableFuture<Void> runAfterBoth
690                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
691                  return f.runAfterBothAsync(g, a);
# Line 532 | 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 544 | 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              }
563        },
564
565 //         REVERSE_DEFAULT_ASYNC {
566 //             public <T,U> CompletableFuture<Void> runAfterBoth
567 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
568 //                 return f.runAfterBothAsync(g, a);
569 //             }
570 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
571 //                 (CompletableFuture<T> f,
572 //                  CompletionStage<? extends U> g,
573 //                  BiConsumer<? super T,? super U> a) {
574 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
575 //             }
576 //         },
577
578        EXECUTOR {
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 592 | Line 775 | public class CompletableFutureTest exten
775                   BiFunction<? super T,? super U,? extends V> a) {
776                  return f.thenCombineAsync(g, a, new ThreadExecutor());
777              }
595            public <T,U> CompletableFuture<U> applyToEither
596                (CompletableFuture<T> f,
597                 CompletionStage<? extends T> g,
598                 Function<? super T,U> a) {
599                return f.applyToEitherAsync(g, a, new ThreadExecutor());
600            }
601            public <T> CompletableFuture<Void> acceptEither
602                (CompletableFuture<T> f,
603                 CompletionStage<? extends T> g,
604                 Consumer<? super T> a) {
605                return f.acceptEitherAsync(g, a, new ThreadExecutor());
606            }
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 632 | Line 823 | public class CompletableFutureTest exten
823              (CompletableFuture<T> f,
824               CompletionStage<? extends U> g,
825               BiFunction<? super T,? super U,? extends V> a);
635        public abstract <T,U> CompletableFuture<U> applyToEither
636            (CompletableFuture<T> f,
637             CompletionStage<? extends T> g,
638             Function<? super T,U> a);
639        public abstract <T> CompletableFuture<Void> acceptEither
640            (CompletableFuture<T> f,
641             CompletionStage<? extends T> g,
642             Consumer<? super T> a);
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 <
654 <
655 <    }
656 <
657 <    /**
658 <     * exceptionally action completes with function value on source
659 <     * exception; otherwise with source value
660 <     */
661 <    public void testExceptionally() {
662 <        CompletableFuture<Integer> f = new CompletableFuture<>();
663 <        ExceptionToInteger r = new ExceptionToInteger();
664 <        CompletableFuture<Integer> g = f.exceptionally(r);
665 <        f.completeExceptionally(new CFException());
666 <        checkCompletedNormally(g, three);
667 <
668 <        f = new CompletableFuture<>();
669 <        r = new ExceptionToInteger();
670 <        g = f.exceptionally(r);
671 <        f.complete(one);
672 <        checkCompletedNormally(g, one);
673 <    }
674 <
675 <    /**
676 <     * handle action completes normally with function value on either
677 <     * normal or exceptional completion of source
678 <     */
679 <    public void testHandle() {
680 <        CompletableFuture<Integer> f, g;
681 <        IntegerHandler r;
682 <
683 <        f = new CompletableFuture<>();
684 <        f.completeExceptionally(new CFException());
685 <        g = f.handle(r = new IntegerHandler());
686 <        assertTrue(r.ran);
687 <        checkCompletedNormally(g, three);
688 <
689 <        f = new CompletableFuture<>();
690 <        g = f.handle(r = new IntegerHandler());
691 <        assertFalse(r.ran);
692 <        f.completeExceptionally(new CFException());
693 <        checkCompletedNormally(g, three);
694 <        assertTrue(r.ran);
695 <
696 <        f = new CompletableFuture<>();
697 <        f.complete(one);
698 <        g = f.handle(r = new IntegerHandler());
699 <        assertTrue(r.ran);
700 <        checkCompletedNormally(g, two);
701 <
702 <        f = new CompletableFuture<>();
703 <        g = f.handle(r = new IntegerHandler());
704 <        assertFalse(r.ran);
705 <        f.complete(one);
706 <        assertTrue(r.ran);
707 <        checkCompletedNormally(g, two);
708 <    }
709 <
710 <    /**
711 <     * runAsync completes after running Runnable
712 <     */
713 <    public void testRunAsync() {
714 <        Noop r = new Noop();
715 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
716 <        assertNull(f.join());
717 <        assertTrue(r.ran);
718 <        checkCompletedNormally(f, null);
719 <    }
720 <
721 <    /**
722 <     * runAsync with executor completes after running Runnable
723 <     */
724 <    public void testRunAsync2() {
725 <        Noop r = new Noop();
726 <        ThreadExecutor exec = new ThreadExecutor();
727 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
728 <        assertNull(f.join());
729 <        assertTrue(r.ran);
730 <        checkCompletedNormally(f, null);
731 <        assertEquals(1, exec.count.get());
732 <    }
733 <
734 <    /**
735 <     * failing runAsync completes exceptionally after running Runnable
736 <     */
737 <    public void testRunAsync3() {
738 <        FailingNoop r = new FailingNoop();
739 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
740 <        checkCompletedWithWrappedCFException(f);
741 <        assertTrue(r.ran);
742 <    }
743 <
744 <    /**
745 <     * supplyAsync completes with result of supplier
746 <     */
747 <    public void testSupplyAsync() {
748 <        CompletableFuture<Integer> f;
749 <        f = CompletableFuture.supplyAsync(supplyOne);
750 <        assertEquals(f.join(), one);
751 <        checkCompletedNormally(f, one);
752 <    }
753 <
754 <    /**
755 <     * supplyAsync with executor completes with result of supplier
756 <     */
757 <    public void testSupplyAsync2() {
758 <        CompletableFuture<Integer> f;
759 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
760 <        assertEquals(f.join(), one);
761 <        checkCompletedNormally(f, one);
762 <    }
763 <
764 <    /**
765 <     * Failing supplyAsync completes exceptionally
766 <     */
767 <    public void testSupplyAsync3() {
768 <        FailingSupplier r = new FailingSupplier();
769 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
770 <        checkCompletedWithWrappedCFException(f);
771 <        assertTrue(r.ran);
772 <    }
773 <
774 <    // seq completion methods
775 <
776 <    /**
777 <     * thenRun result completes normally after normal completion of source
778 <     */
779 <    public void testThenRun() {
780 <        CompletableFuture<Integer> f;
781 <        CompletableFuture<Void> g;
782 <        Noop r;
783 <
784 <        f = new CompletableFuture<>();
785 <        g = f.thenRun(r = new Noop());
786 <        f.complete(null);
787 <        checkCompletedNormally(g, null);
788 <        assertTrue(r.ran);
789 <
790 <        f = new CompletableFuture<>();
791 <        f.complete(null);
792 <        g = f.thenRun(r = new Noop());
793 <        checkCompletedNormally(g, null);
794 <        assertTrue(r.ran);
795 <    }
796 <
797 <    /**
798 <     * thenRun result completes exceptionally after exceptional
799 <     * completion of source
800 <     */
801 <    public void testThenRun2() {
802 <        CompletableFuture<Integer> f;
803 <        CompletableFuture<Void> g;
804 <        Noop r;
805 <
806 <        f = new CompletableFuture<>();
807 <        g = f.thenRun(r = new Noop());
808 <        f.completeExceptionally(new CFException());
809 <        checkCompletedWithWrappedCFException(g);
810 <        assertFalse(r.ran);
811 <
812 <        f = new CompletableFuture<>();
813 <        f.completeExceptionally(new CFException());
814 <        g = f.thenRun(r = new Noop());
815 <        checkCompletedWithWrappedCFException(g);
816 <        assertFalse(r.ran);
836 >             CompletionStage<? extends T> g,
837 >             Function<? super T,U> a);
838      }
839  
840      /**
841 <     * thenRun result completes exceptionally if action does
841 >     * exceptionally action is not invoked when source completes
842 >     * normally, and source result is propagated
843       */
844 <    public void testThenRun3() {
845 <        CompletableFuture<Integer> f;
846 <        CompletableFuture<Void> g;
847 <        FailingNoop r;
848 <
849 <        f = new CompletableFuture<>();
850 <        g = f.thenRun(r = new FailingNoop());
851 <        f.complete(null);
852 <        checkCompletedWithWrappedCFException(g);
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 <        f.complete(null);
861 <        g = f.thenRun(r = new FailingNoop());
862 <        checkCompletedWithWrappedCFException(g);
836 <    }
859 >        checkCompletedNormally(g, v1);
860 >        checkCompletedNormally(f, v1);
861 >        assertEquals(0, a.get());
862 >    }}
863  
864      /**
865 <     * thenRun result completes exceptionally if source cancelled
865 >     * exceptionally action completes with function value on source
866 >     * exception
867       */
868 <    public void testThenRun4() {
869 <        CompletableFuture<Integer> f;
870 <        CompletableFuture<Void> g;
871 <        Noop r;
872 <
873 <        f = new CompletableFuture<>();
874 <        g = f.thenRun(r = new Noop());
875 <        assertTrue(f.cancel(true));
876 <        checkCompletedWithWrappedCancellationException(g);
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 <        assertTrue(f.cancel(true));
887 <        g = f.thenRun(r = new Noop());
854 <        checkCompletedWithWrappedCancellationException(g);
855 <    }
885 >        checkCompletedNormally(g, v1);
886 >        assertEquals(1, a.get());
887 >    }}
888  
889 <    /**
890 <     * thenApply result completes normally after normal completion of source
891 <     */
892 <    public void testThenApply() {
893 <        CompletableFuture<Integer> f = new CompletableFuture<>();
894 <        CompletableFuture<Integer> g = f.thenApply(inc);
895 <        f.complete(one);
896 <        checkCompletedNormally(g, two);
897 <    }
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 <    /**
908 <     * thenApply result completes exceptionally after exceptional
909 <     * completion of source
870 <     */
871 <    public void testThenApply2() {
872 <        CompletableFuture<Integer> f = new CompletableFuture<>();
873 <        CompletableFuture<Integer> g = f.thenApply(inc);
874 <        f.completeExceptionally(new CFException());
875 <        checkCompletedWithWrappedCFException(g);
876 <    }
907 >        checkCompletedWithWrappedException(g, ex2);
908 >        assertEquals(1, a.get());
909 >    }}
910  
911      /**
912 <     * thenApply result completes exceptionally if action does
912 >     * whenComplete action executes on normal completion, propagating
913 >     * source result.
914       */
915 <    public void testThenApply3() {
916 <        CompletableFuture<Integer> f = new CompletableFuture<>();
917 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
918 <        f.complete(one);
919 <        checkCompletedWithWrappedCFException(g);
920 <    }
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 <     * thenApply result completes exceptionally if source cancelled
935 <     */
936 <    public void testThenApply4() {
892 <        CompletableFuture<Integer> f = new CompletableFuture<>();
893 <        CompletableFuture<Integer> g = f.thenApply(inc);
894 <        assertTrue(f.cancel(true));
895 <        checkCompletedWithWrappedCancellationException(g);
896 <    }
933 >        checkCompletedNormally(g, v1);
934 >        checkCompletedNormally(f, v1);
935 >        assertEquals(1, a.get());
936 >    }}
937  
938      /**
939 <     * thenAccept result completes normally after normal completion of source
939 >     * whenComplete action executes on exceptional completion, propagating
940 >     * source result.
941       */
942 <    public void testThenAccept() {
943 <        CompletableFuture<Integer> f = new CompletableFuture<>();
944 <        IncAction r = new IncAction();
945 <        CompletableFuture<Void> g = f.thenAccept(r);
946 <        f.complete(one);
947 <        checkCompletedNormally(g, null);
948 <        assertEquals(r.value, (Integer) 2);
949 <    }
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 <     * thenAccept result completes exceptionally after exceptional
963 <     * completion of source
964 <     */
914 <    public void testThenAccept2() {
915 <        CompletableFuture<Integer> f = new CompletableFuture<>();
916 <        IncAction r = new IncAction();
917 <        CompletableFuture<Void> g = f.thenAccept(r);
918 <        f.completeExceptionally(new CFException());
919 <        checkCompletedWithWrappedCFException(g);
920 <    }
961 >        checkCompletedWithWrappedException(g, ex);
962 >        checkCompletedExceptionally(f, ex);
963 >        assertEquals(1, a.get());
964 >    }}
965  
966      /**
967 <     * thenAccept result completes exceptionally if action does
967 >     * whenComplete action executes on cancelled source, propagating
968 >     * CancellationException.
969       */
970 <    public void testThenAccept3() {
971 <        CompletableFuture<Integer> f = new CompletableFuture<>();
972 <        FailingConsumer r = new FailingConsumer();
973 <        CompletableFuture<Void> g = f.thenAccept(r);
974 <        f.complete(one);
975 <        checkCompletedWithWrappedCFException(g);
976 <        assertTrue(r.ran);
977 <    }
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  
934    /**
935     * thenAccept result completes exceptionally if source cancelled
936     */
937    public void testThenAccept4() {
938        CompletableFuture<Integer> f = new CompletableFuture<>();
939        IncAction r = new IncAction();
940        CompletableFuture<Void> g = f.thenAccept(r);
941        assertTrue(f.cancel(true));
988          checkCompletedWithWrappedCancellationException(g);
989 <    }
989 >        checkCancelled(f);
990 >        assertEquals(1, a.get());
991 >    }}
992  
993      /**
994 <     * thenCombine result completes normally after normal completion
995 <     * of sources
994 >     * If a whenComplete action throws an exception when triggered by
995 >     * a normal completion, it completes exceptionally
996       */
997 <    public void testThenCombine_normalCompletion1() {
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1002 <
1001 >    {
1002 >        final AtomicInteger a = new AtomicInteger(0);
1003 >        final CFException ex = new CFException();
1004          final CompletableFuture<Integer> f = new CompletableFuture<>();
1005 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1006 <        final SubtractFunction r = new SubtractFunction();
1007 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1008 <
1009 <        f.complete(v1);
1010 <        checkIncomplete(h);
1011 <        assertEquals(r.invocationCount, 0);
1012 <        g.complete(v2);
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 <        checkCompletedNormally(h, subtract(v1, v2));
1017 >        checkCompletedWithWrappedException(g, ex);
1018          checkCompletedNormally(f, v1);
1019 <        checkCompletedNormally(g, v2);
1020 <        assertEquals(r.invocationCount, 1);
968 <        }
969 <    }
1019 >        assertEquals(1, a.get());
1020 >    }}
1021  
1022 <    public void testThenCombine_normalCompletion2() {
1022 >    /**
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 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 <        for (Integer v2 : new Integer[] { 2, null }) {
1032 <
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<>();
977        final CompletableFuture<Integer> g = new CompletableFuture<>();
978        final SubtractFunction r = new SubtractFunction();
979        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1036  
1037 <        g.complete(v2);
1038 <        checkIncomplete(h);
1039 <        assertEquals(r.invocationCount, 0);
1040 <        f.complete(v1);
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 <        checkCompletedNormally(h, subtract(v1, v2));
1050 <        checkCompletedNormally(f, v1);
1051 <        checkCompletedNormally(g, v2);
1052 <        assertEquals(r.invocationCount, 1);
990 <        }
991 <    }
1049 >        checkCompletedWithWrappedException(g, ex1);
1050 >        checkCompletedExceptionally(f, ex1);
1051 >        assertEquals(1, a.get());
1052 >    }}
1053  
1054 <    public void testThenCombine_normalCompletion3() {
1054 >    /**
1055 >     * handle action completes normally with function value on normal
1056 >     * completion of source
1057 >     */
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 <        for (Integer v2 : new Integer[] { 2, null }) {
997 <
1062 >    {
1063          final CompletableFuture<Integer> f = new CompletableFuture<>();
1064 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1065 <        final SubtractFunction r = new SubtractFunction();
1066 <
1067 <        g.complete(v2);
1068 <        f.complete(v1);
1069 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        checkCompletedNormally(h, subtract(v1, v2));
1077 >        checkCompletedNormally(g, inc(v1));
1078          checkCompletedNormally(f, v1);
1079 <        checkCompletedNormally(g, v2);
1080 <        assertEquals(r.invocationCount, 1);
1010 <        }
1011 <    }
1079 >        assertEquals(1, a.get());
1080 >    }}
1081  
1082 <    public void testThenCombine_normalCompletion4() {
1082 >    /**
1083 >     * handle action completes normally with function value on
1084 >     * exceptional completion of source
1085 >     */
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1017 <
1090 >    {
1091          final CompletableFuture<Integer> f = new CompletableFuture<>();
1092 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1093 <        final SubtractFunction r = new SubtractFunction();
1094 <
1095 <        f.complete(v1);
1096 <        g.complete(v2);
1097 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        checkCompletedNormally(h, subtract(v1, v2));
1107 <        checkCompletedNormally(f, v1);
1108 <        checkCompletedNormally(g, v2);
1109 <        assertEquals(r.invocationCount, 1);
1030 <        }
1031 <    }
1106 >        checkCompletedNormally(g, v1);
1107 >        checkCompletedExceptionally(f, ex);
1108 >        assertEquals(1, a.get());
1109 >    }}
1110  
1111      /**
1112 <     * thenCombine result completes exceptionally after exceptional
1113 <     * completion of either source
1112 >     * handle action completes normally with function value on
1113 >     * cancelled source
1114       */
1115 <    public void testThenCombine_exceptionalCompletion1() {
1115 >    public void testHandle_sourceCancelled() {
1116          for (ExecutionMode m : ExecutionMode.values())
1117 <        for (Integer v1 : new Integer[] { 1, null }) {
1118 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
1123 <        final SubtractFunction r = new SubtractFunction();
1124 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1125 <        final CFException ex = new CFException();
1126 <
1127 <        f.completeExceptionally(ex);
1128 <        checkIncomplete(h);
1129 <        g.complete(v1);
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  
1051        checkCompletedWithWrappedCFException(h, ex);
1052        checkCompletedWithWrappedCFException(f, ex);
1053        assertEquals(r.invocationCount, 0);
1135          checkCompletedNormally(g, v1);
1136 <        }
1137 <    }
1136 >        checkCancelled(f);
1137 >        assertEquals(1, a.get());
1138 >    }}
1139  
1140 <    public void testThenCombine_exceptionalCompletion2() {
1140 >    /**
1141 >     * handle result completes exceptionally if action does
1142 >     */
1143 >    public void testHandle_sourceFailedActionFailed() {
1144          for (ExecutionMode m : ExecutionMode.values())
1145 <        for (Integer v1 : new Integer[] { 1, null }) {
1146 <
1145 >        for (boolean createIncomplete : new boolean[] { true, false })
1146 >    {
1147          final CompletableFuture<Integer> f = new CompletableFuture<>();
1148 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1149 <        final SubtractFunction r = new SubtractFunction();
1150 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1151 <        final CFException ex = new CFException();
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 <        g.completeExceptionally(ex);
1164 <        checkIncomplete(h);
1165 <        f.complete(v1);
1163 >        checkCompletedWithWrappedException(g, ex2);
1164 >        checkCompletedExceptionally(f, ex1);
1165 >        assertEquals(1, a.get());
1166 >    }}
1167  
1168 <        checkCompletedWithWrappedCFException(h, ex);
1073 <        checkCompletedWithWrappedCFException(g, ex);
1074 <        assertEquals(r.invocationCount, 0);
1075 <        checkCompletedNormally(f, v1);
1076 <        }
1077 <    }
1078 <
1079 <    public void testThenCombine_exceptionalCompletion3() {
1168 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1169          for (ExecutionMode m : ExecutionMode.values())
1170 <        for (Integer v1 : new Integer[] { 1, null }) {
1171 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
1085 <        final SubtractFunction r = new SubtractFunction();
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 <        g.completeExceptionally(ex);
1089 <        f.complete(v1);
1090 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1091 <
1092 <        checkCompletedWithWrappedCFException(h, ex);
1093 <        checkCompletedWithWrappedCFException(g, ex);
1094 <        assertEquals(r.invocationCount, 0);
1188 >        checkCompletedWithWrappedException(g, ex);
1189          checkCompletedNormally(f, v1);
1190 <        }
1191 <    }
1098 <
1099 <    public void testThenCombine_exceptionalCompletion4() {
1100 <        for (ExecutionMode m : ExecutionMode.values())
1101 <        for (Integer v1 : new Integer[] { 1, null }) {
1102 <
1103 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1104 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1105 <        final SubtractFunction r = new SubtractFunction();
1106 <        final CFException ex = new CFException();
1190 >        assertEquals(1, a.get());
1191 >    }}
1192  
1193 <        f.completeExceptionally(ex);
1194 <        g.complete(v1);
1195 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1193 >    /**
1194 >     * runAsync completes after running Runnable
1195 >     */
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 <        checkCompletedWithWrappedCFException(h, ex);
1211 <        checkCompletedWithWrappedCFException(f, ex);
1212 <        assertEquals(r.invocationCount, 0);
1213 <        checkCompletedNormally(g, v1);
1214 <        }
1215 <    }
1210 >    /**
1211 >     * failing runAsync completes exceptionally after running Runnable
1212 >     */
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 <     * thenCombine result completes exceptionally if action does
1227 >     * supplyAsync completes with result of supplier
1228       */
1229 <    public void testThenCombine_actionFailed1() {
1230 <        for (ExecutionMode m : ExecutionMode.values())
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1237 <
1238 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1239 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1240 <        final FailingBiFunction r = new FailingBiFunction();
1241 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        f.complete(v1);
1245 <        checkIncomplete(h);
1246 <        g.complete(v2);
1244 >    /**
1245 >     * Failing supplyAsync completes exceptionally
1246 >     */
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 <        checkCompletedWithWrappedCFException(h);
1137 <        checkCompletedNormally(f, v1);
1138 <        checkCompletedNormally(g, v2);
1139 <        }
1140 <    }
1260 >    // seq completion methods
1261  
1262 <    public void testThenCombine_actionFailed2() {
1262 >    /**
1263 >     * thenRun result completes normally after normal completion of source
1264 >     */
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 }) {
1146 <
1269 >    {
1270          final CompletableFuture<Integer> f = new CompletableFuture<>();
1271 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1272 <        final FailingBiFunction r = new FailingBiFunction();
1273 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1274 <
1275 <        g.complete(v2);
1276 <        checkIncomplete(h);
1277 <        f.complete(v1);
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 <        checkCompletedWithWrappedCFException(h);
1279 >        checkCompletedNormally(g, null);
1280          checkCompletedNormally(f, v1);
1281 <        checkCompletedNormally(g, v2);
1282 <        }
1160 <    }
1281 >        r.assertInvoked();
1282 >    }}
1283  
1284      /**
1285 <     * thenCombine result completes exceptionally if either source cancelled
1285 >     * thenRun result completes exceptionally after exceptional
1286 >     * completion of source
1287       */
1288 <    public void testThenCombine_sourceCancelled1() {
1288 >    public void testThenRun_exceptionalCompletion() {
1289          for (ExecutionMode m : ExecutionMode.values())
1290 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1291 <        for (Integer v1 : new Integer[] { 1, null }) {
1292 <
1290 >        for (boolean createIncomplete : new boolean[] { true, false })
1291 >    {
1292 >        final CFException ex = new CFException();
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 <
1298 <        assertTrue(f.cancel(mayInterruptIfRunning));
1299 <        checkIncomplete(h);
1177 <        g.complete(v1);
1178 <
1179 <        checkCompletedWithWrappedCancellationException(h);
1180 <        checkCancelled(f);
1181 <        assertEquals(r.invocationCount, 0);
1182 <        checkCompletedNormally(g, 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          }
1184    }
1185
1186    public void testThenCombine_sourceCancelled2() {
1187        for (ExecutionMode m : ExecutionMode.values())
1188        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1189        for (Integer v1 : new Integer[] { 1, null }) {
1190
1191        final CompletableFuture<Integer> f = new CompletableFuture<>();
1192        final CompletableFuture<Integer> g = new CompletableFuture<>();
1193        final SubtractFunction r = new SubtractFunction();
1194        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1301  
1302 <        assertTrue(g.cancel(mayInterruptIfRunning));
1303 <        checkIncomplete(h);
1304 <        f.complete(v1);
1305 <
1200 <        checkCompletedWithWrappedCancellationException(h);
1201 <        checkCancelled(g);
1202 <        assertEquals(r.invocationCount, 0);
1203 <        checkCompletedNormally(f, v1);
1204 <        }
1205 <    }
1302 >        checkCompletedWithWrappedException(g, ex);
1303 >        checkCompletedExceptionally(f, ex);
1304 >        r.assertNotInvoked();
1305 >    }}
1306  
1307 <    public void testThenCombine_sourceCancelled3() {
1307 >    /**
1308 >     * thenRun result completes exceptionally if source cancelled
1309 >     */
1310 >    public void testThenRun_sourceCancelled() {
1311          for (ExecutionMode m : ExecutionMode.values())
1312 +        for (boolean createIncomplete : new boolean[] { true, false })
1313          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1314 <        for (Integer v1 : new Integer[] { 1, null }) {
1211 <
1314 >    {
1315          final CompletableFuture<Integer> f = new CompletableFuture<>();
1316 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1317 <        final SubtractFunction r = new SubtractFunction();
1318 <
1319 <        assertTrue(g.cancel(mayInterruptIfRunning));
1320 <        f.complete(v1);
1321 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1219 <
1220 <        checkCompletedWithWrappedCancellationException(h);
1221 <        checkCancelled(g);
1222 <        assertEquals(r.invocationCount, 0);
1223 <        checkCompletedNormally(f, v1);
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          }
1225    }
1226
1227    public void testThenCombine_sourceCancelled4() {
1228        for (ExecutionMode m : ExecutionMode.values())
1229        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1230        for (Integer v1 : new Integer[] { 1, null }) {
1231
1232        final CompletableFuture<Integer> f = new CompletableFuture<>();
1233        final CompletableFuture<Integer> g = new CompletableFuture<>();
1234        final SubtractFunction r = new SubtractFunction();
1323  
1324 <        assertTrue(f.cancel(mayInterruptIfRunning));
1237 <        g.complete(v1);
1238 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1239 <
1240 <        checkCompletedWithWrappedCancellationException(h);
1324 >        checkCompletedWithWrappedCancellationException(g);
1325          checkCancelled(f);
1326 <        assertEquals(r.invocationCount, 0);
1327 <        checkCompletedNormally(g, v1);
1244 <        }
1245 <    }
1326 >        r.assertNotInvoked();
1327 >    }}
1328  
1329      /**
1330 <     * thenAcceptBoth result completes normally after normal
1249 <     * completion of sources
1330 >     * thenRun result completes exceptionally if action does
1331       */
1332 <    public void testThenAcceptBoth_normalCompletion1() {
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 }) {
1255 <
1336 >    {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1339 <        final SubtractAction r = new SubtractAction();
1340 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1341 <
1342 <        f.complete(v1);
1343 <        checkIncomplete(h);
1263 <        assertFalse(r.ran());
1264 <        g.complete(v2);
1265 <
1266 <        checkCompletedNormally(h, null);
1267 <        assertEquals(r.value, subtract(v1, v2));
1268 <        checkCompletedNormally(f, v1);
1269 <        checkCompletedNormally(g, v2);
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          }
1271    }
1272
1273    public void testThenAcceptBoth_normalCompletion2() {
1274        for (ExecutionMode m : ExecutionMode.values())
1275        for (Integer v1 : new Integer[] { 1, null })
1276        for (Integer v2 : new Integer[] { 2, null }) {
1345  
1346 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1279 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1280 <        final SubtractAction r = new SubtractAction();
1281 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1282 <
1283 <        g.complete(v2);
1284 <        checkIncomplete(h);
1285 <        assertFalse(r.ran());
1286 <        f.complete(v1);
1287 <
1288 <        checkCompletedNormally(h, null);
1289 <        assertEquals(r.value, subtract(v1, v2));
1346 >        checkCompletedWithWrappedCFException(g);
1347          checkCompletedNormally(f, v1);
1348 <        checkCompletedNormally(g, v2);
1292 <        }
1293 <    }
1348 >    }}
1349  
1350 <    public void testThenAcceptBoth_normalCompletion3() {
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 }) {
1299 <
1357 >    {
1358          final CompletableFuture<Integer> f = new CompletableFuture<>();
1359 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1360 <        final SubtractAction r = new SubtractAction();
1361 <
1362 <        g.complete(v2);
1363 <        f.complete(v1);
1364 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1307 <
1308 <        checkCompletedNormally(h, null);
1309 <        assertEquals(r.value, subtract(v1, v2));
1310 <        checkCompletedNormally(f, v1);
1311 <        checkCompletedNormally(g, v2);
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          }
1313    }
1314
1315    public void testThenAcceptBoth_normalCompletion4() {
1316        for (ExecutionMode m : ExecutionMode.values())
1317        for (Integer v1 : new Integer[] { 1, null })
1318        for (Integer v2 : new Integer[] { 2, null }) {
1319
1320        final CompletableFuture<Integer> f = new CompletableFuture<>();
1321        final CompletableFuture<Integer> g = new CompletableFuture<>();
1322        final SubtractAction r = new SubtractAction();
1366  
1367 <        f.complete(v1);
1325 <        g.complete(v2);
1326 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1327 <
1328 <        checkCompletedNormally(h, null);
1329 <        assertEquals(r.value, subtract(v1, v2));
1367 >        checkCompletedNormally(g, inc(v1));
1368          checkCompletedNormally(f, v1);
1369 <        checkCompletedNormally(g, v2);
1370 <        }
1333 <    }
1369 >        r.assertValue(inc(v1));
1370 >    }}
1371  
1372      /**
1373 <     * thenAcceptBoth result completes exceptionally after exceptional
1374 <     * completion of either source
1373 >     * thenApply result completes exceptionally after exceptional
1374 >     * completion of source
1375       */
1376 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1376 >    public void testThenApply_exceptionalCompletion() {
1377          for (ExecutionMode m : ExecutionMode.values())
1378 <        for (Integer v1 : new Integer[] { 1, null }) {
1379 <
1343 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1344 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1345 <        final SubtractAction r = new SubtractAction();
1346 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1378 >        for (boolean createIncomplete : new boolean[] { true, false })
1379 >    {
1380          final CFException ex = new CFException();
1348
1349        f.completeExceptionally(ex);
1350        checkIncomplete(h);
1351        g.complete(v1);
1352
1353        checkCompletedWithWrappedCFException(h, ex);
1354        checkCompletedWithWrappedCFException(f, ex);
1355        assertEquals(r.invocationCount, 0);
1356        checkCompletedNormally(g, v1);
1357        }
1358    }
1359
1360    public void testThenAcceptBoth_exceptionalCompletion2() {
1361        for (ExecutionMode m : ExecutionMode.values())
1362        for (Integer v1 : new Integer[] { 1, null }) {
1363
1381          final CompletableFuture<Integer> f = new CompletableFuture<>();
1382 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1383 <        final SubtractAction r = new SubtractAction();
1384 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1385 <        final CFException ex = new CFException();
1386 <
1387 <        g.completeExceptionally(ex);
1371 <        checkIncomplete(h);
1372 <        f.complete(v1);
1373 <
1374 <        checkCompletedWithWrappedCFException(h, ex);
1375 <        checkCompletedWithWrappedCFException(g, ex);
1376 <        assertEquals(r.invocationCount, 0);
1377 <        checkCompletedNormally(f, v1);
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          }
1379    }
1389  
1390 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1391 <        for (ExecutionMode m : ExecutionMode.values())
1392 <        for (Integer v1 : new Integer[] { 1, null }) {
1393 <
1385 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1386 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1387 <        final SubtractAction r = new SubtractAction();
1388 <        final CFException ex = new CFException();
1389 <
1390 <        g.completeExceptionally(ex);
1391 <        f.complete(v1);
1392 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1390 >        checkCompletedWithWrappedException(g, ex);
1391 >        checkCompletedExceptionally(f, ex);
1392 >        r.assertNotInvoked();
1393 >    }}
1394  
1395 <        checkCompletedWithWrappedCFException(h, ex);
1396 <        checkCompletedWithWrappedCFException(g, ex);
1397 <        assertEquals(r.invocationCount, 0);
1398 <        checkCompletedNormally(f, v1);
1398 <        }
1399 <    }
1400 <
1401 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1395 >    /**
1396 >     * thenApply result completes exceptionally if source cancelled
1397 >     */
1398 >    public void testThenApply_sourceCancelled() {
1399          for (ExecutionMode m : ExecutionMode.values())
1400 <        for (Integer v1 : new Integer[] { 1, null }) {
1401 <
1400 >        for (boolean createIncomplete : new boolean[] { true, false })
1401 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1402 >    {
1403          final CompletableFuture<Integer> f = new CompletableFuture<>();
1404 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1405 <        final SubtractAction r = new SubtractAction();
1406 <        final CFException ex = new CFException();
1407 <
1408 <        f.completeExceptionally(ex);
1409 <        g.complete(v1);
1412 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1413 <
1414 <        checkCompletedWithWrappedCFException(h, ex);
1415 <        checkCompletedWithWrappedCFException(f, ex);
1416 <        assertFalse(r.ran());
1417 <        checkCompletedNormally(g, 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          }
1411 <    }
1411 >
1412 >        checkCompletedWithWrappedCancellationException(g);
1413 >        checkCancelled(f);
1414 >        r.assertNotInvoked();
1415 >    }}
1416  
1417      /**
1418 <     * thenAcceptBoth result completes exceptionally if action does
1418 >     * thenApply result completes exceptionally if action does
1419       */
1420 <    public void testThenAcceptBoth_actionFailed1() {
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 }) {
1428 <
1424 >    {
1425          final CompletableFuture<Integer> f = new CompletableFuture<>();
1426 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1427 <        final FailingBiConsumer r = new FailingBiConsumer();
1428 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1429 <
1430 <        f.complete(v1);
1431 <        checkIncomplete(h);
1432 <        g.complete(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 >        }
1433  
1434 <        checkCompletedWithWrappedCFException(h);
1434 >        checkCompletedWithWrappedCFException(g);
1435          checkCompletedNormally(f, v1);
1436 <        checkCompletedNormally(g, v2);
1441 <        }
1442 <    }
1436 >    }}
1437  
1438 <    public void testThenAcceptBoth_actionFailed2() {
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 }) {
1448 <
1445 >    {
1446          final CompletableFuture<Integer> f = new CompletableFuture<>();
1447 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1448 <        final FailingBiConsumer r = new FailingBiConsumer();
1449 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1450 <
1451 <        g.complete(v2);
1452 <        checkIncomplete(h);
1453 <        f.complete(v1);
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 >        }
1454  
1455 <        checkCompletedWithWrappedCFException(h);
1455 >        checkCompletedNormally(g, null);
1456 >        r.assertValue(v1);
1457          checkCompletedNormally(f, v1);
1458 <        checkCompletedNormally(g, v2);
1461 <        }
1462 <    }
1458 >    }}
1459  
1460      /**
1461 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1461 >     * thenAccept result completes exceptionally after exceptional
1462 >     * completion of source
1463       */
1464 <    public void testThenAcceptBoth_sourceCancelled1() {
1464 >    public void testThenAccept_exceptionalCompletion() {
1465          for (ExecutionMode m : ExecutionMode.values())
1466 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1467 <        for (Integer v1 : new Integer[] { 1, null }) {
1468 <
1466 >        for (boolean createIncomplete : new boolean[] { true, false })
1467 >    {
1468 >        final CFException ex = new CFException();
1469          final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1471 <        final SubtractAction r = new SubtractAction();
1472 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1473 <
1474 <        assertTrue(f.cancel(mayInterruptIfRunning));
1475 <        checkIncomplete(h);
1479 <        g.complete(v1);
1480 <
1481 <        checkCompletedWithWrappedCancellationException(h);
1482 <        checkCancelled(f);
1483 <        assertEquals(r.invocationCount, 0);
1484 <        checkCompletedNormally(g, 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          }
1486    }
1487
1488    public void testThenAcceptBoth_sourceCancelled2() {
1489        for (ExecutionMode m : ExecutionMode.values())
1490        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1491        for (Integer v1 : new Integer[] { 1, null }) {
1477  
1478 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1479 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1480 <        final SubtractAction r = new SubtractAction();
1481 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1497 <
1498 <        assertTrue(g.cancel(mayInterruptIfRunning));
1499 <        checkIncomplete(h);
1500 <        f.complete(v1);
1501 <
1502 <        checkCompletedWithWrappedCancellationException(h);
1503 <        checkCancelled(g);
1504 <        assertEquals(r.invocationCount, 0);
1505 <        checkCompletedNormally(f, v1);
1506 <        }
1507 <    }
1478 >        checkCompletedWithWrappedException(g, ex);
1479 >        checkCompletedExceptionally(f, ex);
1480 >        r.assertNotInvoked();
1481 >    }}
1482  
1483 <    public void testThenAcceptBoth_sourceCancelled3() {
1483 >    /**
1484 >     * thenAccept result completes exceptionally if source cancelled
1485 >     */
1486 >    public void testThenAccept_sourceCancelled() {
1487          for (ExecutionMode m : ExecutionMode.values())
1488 +        for (boolean createIncomplete : new boolean[] { true, false })
1489          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1490 <        for (Integer v1 : new Integer[] { 1, null }) {
1513 <
1490 >    {
1491          final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1493 <        final SubtractAction r = new SubtractAction();
1494 <
1495 <        assertTrue(g.cancel(mayInterruptIfRunning));
1496 <        f.complete(v1);
1497 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1521 <
1522 <        checkCompletedWithWrappedCancellationException(h);
1523 <        checkCancelled(g);
1524 <        assertEquals(r.invocationCount, 0);
1525 <        checkCompletedNormally(f, v1);
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          }
1527    }
1528
1529    public void testThenAcceptBoth_sourceCancelled4() {
1530        for (ExecutionMode m : ExecutionMode.values())
1531        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1532        for (Integer v1 : new Integer[] { 1, null }) {
1533
1534        final CompletableFuture<Integer> f = new CompletableFuture<>();
1535        final CompletableFuture<Integer> g = new CompletableFuture<>();
1536        final SubtractAction r = new SubtractAction();
1499  
1500 <        assertTrue(f.cancel(mayInterruptIfRunning));
1539 <        g.complete(v1);
1540 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1541 <
1542 <        checkCompletedWithWrappedCancellationException(h);
1500 >        checkCompletedWithWrappedCancellationException(g);
1501          checkCancelled(f);
1502 <        assertEquals(r.invocationCount, 0);
1503 <        checkCompletedNormally(g, v1);
1546 <        }
1547 <    }
1502 >        r.assertNotInvoked();
1503 >    }}
1504  
1505      /**
1506 <     * runAfterBoth result completes normally after normal
1551 <     * completion of sources
1506 >     * thenAccept result completes exceptionally if action does
1507       */
1508 <    public void testRunAfterBoth_normalCompletion1() {
1508 >    public void testThenAccept_actionFailed() {
1509          for (ExecutionMode m : ExecutionMode.values())
1510 +        for (boolean createIncomplete : new boolean[] { true, false })
1511          for (Integer v1 : new Integer[] { 1, null })
1512 <        for (Integer v2 : new Integer[] { 2, null }) {
1557 <
1512 >    {
1513          final CompletableFuture<Integer> f = new CompletableFuture<>();
1514 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1515 <        final Noop r = new Noop();
1516 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1517 <
1518 <        f.complete(v1);
1519 <        checkIncomplete(h);
1520 <        assertFalse(r.ran);
1566 <        g.complete(v2);
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 >        }
1521  
1522 <        checkCompletedNormally(h, null);
1569 <        assertEquals(r.invocationCount, 1);
1522 >        checkCompletedWithWrappedCFException(g);
1523          checkCompletedNormally(f, v1);
1524 <        checkCompletedNormally(g, v2);
1572 <        }
1573 <    }
1524 >    }}
1525  
1526 <    public void testRunAfterBoth_normalCompletion2() {
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 fFirst : new boolean[] { true, false })
1533          for (Integer v1 : new Integer[] { 1, null })
1534 <        for (Integer v2 : new Integer[] { 2, null }) {
1535 <
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 Noop r = new Noop();
1539 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1540 <
1541 <        g.complete(v2);
1542 <        checkIncomplete(h);
1543 <        assertFalse(r.ran);
1544 <        f.complete(v1);
1545 <
1546 <        checkCompletedNormally(h, null);
1547 <        assertEquals(r.invocationCount, 1);
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          checkCompletedNormally(g, v2);
1565 <        }
1595 <    }
1565 >    }}
1566  
1567 <    public void testRunAfterBoth_normalCompletion3() {
1567 >    /**
1568 >     * thenCombine result completes exceptionally after exceptional
1569 >     * completion of either source
1570 >     */
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 }) {
1601 <
1576 >    {
1577          final CompletableFuture<Integer> f = new CompletableFuture<>();
1578          final CompletableFuture<Integer> g = new CompletableFuture<>();
1579 <        final Noop r = new Noop();
1580 <
1581 <        g.complete(v2);
1582 <        f.complete(v1);
1583 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 <
1585 <        checkCompletedNormally(h, null);
1586 <        assertTrue(r.ran);
1587 <        checkCompletedNormally(f, v1);
1588 <        checkCompletedNormally(g, v2);
1589 <        }
1590 <    }
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_normalCompletion4() {
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 }) {
1621 <
1620 >    {
1621          final CompletableFuture<Integer> f = new CompletableFuture<>();
1622          final CompletableFuture<Integer> g = new CompletableFuture<>();
1623 <        final Noop r = new Noop();
1624 <
1625 <        f.complete(v1);
1626 <        g.complete(v2);
1627 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1628 <
1629 <        checkCompletedNormally(h, null);
1630 <        assertEquals(r.invocationCount, 1);
1631 <        checkCompletedNormally(f, v1);
1632 <        checkCompletedNormally(g, v2);
1633 <        }
1634 <    }
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      /**
1655 <     * runAfterBoth result completes exceptionally after exceptional
1639 <     * completion of either source
1655 >     * thenCombine result completes exceptionally if action does
1656       */
1657 <    public void testRunAfterBoth_exceptionalCompletion1() {
1657 >    public void testThenCombine_actionFailed() {
1658          for (ExecutionMode m : ExecutionMode.values())
1659 <        for (Integer v1 : new Integer[] { 1, null }) {
1660 <
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 >    {
1663          final CompletableFuture<Integer> f = new CompletableFuture<>();
1664          final CompletableFuture<Integer> g = new CompletableFuture<>();
1665 <        final Noop r = new Noop();
1666 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1667 <        final CFException ex = new CFException();
1650 <
1651 <        f.completeExceptionally(ex);
1652 <        checkIncomplete(h);
1653 <        g.complete(v1);
1654 <
1655 <        checkCompletedWithWrappedCFException(h, ex);
1656 <        checkCompletedWithWrappedCFException(f, ex);
1657 <        assertEquals(r.invocationCount, 0);
1658 <        checkCompletedNormally(g, v1);
1659 <        }
1660 <    }
1661 <
1662 <    public void testRunAfterBoth_exceptionalCompletion2() {
1663 <        for (ExecutionMode m : ExecutionMode.values())
1664 <        for (Integer v1 : new Integer[] { 1, null }) {
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> f = new CompletableFuture<>();
1670 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1671 <        final Noop r = new Noop();
1672 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670 <        final CFException ex = new CFException();
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 <        g.completeExceptionally(ex);
1675 <        checkIncomplete(h);
1676 <        f.complete(v1);
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(h, ex);
1681 <        checkCompletedWithWrappedCFException(g, ex);
1682 <        assertEquals(r.invocationCount, 0);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682 >        checkCompletedWithWrappedCFException(h3);
1683 >        r1.assertInvoked();
1684 >        r2.assertInvoked();
1685 >        r3.assertInvoked();
1686          checkCompletedNormally(f, v1);
1687 <        }
1688 <    }
1687 >        checkCompletedNormally(g, v2);
1688 >    }}
1689  
1690 <    public void testRunAfterBoth_exceptionalCompletion3() {
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 (Integer v1 : new Integer[] { 1, null }) {
1697 <
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 >    {
1700          final CompletableFuture<Integer> f = new CompletableFuture<>();
1701          final CompletableFuture<Integer> g = new CompletableFuture<>();
1702 <        final Noop r = new Noop();
1703 <        final CFException ex = new CFException();
1704 <
1705 <        g.completeExceptionally(ex);
1706 <        f.complete(v1);
1707 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1708 <
1709 <        checkCompletedWithWrappedCFException(h, ex);
1710 <        checkCompletedWithWrappedCFException(g, ex);
1711 <        assertEquals(r.invocationCount, 0);
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 <        }
1729 <    }
1728 >        checkCompletedNormally(g, v2);
1729 >    }}
1730  
1731 <    public void testRunAfterBoth_exceptionalCompletion4() {
1731 >    /**
1732 >     * thenAcceptBoth result completes exceptionally after exceptional
1733 >     * completion of either source
1734 >     */
1735 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1736          for (ExecutionMode m : ExecutionMode.values())
1737 <        for (Integer v1 : new Integer[] { 1, null }) {
1738 <
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<>();
1709        final Noop r = new Noop();
1743          final CFException ex = new CFException();
1744 <
1745 <        f.completeExceptionally(ex);
1746 <        g.complete(v1);
1747 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1748 <
1749 <        checkCompletedWithWrappedCFException(h, ex);
1750 <        checkCompletedWithWrappedCFException(f, ex);
1751 <        assertEquals(r.invocationCount, 0);
1752 <        checkCompletedNormally(g, v1);
1753 <        }
1754 <    }
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      /**
1776 <     * runAfterBoth result completes exceptionally if action does
1776 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1777       */
1778 <    public void testRunAfterBoth_actionFailed1() {
1778 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1779          for (ExecutionMode m : ExecutionMode.values())
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1730 <
1784 >    {
1785          final CompletableFuture<Integer> f = new CompletableFuture<>();
1786          final CompletableFuture<Integer> g = new CompletableFuture<>();
1787 <        final FailingNoop r = new FailingNoop();
1788 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        f.complete(v1);
1819 <        checkIncomplete(h);
1820 <        g.complete(v2);
1821 <
1740 <        checkCompletedWithWrappedCFException(h);
1741 <        checkCompletedNormally(f, v1);
1742 <        checkCompletedNormally(g, v2);
1743 <        }
1744 <    }
1745 <
1746 <    public void testRunAfterBoth_actionFailed2() {
1818 >    /**
1819 >     * thenAcceptBoth result completes exceptionally if action does
1820 >     */
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);
1829 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1830 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1831 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1832  
1833 <        g.complete(v2);
1834 <        checkIncomplete(h);
1835 <        f.complete(v1);
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 <        checkCompletedWithWrappedCFException(h);
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 <        }
1764 <    }
1852 >    }}
1853  
1854      /**
1855 <     * runAfterBoth result completes exceptionally if either source cancelled
1855 >     * runAfterBoth result completes normally after normal
1856 >     * completion of sources
1857       */
1858 <    public void testRunAfterBoth_sourceCancelled1() {
1858 >    public void testRunAfterBoth_normalCompletion() {
1859          for (ExecutionMode m : ExecutionMode.values())
1860 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1861 <        for (Integer v1 : new Integer[] { 1, null }) {
1862 <
1863 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1775 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1776 <        final Noop r = new Noop();
1777 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1778 <
1779 <        assertTrue(f.cancel(mayInterruptIfRunning));
1780 <        checkIncomplete(h);
1781 <        g.complete(v1);
1782 <
1783 <        checkCompletedWithWrappedCancellationException(h);
1784 <        checkCancelled(f);
1785 <        assertEquals(r.invocationCount, 0);
1786 <        checkCompletedNormally(g, v1);
1787 <        }
1788 <    }
1789 <
1790 <    public void testRunAfterBoth_sourceCancelled2() {
1791 <        for (ExecutionMode m : ExecutionMode.values())
1792 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1793 <        for (Integer v1 : new Integer[] { 1, null }) {
1794 <
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 >    {
1864          final CompletableFuture<Integer> f = new CompletableFuture<>();
1865          final CompletableFuture<Integer> g = new CompletableFuture<>();
1866 <        final Noop r = new Noop();
1867 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1868 <
1869 <        assertTrue(g.cancel(mayInterruptIfRunning));
1870 <        checkIncomplete(h);
1871 <        f.complete(v1);
1872 <
1873 <        checkCompletedWithWrappedCancellationException(h);
1874 <        checkCancelled(g);
1875 <        assertEquals(r.invocationCount, 0);
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 <        }
1893 <    }
1892 >        checkCompletedNormally(g, v2);
1893 >    }}
1894  
1895 <    public void testRunAfterBoth_sourceCancelled3() {
1895 >    /**
1896 >     * runAfterBoth result completes exceptionally after exceptional
1897 >     * completion of either source
1898 >     */
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 <
1909 <        assertTrue(g.cancel(mayInterruptIfRunning));
1910 <        f.complete(v1);
1911 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1912 <
1913 <        checkCompletedWithWrappedCancellationException(h);
1914 <        checkCancelled(g);
1915 <        assertEquals(r.invocationCount, 0);
1916 <        checkCompletedNormally(f, v1);
1917 <        }
1918 <    }
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_sourceCancelled4() {
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 <
1953 <        assertTrue(f.cancel(mayInterruptIfRunning));
1954 <        g.complete(v1);
1955 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1956 <
1957 <        checkCompletedWithWrappedCancellationException(h);
1958 <        checkCancelled(f);
1959 <        assertEquals(r.invocationCount, 0);
1960 <        checkCompletedNormally(g, v1);
1961 <        }
1962 <    }
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      /**
1983 <     * applyToEither result completes normally after normal completion
1853 <     * of either source
1983 >     * runAfterBoth result completes exceptionally if action does
1984       */
1985 <    public void testApplyToEither_normalCompletion1() {
1985 >    public void testRunAfterBoth_actionFailed() {
1986          for (ExecutionMode m : ExecutionMode.values())
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 <
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 IncFunction r = new IncFunction();
1994 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1993 >        final FailingRunnable r1 = new FailingRunnable(m);
1994 >        final FailingRunnable r2 = new FailingRunnable(m);
1995 >        final FailingRunnable r3 = new FailingRunnable(m);
1996  
1997 <        f.complete(v1);
1998 <        checkCompletedNormally(h, inc(v1));
1999 <        g.complete(v2);
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          checkCompletedNormally(g, v2);
2016 <        checkCompletedNormally(h, inc(v1));
1872 <        }
1873 <    }
2016 >    }}
2017  
2018 <    public void testApplyToEither_normalCompletion2() {
2018 >    /**
2019 >     * applyToEither result completes normally after normal completion
2020 >     * of either source
2021 >     */
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);
1884 <
1885 <        g.complete(v2);
1886 <        checkCompletedNormally(h, inc(v2));
1887 <        f.complete(v1);
1888 <
1889 <        checkCompletedNormally(f, v1);
1890 <        checkCompletedNormally(g, v2);
1891 <        checkCompletedNormally(h, inc(v2));
1892 <        }
1893 <    }
1894 <    public void testApplyToEither_normalCompletion3() {
1895 <        for (ExecutionMode m : ExecutionMode.values())
1896 <        for (Integer v1 : new Integer[] { 1, null })
1897 <        for (Integer v2 : new Integer[] { 2, null }) {
1898 <
1899 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1900 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1901 <        final IncFunction r = new IncFunction();
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(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 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2046 >
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(r.invocationCount, 1);
2064 <        }
1915 <    }
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<>();
1927        final IncFunction r = new IncFunction();
1928        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(r.invocationCount, 0);
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())
1944 <        for (Integer v1 : new Integer[] { 1, null }) {
1945 <
1946 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1947 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1948 <        final IncFunction r = new IncFunction();
1949 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1950 <        final CFException ex = new CFException();
1951 <
1952 <        g.completeExceptionally(ex);
1953 <        checkCompletedWithWrappedCFException(h, ex);
1954 <        f.complete(v1);
1955 <
1956 <        assertEquals(r.invocationCount, 0);
1957 <        checkCompletedNormally(f, v1);
1958 <        checkCompletedWithWrappedCFException(g, ex);
1959 <        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          }
1961    }
1962
1963    public void testApplyToEither_exceptionalCompletion3() {
1964        for (ExecutionMode m : ExecutionMode.values())
1965        for (Integer v1 : new Integer[] { 1, null }) {
1966
1967        final CompletableFuture<Integer> f = new CompletableFuture<>();
1968        final CompletableFuture<Integer> g = new CompletableFuture<>();
1969        final IncFunction r = new IncFunction();
1970        final CFException ex = new CFException();
1971
1972        g.completeExceptionally(ex);
1973        f.complete(v1);
1974        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1975
1976        // unspecified behavior
1977        Integer v;
2105          try {
2106 <            assertEquals(h.join(), inc(v1));
2107 <            assertEquals(r.invocationCount, 1);
2106 >            assertEquals(inc(v1), h5.join());
2107 >            rs[5].assertValue(inc(v1));
2108          } catch (CompletionException ok) {
2109 <            checkCompletedWithWrappedCFException(h, ex);
2110 <            assertEquals(r.invocationCount, 0);
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<>();
1997        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
2005 <        Integer v;
2141 >        // unspecified behavior - both source completions available
2142          try {
2143 <            assertEquals(h.join(), inc(v1));
2144 <            assertEquals(r.invocationCount, 1);
2143 >            assertEquals(inc(v1), h0.join());
2144 >            rs[0].assertValue(inc(v1));
2145          } catch (CompletionException ok) {
2146 <            checkCompletedWithWrappedCFException(h, ex);
2147 <            assertEquals(r.invocationCount, 0);
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();
2030 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2031 <
2032 <        f.complete(v1);
2033 <        checkCompletedWithWrappedCFException(h);
2034 <        g.complete(v2);
2035 <        checkCompletedNormally(f, v1);
2036 <        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          }
2038    }
2039
2040    public void testApplyToEither_actionFailed2() {
2041        for (ExecutionMode m : ExecutionMode.values())
2042        for (Integer v1 : new Integer[] { 1, null })
2043        for (Integer v2 : new Integer[] { 2, null }) {
2044
2045        final CompletableFuture<Integer> f = new CompletableFuture<>();
2046        final CompletableFuture<Integer> g = new CompletableFuture<>();
2047        final FailingFunction r = new FailingFunction();
2048        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2170  
2050        g.complete(v2);
2051        checkCompletedWithWrappedCFException(h);
2052        f.complete(v1);
2171          checkCompletedNormally(f, v1);
2172 <        checkCompletedNormally(g, v2);
2173 <        }
2056 <    }
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);
2076        assertEquals(r.invocationCount, 0);
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(r.invocationCount, 0);
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          }
2101    }
2102
2103    public void testApplyToEither_sourceCancelled3() {
2104        for (ExecutionMode m : ExecutionMode.values())
2105        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2106        for (Integer v1 : new Integer[] { 1, null }) {
2107
2108        final CompletableFuture<Integer> f = new CompletableFuture<>();
2109        final CompletableFuture<Integer> g = new CompletableFuture<>();
2110        final IncFunction r = new IncFunction();
2111
2112        assertTrue(g.cancel(mayInterruptIfRunning));
2113        f.complete(v1);
2114        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2115
2116        // unspecified behavior
2117        Integer v;
2256          try {
2257 <            assertEquals(h.join(), inc(v1));
2258 <            assertEquals(r.invocationCount, 1);
2257 >            assertEquals(inc(v1), h1.join());
2258 >            rs[1].assertValue(inc(v1));
2259          } catch (CompletionException ok) {
2260 <            checkCompletedWithWrappedCancellationException(h);
2261 <            assertEquals(r.invocationCount, 0);
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          }
2129    }
2130
2131    public void testApplyToEither_sourceCancelled4() {
2132        for (ExecutionMode m : ExecutionMode.values())
2133        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2134        for (Integer v1 : new Integer[] { 1, null }) {
2135
2136        final CompletableFuture<Integer> f = new CompletableFuture<>();
2137        final CompletableFuture<Integer> g = new CompletableFuture<>();
2138        final IncFunction r = new IncFunction();
2139
2140        assertTrue(f.cancel(mayInterruptIfRunning));
2141        g.complete(v1);
2142        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2143
2144        // unspecified behavior
2145        Integer v;
2270          try {
2271 <            assertEquals(h.join(), inc(v1));
2272 <            assertEquals(r.invocationCount, 1);
2271 >            assertEquals(inc(v1), h3.join());
2272 >            rs[3].assertValue(inc(v1));
2273          } catch (CompletionException ok) {
2274 <            checkCompletedWithWrappedCancellationException(h);
2275 <            assertEquals(r.invocationCount, 0);
2274 >            checkCompletedWithWrappedCancellationException(h3);
2275 >            rs[3].assertNotInvoked();
2276          }
2277  
2278 <        checkCancelled(f);
2279 <        checkCompletedNormally(g, v1);
2280 <        }
2157 <    }
2278 >        checkCompletedNormally(f, v1);
2279 >        checkCancelled(g);
2280 >    }}
2281  
2282      /**
2283 <     * acceptEither result completes normally after normal completion
2161 <     * 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);
2301 <
2302 <        checkCompletedNormally(f, v1);
2303 <        checkCompletedNormally(g, v2);
2304 <        checkCompletedNormally(h, null);
2181 <        }
2182 <    }
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 <    public void testAcceptEither_normalCompletion2() {
2185 <        for (ExecutionMode m : ExecutionMode.values())
2186 <        for (Integer v1 : new Integer[] { 1, null })
2187 <        for (Integer v2 : new Integer[] { 2, null }) {
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();
2192 <        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  
2217        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<>();
2237        final IncAction r = new IncAction();
2238        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);
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 <        assertEquals(r.invocationCount, 0);
2246 <        checkCompletedNormally(g, v1);
2247 <        checkCompletedWithWrappedCFException(f, ex);
2248 <        checkCompletedWithWrappedCFException(h, ex);
2249 <        }
2250 <    }
2251 <
2252 <    public void testAcceptEither_exceptionalCompletion2() {
2253 <        for (ExecutionMode m : ExecutionMode.values())
2254 <        for (Integer v1 : new Integer[] { 1, null }) {
2255 <
2256 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2257 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2258 <        final IncAction r = new IncAction();
2259 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2260 <        final CFException ex = new CFException();
2261 <
2262 <        g.completeExceptionally(ex);
2263 <        checkCompletedWithWrappedCFException(h, ex);
2264 <        f.complete(v1);
2403 >        g.complete(v1);
2404  
2405 <        assertEquals(r.invocationCount, 0);
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          }
2271    }
2272
2273    public void testAcceptEither_exceptionalCompletion3() {
2274        for (ExecutionMode m : ExecutionMode.values())
2275        for (Integer v1 : new Integer[] { 1, null }) {
2276
2277        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279        final IncAction r = new IncAction();
2280        final CFException ex = new CFException();
2281
2282        g.completeExceptionally(ex);
2283        f.complete(v1);
2284        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2285
2286        // unspecified behavior
2287        Integer v;
2415          try {
2416 <            assertEquals(h.join(), null);
2417 <            assertEquals(r.invocationCount, 1);
2291 <            assertEquals(inc(v1), r.value);
2416 >            assertNull(h5.join());
2417 >            rs[5].assertValue(v1);
2418          } catch (CompletionException ok) {
2419 <            checkCompletedWithWrappedCFException(h, ex);
2420 <            assertEquals(r.invocationCount, 0);
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<>();
2308        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
2316 <        Integer v;
2451 >        // unspecified behavior - both source completions available
2452          try {
2453 <            assertEquals(h.join(), null);
2454 <            assertEquals(r.invocationCount, 1);
2320 <            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(r.invocationCount, 0);
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();
2342 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2343 <
2344 <        f.complete(v1);
2345 <        checkCompletedWithWrappedCFException(h);
2346 <        g.complete(v2);
2347 <        checkCompletedNormally(f, v1);
2348 <        checkCompletedNormally(g, v2);
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          }
2350    }
2351
2352    public void testAcceptEither_actionFailed2() {
2353        for (ExecutionMode m : ExecutionMode.values())
2354        for (Integer v1 : new Integer[] { 1, null })
2355        for (Integer v2 : new Integer[] { 2, null }) {
2356
2357        final CompletableFuture<Integer> f = new CompletableFuture<>();
2358        final CompletableFuture<Integer> g = new CompletableFuture<>();
2359        final FailingConsumer r = new FailingConsumer();
2360        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2480  
2362        g.complete(v2);
2363        checkCompletedWithWrappedCFException(h);
2364        f.complete(v1);
2481          checkCompletedNormally(f, v1);
2482 <        checkCompletedNormally(g, v2);
2483 <        }
2368 <    }
2482 >        checkCompletedExceptionally(g, ex);
2483 >    }}
2484  
2485      /**
2486       * acceptEither result completes exceptionally if either source cancelled
2487       */
2488 <    public void testAcceptEither_sourceCancelled1() {
2374 <        for (ExecutionMode m : ExecutionMode.values())
2375 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2376 <        for (Integer v1 : new Integer[] { 1, null }) {
2377 <
2378 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2379 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2380 <        final IncAction r = new IncAction();
2381 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2382 <
2383 <        assertTrue(f.cancel(mayInterruptIfRunning));
2384 <        checkCompletedWithWrappedCancellationException(h);
2385 <        g.complete(v1);
2386 <
2387 <        checkCancelled(f);
2388 <        assertEquals(r.invocationCount, 0);
2389 <        checkCompletedNormally(g, v1);
2390 <        checkCompletedWithWrappedCancellationException(h);
2391 <        }
2392 <    }
2393 <
2394 <    public void testAcceptEither_sourceCancelled2() {
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 <
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);
2403 <
2404 <        assertTrue(g.cancel(mayInterruptIfRunning));
2405 <        checkCompletedWithWrappedCancellationException(h);
2406 <        f.complete(v1);
2407 <
2408 <        checkCancelled(g);
2409 <        assertEquals(r.invocationCount, 0);
2410 <        checkCompletedNormally(f, v1);
2411 <        checkCompletedWithWrappedCancellationException(h);
2412 <        }
2413 <    }
2414 <
2415 <    public void testAcceptEither_sourceCancelled3() {
2416 <        for (ExecutionMode m : ExecutionMode.values())
2417 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2418 <        for (Integer v1 : new Integer[] { 1, null }) {
2495 >        final NoopConsumer[] rs = new NoopConsumer[6];
2496 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2497  
2498 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2499 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2500 <        final IncAction r = new IncAction();
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 <        assertTrue(g.cancel(mayInterruptIfRunning));
2425 <        f.complete(v1);
2426 <        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(r.invocationCount, 1);
2433 <            assertEquals(inc(v1), r.value);
2518 >            assertNull(h4.join());
2519 >            rs[4].assertValue(v1);
2520          } catch (CompletionException ok) {
2521 <            checkCompletedWithWrappedCancellationException(h);
2522 <            assertEquals(r.invocationCount, 0);
2521 >            checkCompletedWithWrappedCancellationException(h4);
2522 >            rs[4].assertNotInvoked();
2523          }
2438
2439        checkCancelled(g);
2440        checkCompletedNormally(f, v1);
2441        }
2442    }
2443
2444    public void testAcceptEither_sourceCancelled4() {
2445        for (ExecutionMode m : ExecutionMode.values())
2446        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2447        for (Integer v1 : new Integer[] { 1, null }) {
2448
2449        final CompletableFuture<Integer> f = new CompletableFuture<>();
2450        final CompletableFuture<Integer> g = new CompletableFuture<>();
2451        final IncAction r = new IncAction();
2452
2453        assertTrue(f.cancel(mayInterruptIfRunning));
2454        g.complete(v1);
2455        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2456
2457        // unspecified behavior
2458        Integer v;
2524          try {
2525 <            assertEquals(h.join(), null);
2526 <            assertEquals(r.invocationCount, 1);
2462 <            assertEquals(inc(v1), r.value);
2525 >            assertNull(h5.join());
2526 >            rs[5].assertValue(v1);
2527          } catch (CompletionException ok) {
2528 <            checkCompletedWithWrappedCancellationException(h);
2529 <            assertEquals(r.invocationCount, 0);
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
2475 <     * 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(r.invocationCount, 1);
2559 <        g.complete(v2);
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 <        checkCompletedNormally(f, v1);
2493 <        checkCompletedNormally(g, v2);
2494 <        checkCompletedNormally(h, null);
2495 <        assertEquals(r.invocationCount, 1);
2496 <        }
2497 <    }
2498 <
2499 <    public void testRunAfterEither_normalCompletion2() {
2500 <        for (ExecutionMode m : ExecutionMode.values())
2501 <        for (Integer v1 : new Integer[] { 1, null })
2502 <        for (Integer v2 : new Integer[] { 2, null }) {
2565 >        g.complete(v2);
2566  
2567 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2568 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2569 <        final Noop r = new Noop();
2507 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
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 <        g.complete(v2);
2572 <        checkCompletedNormally(h, null);
2573 <        assertEquals(r.invocationCount, 1);
2574 <        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(r.invocationCount, 1);
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);
2531        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(r.invocationCount, 1);
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<>();
2550        final Noop r = new Noop();
2551        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(r.invocationCount, 0);
2649 <        checkCompletedNormally(g, v1);
2650 <        checkCompletedWithWrappedCFException(f, ex);
2651 <        checkCompletedWithWrappedCFException(h, ex);
2652 <        }
2653 <    }
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 <    public void testRunAfterEither_exceptionalCompletion2() {
2566 <        for (ExecutionMode m : ExecutionMode.values())
2567 <        for (Integer v1 : new Integer[] { 1, null }) {
2658 >        assertTrue(g.complete(v1));
2659  
2660 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2661 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2662 <        final Noop r = new Noop();
2663 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2664 <        final CFException ex = new CFException();
2665 <
2666 <        g.completeExceptionally(ex);
2667 <        checkCompletedWithWrappedCFException(h, ex);
2668 <        f.complete(v1);
2578 <
2579 <        assertEquals(r.invocationCount, 0);
2580 <        checkCompletedNormally(f, v1);
2581 <        checkCompletedWithWrappedCFException(g, ex);
2582 <        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          }
2584    }
2585
2586    public void testRunAfterEither_exceptionalCompletion3() {
2587        for (ExecutionMode m : ExecutionMode.values())
2588        for (Integer v1 : new Integer[] { 1, null }) {
2589
2590        final CompletableFuture<Integer> f = new CompletableFuture<>();
2591        final CompletableFuture<Integer> g = new CompletableFuture<>();
2592        final Noop r = new Noop();
2593        final CFException ex = new CFException();
2594
2595        g.completeExceptionally(ex);
2596        f.complete(v1);
2597        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2598
2599        // unspecified behavior
2600        Integer v;
2670          try {
2671 <            assertEquals(h.join(), null);
2672 <            assertEquals(r.invocationCount, 1);
2671 >            assertNull(h5.join());
2672 >            rs[5].assertInvoked();
2673          } catch (CompletionException ok) {
2674 <            checkCompletedWithWrappedCFException(h, ex);
2675 <            assertEquals(r.invocationCount, 0);
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<>();
2620        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
2628 <        Integer v;
2706 >        // unspecified behavior - both source completions available
2707          try {
2708 <            assertEquals(h.join(), null);
2709 <            assertEquals(r.invocationCount, 1);
2708 >            assertEquals(null, h0.join());
2709 >            rs[0].assertInvoked();
2710          } catch (CompletionException ok) {
2711 <            checkCompletedWithWrappedCFException(h, ex);
2712 <            assertEquals(r.invocationCount, 0);
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();
2653 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2654 <
2655 <        f.complete(v1);
2656 <        checkCompletedWithWrappedCFException(h);
2657 <        g.complete(v2);
2658 <        checkCompletedNormally(f, v1);
2659 <        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          }
2661    }
2662
2663    public void testRunAfterEither_actionFailed2() {
2664        for (ExecutionMode m : ExecutionMode.values())
2665        for (Integer v1 : new Integer[] { 1, null })
2666        for (Integer v2 : new Integer[] { 2, null }) {
2667
2668        final CompletableFuture<Integer> f = new CompletableFuture<>();
2669        final CompletableFuture<Integer> g = new CompletableFuture<>();
2670        final FailingNoop r = new FailingNoop();
2671        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2735  
2673        g.complete(v2);
2674        checkCompletedWithWrappedCFException(h);
2675        f.complete(v1);
2736          checkCompletedNormally(f, v1);
2737 <        checkCompletedNormally(g, v2);
2738 <        }
2679 <    }
2737 >        checkCompletedExceptionally(g, ex);
2738 >    }}
2739  
2740      /**
2741       * runAfterEither result completes exceptionally if either source cancelled
2742       */
2743 <    public void testRunAfterEither_sourceCancelled1() {
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);
2750 >        final Noop[] rs = new Noop[6];
2751 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2752  
2753 <        assertTrue(f.cancel(mayInterruptIfRunning));
2754 <        checkCompletedWithWrappedCancellationException(h);
2755 <        g.complete(v1);
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 <        checkCancelled(f);
2699 <        assertEquals(r.invocationCount, 0);
2700 <        checkCompletedNormally(g, v1);
2701 <        checkCompletedWithWrappedCancellationException(h);
2702 <        }
2703 <    }
2704 <
2705 <    public void testRunAfterEither_sourceCancelled2() {
2706 <        for (ExecutionMode m : ExecutionMode.values())
2707 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2708 <        for (Integer v1 : new Integer[] { 1, null }) {
2709 <
2710 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2711 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2712 <        final Noop r = new Noop();
2713 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2714 <
2715 <        assertTrue(g.cancel(mayInterruptIfRunning));
2716 <        checkCompletedWithWrappedCancellationException(h);
2717 <        f.complete(v1);
2767 >        assertTrue(g.complete(v1));
2768  
2769 <        checkCancelled(g);
2770 <        assertEquals(r.invocationCount, 0);
2771 <        checkCompletedNormally(f, v1);
2772 <        checkCompletedWithWrappedCancellationException(h);
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 >            assertNull(h4.join());
2774 >            rs[4].assertInvoked();
2775 >        } catch (CompletionException ok) {
2776 >            checkCompletedWithWrappedCancellationException(h4);
2777 >            rs[4].assertNotInvoked();
2778          }
2724    }
2725
2726    public void testRunAfterEither_sourceCancelled3() {
2727        for (ExecutionMode m : ExecutionMode.values())
2728        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2729        for (Integer v1 : new Integer[] { 1, null }) {
2730
2731        final CompletableFuture<Integer> f = new CompletableFuture<>();
2732        final CompletableFuture<Integer> g = new CompletableFuture<>();
2733        final Noop r = new Noop();
2734
2735        assertTrue(g.cancel(mayInterruptIfRunning));
2736        f.complete(v1);
2737        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2738
2739        // unspecified behavior
2740        Integer v;
2779          try {
2780 <            assertEquals(h.join(), null);
2781 <            assertEquals(r.invocationCount, 1);
2780 >            assertNull(h5.join());
2781 >            rs[5].assertInvoked();
2782          } catch (CompletionException ok) {
2783 <            checkCompletedWithWrappedCancellationException(h);
2784 <            assertEquals(r.invocationCount, 0);
2783 >            checkCompletedWithWrappedCancellationException(h5);
2784 >            rs[5].assertNotInvoked();
2785          }
2786  
2787 <        checkCancelled(g);
2788 <        checkCompletedNormally(f, v1);
2789 <        }
2790 <    }
2787 >        checkCancelled(f);
2788 >        checkCompletedNormally(g, v1);
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 <    public void testRunAfterEither_sourceCancelled4() {
2796 >    /**
2797 >     * runAfterEither result completes exceptionally if action does
2798 >     */
2799 >    public void testRunAfterEither_actionFailed() {
2800          for (ExecutionMode m : ExecutionMode.values())
2801 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2802 <        for (Integer v1 : new Integer[] { 1, null }) {
2803 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
2806 <        final Noop r = new Noop();
2806 >        final FailingRunnable[] rs = new FailingRunnable[6];
2807 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2808  
2809 <        assertTrue(f.cancel(mayInterruptIfRunning));
2810 <        g.complete(v1);
2811 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
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 <        // unspecified behavior
2826 <        Integer v;
2827 <        try {
2828 <            assertEquals(h.join(), null);
2771 <            assertEquals(r.invocationCount, 1);
2772 <        } catch (CompletionException ok) {
2773 <            checkCompletedWithWrappedCancellationException(h);
2774 <            assertEquals(r.invocationCount, 0);
2775 <        }
2776 <
2777 <        checkCancelled(f);
2778 <        checkCompletedNormally(g, v1);
2779 <        }
2780 <    }
2825 >        checkCompletedNormally(f, v1);
2826 >        checkCompletedNormally(g, v2);
2827 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2828 >    }}
2829  
2830      /**
2831       * thenCompose result completes normally after normal completion of source
2832       */
2833 <    public void testThenCompose() {
2834 <        CompletableFuture<Integer> f, g;
2835 <        CompletableFutureInc r;
2836 <
2837 <        f = new CompletableFuture<>();
2838 <        g = f.thenCompose(r = new CompletableFutureInc());
2839 <        f.complete(one);
2840 <        checkCompletedNormally(g, two);
2841 <        assertTrue(r.ran);
2833 >    public void testThenCompose_normalCompletion() {
2834 >        for (ExecutionMode m : ExecutionMode.values())
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(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 <        f = new CompletableFuture<>();
2845 <        f.complete(one);
2846 <        g = f.thenCompose(r = new CompletableFutureInc());
2847 <        checkCompletedNormally(g, two);
2799 <        assertTrue(r.ran);
2800 <    }
2844 >        checkCompletedNormally(g, inc(v1));
2845 >        checkCompletedNormally(f, v1);
2846 >        r.assertValue(v1);
2847 >    }}
2848  
2849      /**
2850       * thenCompose result completes exceptionally after exceptional
2851       * completion of source
2852       */
2853 <    public void testThenCompose2() {
2854 <        CompletableFuture<Integer> f, g;
2855 <        CompletableFutureInc r;
2856 <
2857 <        f = new CompletableFuture<>();
2858 <        g = f.thenCompose(r = new CompletableFutureInc());
2859 <        f.completeExceptionally(new CFException());
2860 <        checkCompletedWithWrappedCFException(g);
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(m);
2859 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2860 >        if (!createIncomplete) f.completeExceptionally(ex);
2861 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2862 >        if (createIncomplete) f.completeExceptionally(ex);
2863  
2864 <        f = new CompletableFuture<>();
2865 <        f.completeExceptionally(new CFException());
2866 <        g = f.thenCompose(r = new CompletableFutureInc());
2867 <        checkCompletedWithWrappedCFException(g);
2819 <    }
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 testThenCompose3() {
2873 <        CompletableFuture<Integer> f, g;
2874 <        FailingCompletableFutureFunction r;
2875 <
2876 <        f = new CompletableFuture<>();
2877 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2878 <        f.complete(one);
2879 <        checkCompletedWithWrappedCFException(g);
2872 >    public void testThenCompose_actionFailed() {
2873 >        for (ExecutionMode m : ExecutionMode.values())
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(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  
2833        f = new CompletableFuture<>();
2834        f.complete(one);
2835        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2884          checkCompletedWithWrappedCFException(g);
2885 <    }
2885 >        checkCompletedNormally(f, v1);
2886 >    }}
2887  
2888      /**
2889       * thenCompose result completes exceptionally if source cancelled
2890       */
2891 <    public void testThenCompose4() {
2892 <        CompletableFuture<Integer> f, g;
2893 <        CompletableFutureInc r;
2894 <
2895 <        f = new CompletableFuture<>();
2896 <        g = f.thenCompose(r = new CompletableFutureInc());
2897 <        assertTrue(f.cancel(true));
2898 <        checkCompletedWithWrappedCancellationException(g);
2899 <
2900 <        f = new CompletableFuture<>();
2901 <        assertTrue(f.cancel(true));
2902 <        g = f.thenCompose(r = new CompletableFutureInc());
2903 <        checkCompletedWithWrappedCancellationException(g);
2855 <    }
2856 <
2857 <    // asyncs
2858 <
2859 <    /**
2860 <     * thenRunAsync result completes normally after normal completion of source
2861 <     */
2862 <    public void testThenRunAsync() {
2863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2864 <        Noop r = new Noop();
2865 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2866 <        f.complete(null);
2867 <        checkCompletedNormally(g, null);
2868 <
2869 <        // reordered version
2870 <        f = new CompletableFuture<>();
2871 <        f.complete(null);
2872 <        r = new Noop();
2873 <        g = f.thenRunAsync(r);
2874 <        checkCompletedNormally(g, null);
2875 <    }
2876 <
2877 <    /**
2878 <     * thenRunAsync result completes exceptionally after exceptional
2879 <     * completion of source
2880 <     */
2881 <    public void testThenRunAsync2() {
2882 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2883 <        Noop r = new Noop();
2884 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2885 <        f.completeExceptionally(new CFException());
2886 <        try {
2887 <            g.join();
2888 <            shouldThrow();
2889 <        } catch (CompletionException success) {}
2890 <        checkCompletedWithWrappedCFException(g);
2891 <    }
2892 <
2893 <    /**
2894 <     * thenRunAsync result completes exceptionally if action does
2895 <     */
2896 <    public void testThenRunAsync3() {
2897 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2898 <        FailingNoop r = new FailingNoop();
2899 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2900 <        f.complete(null);
2901 <        checkCompletedWithWrappedCFException(g);
2902 <    }
2903 <
2904 <    /**
2905 <     * thenRunAsync result completes exceptionally if source cancelled
2906 <     */
2907 <    public void testThenRunAsync4() {
2908 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2909 <        Noop r = new Noop();
2910 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2911 <        assertTrue(f.cancel(true));
2912 <        checkCompletedWithWrappedCancellationException(g);
2913 <    }
2914 <
2915 <    /**
2916 <     * thenApplyAsync result completes normally after normal completion of source
2917 <     */
2918 <    public void testThenApplyAsync() {
2919 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2920 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2921 <        f.complete(one);
2922 <        checkCompletedNormally(g, two);
2923 <    }
2924 <
2925 <    /**
2926 <     * thenApplyAsync result completes exceptionally after exceptional
2927 <     * completion of source
2928 <     */
2929 <    public void testThenApplyAsync2() {
2930 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2931 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2932 <        f.completeExceptionally(new CFException());
2933 <        checkCompletedWithWrappedCFException(g);
2934 <    }
2935 <
2936 <    /**
2937 <     * thenApplyAsync result completes exceptionally if action does
2938 <     */
2939 <    public void testThenApplyAsync3() {
2940 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2941 <        FailingFunction r = new FailingFunction();
2942 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2943 <        f.complete(null);
2944 <        checkCompletedWithWrappedCFException(g);
2945 <    }
2946 <
2947 <    /**
2948 <     * thenApplyAsync result completes exceptionally if source cancelled
2949 <     */
2950 <    public void testThenApplyAsync4() {
2951 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2952 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2953 <        assertTrue(f.cancel(true));
2954 <        checkCompletedWithWrappedCancellationException(g);
2955 <    }
2956 <
2957 <    /**
2958 <     * thenAcceptAsync result completes normally after normal
2959 <     * completion of source
2960 <     */
2961 <    public void testThenAcceptAsync() {
2962 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2963 <        IncAction r = new IncAction();
2964 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2965 <        f.complete(one);
2966 <        checkCompletedNormally(g, null);
2967 <        assertEquals(r.value, (Integer) 2);
2968 <    }
2969 <
2970 <    /**
2971 <     * thenAcceptAsync result completes exceptionally after exceptional
2972 <     * completion of source
2973 <     */
2974 <    public void testThenAcceptAsync2() {
2975 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2976 <        IncAction r = new IncAction();
2977 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2978 <        f.completeExceptionally(new CFException());
2979 <        checkCompletedWithWrappedCFException(g);
2980 <    }
2981 <
2982 <    /**
2983 <     * thenAcceptAsync result completes exceptionally if action does
2984 <     */
2985 <    public void testThenAcceptAsync3() {
2986 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2987 <        FailingConsumer r = new FailingConsumer();
2988 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2989 <        f.complete(null);
2990 <        checkCompletedWithWrappedCFException(g);
2991 <    }
2992 <
2993 <    /**
2994 <     * thenAcceptAsync result completes exceptionally if source cancelled
2995 <     */
2996 <    public void testThenAcceptAsync4() {
2997 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2998 <        IncAction r = new IncAction();
2999 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3000 <        assertTrue(f.cancel(true));
3001 <        checkCompletedWithWrappedCancellationException(g);
3002 <    }
3003 <
3004 <    /**
3005 <     * thenComposeAsync result completes normally after normal
3006 <     * completion of source
3007 <     */
3008 <    public void testThenComposeAsync() {
3009 <        CompletableFuture<Integer> f, g;
3010 <        CompletableFutureInc r;
3011 <
3012 <        f = new CompletableFuture<>();
3013 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3014 <        f.complete(one);
3015 <        checkCompletedNormally(g, two);
3016 <
3017 <        f = new CompletableFuture<>();
3018 <        f.complete(one);
3019 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3020 <        checkCompletedNormally(g, two);
3021 <    }
3022 <
3023 <    /**
3024 <     * thenComposeAsync result completes exceptionally after
3025 <     * exceptional completion of source
3026 <     */
3027 <    public void testThenComposeAsync2() {
3028 <        CompletableFuture<Integer> f, g;
3029 <        CompletableFutureInc r;
3030 <
3031 <        f = new CompletableFuture<>();
3032 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3033 <        f.completeExceptionally(new CFException());
3034 <        checkCompletedWithWrappedCFException(g);
3035 <        assertFalse(r.ran);
3036 <
3037 <        f = new CompletableFuture<>();
3038 <        f.completeExceptionally(new CFException());
3039 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3040 <        checkCompletedWithWrappedCFException(g);
3041 <        assertFalse(r.ran);
3042 <    }
3043 <
3044 <    /**
3045 <     * thenComposeAsync result completes exceptionally if action does
3046 <     */
3047 <    public void testThenComposeAsync3() {
3048 <        CompletableFuture<Integer> f, g;
3049 <        FailingCompletableFutureFunction r;
3050 <
3051 <        f = new CompletableFuture<>();
3052 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3053 <        f.complete(one);
3054 <        checkCompletedWithWrappedCFException(g);
3055 <
3056 <        f = new CompletableFuture<>();
3057 <        f.complete(one);
3058 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3059 <        checkCompletedWithWrappedCFException(g);
3060 <    }
3061 <
3062 <    /**
3063 <     * thenComposeAsync result completes exceptionally if source cancelled
3064 <     */
3065 <    public void testThenComposeAsync4() {
3066 <        CompletableFuture<Integer> f, g;
3067 <        CompletableFutureInc r;
3068 <
3069 <        f = new CompletableFuture<>();
3070 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3071 <        assertTrue(f.cancel(true));
3072 <        checkCompletedWithWrappedCancellationException(g);
3073 <
3074 <        f = new CompletableFuture<>();
3075 <        assertTrue(f.cancel(true));
3076 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3077 <        checkCompletedWithWrappedCancellationException(g);
3078 <    }
3079 <
3080 <    // async with explicit executors
3081 <
3082 <    /**
3083 <     * thenRunAsync result completes normally after normal completion of source
3084 <     */
3085 <    public void testThenRunAsyncE() {
3086 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3087 <        Noop r = new Noop();
3088 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3089 <        f.complete(null);
3090 <        checkCompletedNormally(g, null);
3091 <
3092 <        // reordered version
3093 <        f = new CompletableFuture<>();
3094 <        f.complete(null);
3095 <        r = new Noop();
3096 <        g = f.thenRunAsync(r, new ThreadExecutor());
3097 <        checkCompletedNormally(g, null);
3098 <    }
3099 <
3100 <    /**
3101 <     * thenRunAsync result completes exceptionally after exceptional
3102 <     * completion of source
3103 <     */
3104 <    public void testThenRunAsync2E() {
3105 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3106 <        Noop r = new Noop();
3107 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3108 <        f.completeExceptionally(new CFException());
3109 <        try {
3110 <            g.join();
3111 <            shouldThrow();
3112 <        } catch (CompletionException success) {}
3113 <        checkCompletedWithWrappedCFException(g);
3114 <    }
3115 <
3116 <    /**
3117 <     * thenRunAsync result completes exceptionally if action does
3118 <     */
3119 <    public void testThenRunAsync3E() {
3120 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3121 <        FailingNoop r = new FailingNoop();
3122 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3123 <        f.complete(null);
3124 <        checkCompletedWithWrappedCFException(g);
3125 <    }
3126 <
3127 <    /**
3128 <     * thenRunAsync result completes exceptionally if source cancelled
3129 <     */
3130 <    public void testThenRunAsync4E() {
3131 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3132 <        Noop r = new Noop();
3133 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3134 <        assertTrue(f.cancel(true));
3135 <        checkCompletedWithWrappedCancellationException(g);
3136 <    }
3137 <
3138 <    /**
3139 <     * thenApplyAsync result completes normally after normal completion of source
3140 <     */
3141 <    public void testThenApplyAsyncE() {
3142 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3143 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3144 <        f.complete(one);
3145 <        checkCompletedNormally(g, two);
3146 <    }
3147 <
3148 <    /**
3149 <     * thenApplyAsync result completes exceptionally after exceptional
3150 <     * completion of source
3151 <     */
3152 <    public void testThenApplyAsync2E() {
3153 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3154 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3155 <        f.completeExceptionally(new CFException());
3156 <        checkCompletedWithWrappedCFException(g);
3157 <    }
3158 <
3159 <    /**
3160 <     * thenApplyAsync result completes exceptionally if action does
3161 <     */
3162 <    public void testThenApplyAsync3E() {
3163 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3164 <        FailingFunction r = new FailingFunction();
3165 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3166 <        f.complete(null);
3167 <        checkCompletedWithWrappedCFException(g);
3168 <    }
3169 <
3170 <    /**
3171 <     * thenApplyAsync result completes exceptionally if source cancelled
3172 <     */
3173 <    public void testThenApplyAsync4E() {
3174 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3175 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3176 <        assertTrue(f.cancel(true));
3177 <        checkCompletedWithWrappedCancellationException(g);
3178 <    }
3179 <
3180 <    /**
3181 <     * thenAcceptAsync result completes normally after normal
3182 <     * completion of source
3183 <     */
3184 <    public void testThenAcceptAsyncE() {
3185 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3186 <        IncAction r = new IncAction();
3187 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3188 <        f.complete(one);
3189 <        checkCompletedNormally(g, null);
3190 <        assertEquals(r.value, (Integer) 2);
3191 <    }
3192 <
3193 <    /**
3194 <     * thenAcceptAsync result completes exceptionally after exceptional
3195 <     * completion of source
3196 <     */
3197 <    public void testThenAcceptAsync2E() {
3198 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3199 <        IncAction r = new IncAction();
3200 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3201 <        f.completeExceptionally(new CFException());
3202 <        checkCompletedWithWrappedCFException(g);
3203 <    }
3204 <
3205 <    /**
3206 <     * thenAcceptAsync result completes exceptionally if action does
3207 <     */
3208 <    public void testThenAcceptAsync3E() {
3209 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3210 <        FailingConsumer r = new FailingConsumer();
3211 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3212 <        f.complete(null);
3213 <        checkCompletedWithWrappedCFException(g);
3214 <    }
3215 <
3216 <    /**
3217 <     * thenAcceptAsync result completes exceptionally if source cancelled
3218 <     */
3219 <    public void testThenAcceptAsync4E() {
3220 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3221 <        IncAction r = new IncAction();
3222 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3223 <        assertTrue(f.cancel(true));
3224 <        checkCompletedWithWrappedCancellationException(g);
3225 <    }
3226 <
3227 <    /**
3228 <     * thenComposeAsync result completes normally after normal
3229 <     * completion of source
3230 <     */
3231 <    public void testThenComposeAsyncE() {
3232 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3233 <        CompletableFutureInc r = new CompletableFutureInc();
3234 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3235 <        f.complete(one);
3236 <        checkCompletedNormally(g, two);
3237 <    }
3238 <
3239 <    /**
3240 <     * thenComposeAsync result completes exceptionally after
3241 <     * exceptional completion of source
3242 <     */
3243 <    public void testThenComposeAsync2E() {
3244 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3245 <        CompletableFutureInc r = new CompletableFutureInc();
3246 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3247 <        f.completeExceptionally(new CFException());
3248 <        checkCompletedWithWrappedCFException(g);
3249 <    }
3250 <
3251 <    /**
3252 <     * thenComposeAsync result completes exceptionally if action does
3253 <     */
3254 <    public void testThenComposeAsync3E() {
3255 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3256 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3257 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3258 <        f.complete(one);
3259 <        checkCompletedWithWrappedCFException(g);
3260 <    }
2891 >    public void testThenCompose_sourceCancelled() {
2892 >        for (ExecutionMode m : ExecutionMode.values())
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(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 >        }
2904  
3262    /**
3263     * thenComposeAsync result completes exceptionally if source cancelled
3264     */
3265    public void testThenComposeAsync4E() {
3266        CompletableFuture<Integer> f = new CompletableFuture<>();
3267        CompletableFutureInc r = new CompletableFutureInc();
3268        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3269        assertTrue(f.cancel(true));
2905          checkCompletedWithWrappedCancellationException(g);
2906 <    }
2906 >        checkCancelled(f);
2907 >    }}
2908  
2909      // other static methods
2910  
# Line 3286 | Line 2922 | public class CompletableFutureTest exten
2922       * when all components complete normally
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];
2927 <            for (int i = 0; i < k; ++i)
2925 >        for (int k = 1; k < 10; 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);
2931 <            for (int i = 0; i < k; ++i) {
2931 >            for (int i = 0; i < k; i++) {
2932                  checkIncomplete(f);
2933                  checkIncomplete(CompletableFuture.allOf(fs));
2934                  fs[i].complete(one);
# Line 3301 | Line 2938 | public class CompletableFutureTest exten
2938          }
2939      }
2940  
2941 +    public void testAllOf_backwards() throws Exception {
2942 +        for (int k = 1; k < 10; 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 +    public void testAllOf_exceptional() throws Exception {
2959 +        for (int k = 1; k < 10; k++) {
2960 +            CompletableFuture<Integer>[] fs
2961 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2962 +            CFException ex = new CFException();
2963 +            for (int i = 0; i < k; i++)
2964 +                fs[i] = new CompletableFuture<>();
2965 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2966 +            for (int i = 0; i < k; i++) {
2967 +                checkIncomplete(f);
2968 +                checkIncomplete(CompletableFuture.allOf(fs));
2969 +                if (i != k/2) {
2970 +                    fs[i].complete(i);
2971 +                    checkCompletedNormally(fs[i], i);
2972 +                } else {
2973 +                    fs[i].completeExceptionally(ex);
2974 +                    checkCompletedExceptionally(fs[i], ex);
2975 +                }
2976 +            }
2977 +            checkCompletedWithWrappedException(f, ex);
2978 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
2979 +        }
2980 +    }
2981 +
2982      /**
2983       * anyOf(no component futures) returns an incomplete future
2984       */
2985      public void testAnyOf_empty() throws Exception {
2986 +        for (Integer v1 : new Integer[] { 1, null })
2987 +    {
2988          CompletableFuture<Object> f = CompletableFuture.anyOf();
2989          checkIncomplete(f);
2990 <    }
2990 >
2991 >        f.complete(v1);
2992 >        checkCompletedNormally(f, v1);
2993 >    }}
2994  
2995      /**
2996       * anyOf returns a future completed normally with a value when
2997       * a component future does
2998       */
2999      public void testAnyOf_normal() throws Exception {
3000 <        for (int k = 0; k < 10; ++k) {
3000 >        for (int k = 0; k < 10; k++) {
3001              CompletableFuture[] fs = new CompletableFuture[k];
3002 <            for (int i = 0; i < k; ++i)
3002 >            for (int i = 0; i < k; i++)
3003                  fs[i] = new CompletableFuture<>();
3004              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3005              checkIncomplete(f);
3006 <            for (int i = 0; i < k; ++i) {
3007 <                fs[i].complete(one);
3008 <                checkCompletedNormally(f, one);
3009 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3006 >            for (int i = 0; i < k; i++) {
3007 >                fs[i].complete(i);
3008 >                checkCompletedNormally(f, 0);
3009 >                int x = (int) CompletableFuture.anyOf(fs).join();
3010 >                assertTrue(0 <= x && x <= i);
3011 >            }
3012 >        }
3013 >    }
3014 >    public void testAnyOf_normal_backwards() throws Exception {
3015 >        for (int k = 0; k < 10; k++) {
3016 >            CompletableFuture[] fs = new CompletableFuture[k];
3017 >            for (int i = 0; i < k; i++)
3018 >                fs[i] = new CompletableFuture<>();
3019 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3020 >            checkIncomplete(f);
3021 >            for (int i = k - 1; i >= 0; i--) {
3022 >                fs[i].complete(i);
3023 >                checkCompletedNormally(f, k - 1);
3024 >                int x = (int) CompletableFuture.anyOf(fs).join();
3025 >                assertTrue(i <= x && x <= k - 1);
3026              }
3027          }
3028      }
# Line 3332 | Line 3031 | public class CompletableFutureTest exten
3031       * anyOf result completes exceptionally when any component does.
3032       */
3033      public void testAnyOf_exceptional() throws Exception {
3034 <        for (int k = 0; k < 10; ++k) {
3034 >        for (int k = 0; k < 10; k++) {
3035 >            CompletableFuture[] fs = new CompletableFuture[k];
3036 >            CFException[] exs = new CFException[k];
3037 >            for (int i = 0; i < k; i++) {
3038 >                fs[i] = new CompletableFuture<>();
3039 >                exs[i] = new CFException();
3040 >            }
3041 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3042 >            checkIncomplete(f);
3043 >            for (int i = 0; i < k; i++) {
3044 >                fs[i].completeExceptionally(exs[i]);
3045 >                checkCompletedWithWrappedException(f, exs[0]);
3046 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3047 >            }
3048 >        }
3049 >    }
3050 >
3051 >    public void testAnyOf_exceptional_backwards() throws Exception {
3052 >        for (int k = 0; k < 10; k++) {
3053              CompletableFuture[] fs = new CompletableFuture[k];
3054 <            for (int i = 0; i < k; ++i)
3054 >            CFException[] exs = new CFException[k];
3055 >            for (int i = 0; i < k; i++) {
3056                  fs[i] = new CompletableFuture<>();
3057 +                exs[i] = new CFException();
3058 +            }
3059              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3060              checkIncomplete(f);
3061 <            for (int i = 0; i < k; ++i) {
3062 <                fs[i].completeExceptionally(new CFException());
3063 <                checkCompletedWithWrappedCFException(f);
3061 >            for (int i = k - 1; i >= 0; i--) {
3062 >                fs[i].completeExceptionally(exs[i]);
3063 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3064                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3065              }
3066          }
# Line 3359 | Line 3079 | public class CompletableFutureTest exten
3079          Runnable[] throwingActions = {
3080              () -> CompletableFuture.supplyAsync(null),
3081              () -> CompletableFuture.supplyAsync(null, exec),
3082 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3082 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3083  
3084              () -> CompletableFuture.runAsync(null),
3085              () -> CompletableFuture.runAsync(null, exec),
# Line 3432 | Line 3152 | public class CompletableFutureTest exten
3152  
3153              () -> f.thenCompose(null),
3154              () -> f.thenComposeAsync(null),
3155 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3155 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3156              () -> f.thenComposeAsync(null, exec),
3157  
3158              () -> f.exceptionally(null),
# Line 3464 | Line 3184 | public class CompletableFutureTest exten
3184          assertSame(f, f.toCompletableFuture());
3185      }
3186  
3187 <    /**
3468 <     * whenComplete action executes on normal completion, propagating
3469 <     * source result.
3470 <     */
3471 <    public void testWhenComplete_normalCompletion1() {
3472 <        for (ExecutionMode m : ExecutionMode.values())
3473 <        for (Integer v1 : new Integer[] { 1, null }) {
3187 >    //--- tests of implementation details; not part of official tck ---
3188  
3189 <        final AtomicInteger a = new AtomicInteger();
3190 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3191 <        final CompletableFuture<Integer> g =
3192 <            m.whenComplete(f,
3193 <                           (Integer x, Throwable t) -> {
3194 <                               threadAssertSame(x, v1);
3195 <                               threadAssertNull(t);
3482 <                               a.getAndIncrement();
3483 <                           });
3484 <        f.complete(v1);
3485 <        checkCompletedNormally(f, v1);
3486 <        checkCompletedNormally(g, v1);
3487 <        assertEquals(a.get(), 1);
3488 <        }
3189 >    Object resultOf(CompletableFuture<?> f) {
3190 >        try {
3191 >            java.lang.reflect.Field resultField
3192 >                = CompletableFuture.class.getDeclaredField("result");
3193 >            resultField.setAccessible(true);
3194 >            return resultField.get(f);
3195 >        } catch (Throwable t) { throw new AssertionError(t); }
3196      }
3197  
3198 <    /**
3199 <     * whenComplete action executes on exceptional completion, propagating
3493 <     * source result.
3494 <     */
3495 <    public void testWhenComplete_exceptionalCompletion() {
3198 >    public void testExceptionPropagationReusesResultObject() {
3199 >        if (!testImplementationDetails) return;
3200          for (ExecutionMode m : ExecutionMode.values())
3201 <        for (Integer v1 : new Integer[] { 1, null }) {
3498 <
3499 <        final AtomicInteger a = new AtomicInteger();
3201 >    {
3202          final CFException ex = new CFException();
3203 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3204 <        final CompletableFuture<Integer> g = m.whenComplete
3503 <            (f,
3504 <             (Integer x, Throwable t) -> {
3505 <                threadAssertNull(x);
3506 <                threadAssertSame(t, ex);
3507 <                a.getAndIncrement();
3508 <            });
3509 <        f.completeExceptionally(ex);
3510 <        checkCompletedWithWrappedCFException(f, ex);
3511 <        checkCompletedWithWrappedCFException(g, ex);
3512 <        assertEquals(a.get(), 1);
3513 <        }
3514 <    }
3203 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3204 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3205  
3206 <    /**
3207 <     * If a whenComplete action throws an exception when triggered by
3518 <     * a normal completion, it completes exceptionally
3519 <     */
3520 <    public void testWhenComplete_actionFailed() {
3521 <        for (ExecutionMode m : ExecutionMode.values())
3522 <        for (Integer v1 : new Integer[] { 1, null }) {
3206 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3207 >            = new ArrayList<>();
3208  
3209 <        final CFException ex = new CFException();
3210 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3211 <        final CompletableFuture<Integer> g = m.whenComplete
3527 <            (f,
3528 <             (Integer x, Throwable t) -> {
3529 <                threadAssertSame(x, v1);
3530 <                threadAssertNull(t);
3531 <                throw ex;
3532 <            });
3533 <        f.complete(v1);
3534 <        checkCompletedNormally(f, v1);
3535 <        checkCompletedWithWrappedCFException(g, ex);
3536 <        }
3537 <    }
3538 <
3539 <    /**
3540 <     * If a whenComplete action throws an exception when triggered by
3541 <     * a source completion that also throws an exception, the source
3542 <     * exception takes precedence.
3543 <     */
3544 <    public void testWhenComplete_actionFailedSourceFailed() {
3545 <        for (ExecutionMode m : ExecutionMode.values())
3546 <        for (Integer v1 : new Integer[] { 1, null }) {
3547 <
3548 <        final CFException ex1 = new CFException();
3549 <        final CFException ex2 = new CFException();
3550 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3551 <        final CompletableFuture<Integer> g = m.whenComplete
3552 <            (f,
3553 <             (Integer x, Throwable t) -> {
3554 <                threadAssertSame(t, ex1);
3555 <                threadAssertNull(x);
3556 <                throw ex2;
3557 <            });
3558 <        f.completeExceptionally(ex1);
3559 <        checkCompletedWithWrappedCFException(f, ex1);
3560 <        checkCompletedWithWrappedCFException(g, ex1);
3561 <        }
3562 <    }
3209 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3210 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3211 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3212  
3213 <    /**
3214 <     * handleAsync action completes normally with function value on
3215 <     * either normal or exceptional completion of source
3567 <     */
3568 <    public void testHandleAsync() {
3569 <        CompletableFuture<Integer> f, g;
3570 <        IntegerHandler r;
3213 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3214 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3215 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3216  
3217 <        f = new CompletableFuture<>();
3218 <        g = f.handleAsync(r = new IntegerHandler());
3219 <        assertFalse(r.ran);
3575 <        f.completeExceptionally(new CFException());
3576 <        checkCompletedWithWrappedCFException(f);
3577 <        checkCompletedNormally(g, three);
3578 <        assertTrue(r.ran);
3579 <
3580 <        f = new CompletableFuture<>();
3581 <        g = f.handleAsync(r = new IntegerHandler());
3582 <        assertFalse(r.ran);
3583 <        f.completeExceptionally(new CFException());
3584 <        checkCompletedWithWrappedCFException(f);
3585 <        checkCompletedNormally(g, three);
3586 <        assertTrue(r.ran);
3217 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3218 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3219 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3220  
3221 <        f = new CompletableFuture<>();
3589 <        g = f.handleAsync(r = new IntegerHandler());
3590 <        assertFalse(r.ran);
3591 <        f.complete(one);
3592 <        checkCompletedNormally(f, one);
3593 <        checkCompletedNormally(g, two);
3594 <        assertTrue(r.ran);
3221 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3222  
3223 <        f = new CompletableFuture<>();
3597 <        g = f.handleAsync(r = new IntegerHandler());
3598 <        assertFalse(r.ran);
3599 <        f.complete(one);
3600 <        checkCompletedNormally(f, one);
3601 <        checkCompletedNormally(g, two);
3602 <        assertTrue(r.ran);
3603 <    }
3223 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3224  
3225 <    /**
3226 <     * handleAsync action with Executor completes normally with
3607 <     * function value on either normal or exceptional completion of
3608 <     * source
3609 <     */
3610 <    public void testHandleAsync2() {
3611 <        CompletableFuture<Integer> f, g;
3612 <        ThreadExecutor exec = new ThreadExecutor();
3613 <        IntegerHandler r;
3225 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3226 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3227  
3228 <        f = new CompletableFuture<>();
3229 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3230 <        assertFalse(r.ran);
3231 <        f.completeExceptionally(new CFException());
3232 <        checkCompletedWithWrappedCFException(f);
3233 <        checkCompletedNormally(g, three);
3234 <        assertTrue(r.ran);
3228 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3229 >                 fun : funs) {
3230 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3231 >            f.completeExceptionally(ex);
3232 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3233 >            checkCompletedWithWrappedException(src, ex);
3234 >            CompletableFuture<?> dep = fun.apply(src);
3235 >            checkCompletedWithWrappedException(dep, ex);
3236 >            assertSame(resultOf(src), resultOf(dep));
3237 >        }
3238  
3239 <        f = new CompletableFuture<>();
3240 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3241 <        assertFalse(r.ran);
3242 <        f.completeExceptionally(new CFException());
3243 <        checkCompletedWithWrappedCFException(f);
3244 <        checkCompletedNormally(g, three);
3245 <        assertTrue(r.ran);
3239 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3240 >                 fun : funs) {
3241 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3242 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3243 >            CompletableFuture<?> dep = fun.apply(src);
3244 >            f.completeExceptionally(ex);
3245 >            checkCompletedWithWrappedException(src, ex);
3246 >            checkCompletedWithWrappedException(dep, ex);
3247 >            assertSame(resultOf(src), resultOf(dep));
3248 >        }
3249  
3250 <        f = new CompletableFuture<>();
3251 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3252 <        assertFalse(r.ran);
3253 <        f.complete(one);
3254 <        checkCompletedNormally(f, one);
3255 <        checkCompletedNormally(g, two);
3256 <        assertTrue(r.ran);
3250 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3251 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3252 >                 fun : funs) {
3253 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3254 >            f.cancel(mayInterruptIfRunning);
3255 >            checkCancelled(f);
3256 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3257 >            checkCompletedWithWrappedCancellationException(src);
3258 >            CompletableFuture<?> dep = fun.apply(src);
3259 >            checkCompletedWithWrappedCancellationException(dep);
3260 >            assertSame(resultOf(src), resultOf(dep));
3261 >        }
3262  
3263 <        f = new CompletableFuture<>();
3264 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3265 <        assertFalse(r.ran);
3266 <        f.complete(one);
3267 <        checkCompletedNormally(f, one);
3268 <        checkCompletedNormally(g, two);
3269 <        assertTrue(r.ran);
3270 <    }
3263 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3264 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3265 >                 fun : funs) {
3266 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3267 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3268 >            CompletableFuture<?> dep = fun.apply(src);
3269 >            f.cancel(mayInterruptIfRunning);
3270 >            checkCancelled(f);
3271 >            checkCompletedWithWrappedCancellationException(src);
3272 >            checkCompletedWithWrappedCancellationException(dep);
3273 >            assertSame(resultOf(src), resultOf(dep));
3274 >        }
3275 >    }}
3276  
3277   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines