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.21 by jsr166, Mon Apr 8 16:58:17 2013 UTC vs.
Revision 1.51 by jsr166, Mon Jun 2 19:49:28 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines