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.20 by jsr166, Mon Apr 8 16:45:15 2013 UTC vs.
Revision 1.53 by jsr166, Mon Jun 2 20:20:47 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));
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 >
1036          checkCompletedWithWrappedCancellationException(g);
1037 <    }
1037 >        checkCancelled(f);
1038 >        assertEquals(0, r.invocationCount);
1039 >    }}
1040 >
1041 >    /**
1042 >     * thenRun result completes exceptionally if action does
1043 >     */
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 >
1058 >        checkCompletedWithWrappedCFException(g);
1059 >        checkCompletedNormally(f, v1);
1060 >    }}
1061  
1062      /**
1063       * thenApply result completes normally after normal completion of source
1064       */
1065 <    public void testThenApply() {
1066 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1067 <        CompletableFuture<Integer> g = f.thenApply(inc);
1068 <        f.complete(one);
1069 <        checkCompletedNormally(g, two);
1070 <    }
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 >        checkCompletedNormally(g, inc(v1));
1080 >        checkCompletedNormally(f, v1);
1081 >        assertEquals(1, r.invocationCount);
1082 >    }}
1083  
1084      /**
1085       * thenApply result completes exceptionally after exceptional
1086       * completion of source
1087       */
1088 <    public void testThenApply2() {
1089 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1090 <        CompletableFuture<Integer> g = f.thenApply(inc);
1091 <        f.completeExceptionally(new CFException());
1092 <        checkCompletedWithWrappedCFException(g);
1093 <    }
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 <    /**
1103 <     * thenApply result completes exceptionally if action does
1104 <     */
1105 <    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 <    }
1102 >        checkCompletedWithWrappedCFException(g, ex);
1103 >        checkCompletedWithWrappedCFException(f, ex);
1104 >        assertEquals(0, r.invocationCount);
1105 >    }}
1106  
1107      /**
1108       * thenApply result completes exceptionally if source cancelled
1109       */
1110 <    public void testThenApply4() {
1111 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1112 <        CompletableFuture<Integer> g = f.thenApply(inc);
1113 <        assertTrue(f.cancel(true));
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 >
1124          checkCompletedWithWrappedCancellationException(g);
1125 <    }
1125 >        checkCancelled(f);
1126 >        assertEquals(0, r.invocationCount);
1127 >    }}
1128 >
1129 >    /**
1130 >     * thenApply result completes exceptionally if action does
1131 >     */
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 >
1146 >        checkCompletedWithWrappedCFException(g);
1147 >        checkCompletedNormally(f, v1);
1148 >    }}
1149  
1150      /**
1151       * thenAccept result completes normally after normal completion of source
1152       */
1153 <    public void testThenAccept() {
1154 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1155 <        IncAction r = new IncAction();
1156 <        CompletableFuture<Void> g = f.thenAccept(r);
1157 <        f.complete(one);
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 >
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       * thenAccept result completes exceptionally after exceptional
1175       * completion of source
1176       */
1177 <    public void testThenAccept2() {
1178 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1179 <        IncAction r = new IncAction();
1180 <        CompletableFuture<Void> g = f.thenAccept(r);
1181 <        f.completeExceptionally(new CFException());
1182 <        checkCompletedWithWrappedCFException(g);
1183 <    }
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 >        checkCompletedWithWrappedCFException(g, ex);
1192 >        checkCompletedWithWrappedCFException(f, ex);
1193 >        assertEquals(0, r.invocationCount);
1194 >    }}
1195  
1196      /**
1197       * thenAccept result completes exceptionally if action does
1198       */
1199 <    public void testThenAccept3() {
1200 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1201 <        FailingConsumer r = new FailingConsumer();
1202 <        CompletableFuture<Void> g = f.thenAccept(r);
1203 <        f.complete(one);
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 >
1213          checkCompletedWithWrappedCFException(g);
1214 <        assertTrue(r.ran);
1215 <    }
1214 >        checkCompletedNormally(f, v1);
1215 >    }}
1216  
1217      /**
1218       * thenAccept result completes exceptionally if source cancelled
1219       */
1220 <    public void testThenAccept4() {
1221 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1222 <        IncAction r = new IncAction();
1223 <        CompletableFuture<Void> g = f.thenAccept(r);
1224 <        assertTrue(f.cancel(true));
1225 <        checkCompletedWithWrappedCancellationException(g);
1226 <    }
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  
1234 +        checkCompletedWithWrappedCancellationException(g);
1235 +        checkCancelled(f);
1236 +        assertEquals(0, r.invocationCount);
1237 +    }}
1238  
1239      /**
1240       * thenCombine result completes normally after normal completion
1241       * of sources
1242       */
1243 <    public void testThenCombine() {
1244 <        CompletableFuture<Integer> f, g, h;
1245 <
1246 <        f = new CompletableFuture<Integer>();
1247 <        g = new CompletableFuture<Integer>();
1248 <        h = f.thenCombine(g, subtract);
1249 <        f.complete(3);
1250 <        checkIncomplete(h);
1251 <        g.complete(1);
1252 <        checkCompletedNormally(h, 2);
1253 <
1254 <        f = new CompletableFuture<Integer>();
1255 <        g = new CompletableFuture<Integer>();
1256 <        h = f.thenCombine(g, subtract);
1257 <        g.complete(1);
1258 <        checkIncomplete(h);
1259 <        f.complete(3);
1260 <        checkCompletedNormally(h, 2);
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 <        g = new CompletableFuture<Integer>();
1266 <        g.complete(1);
1267 <        f.complete(3);
1268 <        h = f.thenCombine(g, subtract);
662 <        checkCompletedNormally(h, 2);
663 <    }
1264 >        checkCompletedNormally(h, subtract(v1, v2));
1265 >        checkCompletedNormally(f, v1);
1266 >        checkCompletedNormally(g, v2);
1267 >        assertEquals(1, r.invocationCount);
1268 >    }}
1269  
1270      /**
1271       * thenCombine result completes exceptionally after exceptional
1272       * completion of either source
1273       */
1274 <    public void testThenCombine2() {
1275 <        CompletableFuture<Integer> f, g, h;
1276 <
1277 <        f = new CompletableFuture<Integer>();
1278 <        g = new CompletableFuture<Integer>();
1279 <        h = f.thenCombine(g, subtract);
1280 <        f.completeExceptionally(new CFException());
1281 <        checkIncomplete(h);
1282 <        g.complete(1);
1283 <        checkCompletedWithWrappedCFException(h);
1284 <
1285 <        f = new CompletableFuture<Integer>();
1286 <        g = new CompletableFuture<Integer>();
1287 <        h = f.thenCombine(g, subtract);
1288 <        g.completeExceptionally(new CFException());
1289 <        checkIncomplete(h);
1290 <        f.complete(3);
1291 <        checkCompletedWithWrappedCFException(h);
1292 <
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);
1274 >    public void testThenCombine_exceptionalCompletion() {
1275 >        for (ExecutionMode m : ExecutionMode.values())
1276 >        for (boolean createIncomplete : new boolean[] { true, false })
1277 >        for (boolean fFirst : new boolean[] { true, false })
1278 >        for (Integer v1 : new Integer[] { 1, null })
1279 >    {
1280 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1281 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1282 >        final CFException ex = new CFException();
1283 >        final SubtractFunction r = new SubtractFunction();
1284 >
1285 >        (fFirst ? f : g).complete(v1);
1286 >        if (!createIncomplete)
1287 >            (!fFirst ? f : g).completeExceptionally(ex);
1288 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1289 >        if (createIncomplete) {
1290 >            checkIncomplete(h);
1291 >            (!fFirst ? f : g).completeExceptionally(ex);
1292 >        }
1293  
1294 <        f = new CompletableFuture<Integer>();
1295 <        g = new CompletableFuture<Integer>();
1296 <        f.completeExceptionally(new CFException());
1297 <        g.complete(3);
1298 <        h = f.thenCombine(g, subtract);
700 <        checkCompletedWithWrappedCFException(h);
701 <    }
1294 >        checkCompletedWithWrappedCFException(h, ex);
1295 >        assertEquals(0, r.invocationCount);
1296 >        checkCompletedNormally(fFirst ? f : g, v1);
1297 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1298 >    }}
1299  
1300      /**
1301       * thenCombine result completes exceptionally if action does
1302       */
1303 <    public void testThenCombine3() {
1304 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1305 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1306 <        FailingBiFunction r = new FailingBiFunction();
1307 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1308 <        f.complete(one);
1309 <        checkIncomplete(g);
1310 <        assertFalse(r.ran);
1311 <        f2.complete(two);
1312 <        checkCompletedWithWrappedCFException(g);
1313 <        assertTrue(r.ran);
1314 <    }
1303 >    public void testThenCombine_actionFailed() {
1304 >        for (ExecutionMode m : ExecutionMode.values())
1305 >        for (boolean fFirst : new boolean[] { true, false })
1306 >        for (Integer v1 : new Integer[] { 1, null })
1307 >        for (Integer v2 : new Integer[] { 2, null })
1308 >    {
1309 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1310 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1311 >        final FailingBiFunction r = new FailingBiFunction();
1312 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1313 >
1314 >        if (fFirst) {
1315 >            f.complete(v1);
1316 >            g.complete(v2);
1317 >        } else {
1318 >            g.complete(v2);
1319 >            f.complete(v1);
1320 >        }
1321 >
1322 >        checkCompletedWithWrappedCFException(h);
1323 >        checkCompletedNormally(f, v1);
1324 >        checkCompletedNormally(g, v2);
1325 >    }}
1326  
1327      /**
1328       * thenCombine result completes exceptionally if either source cancelled
1329       */
1330 <    public void testThenCombine4() {
1331 <        CompletableFuture<Integer> f, g, h;
1332 <
1333 <        f = new CompletableFuture<Integer>();
1334 <        g = new CompletableFuture<Integer>();
1335 <        h = f.thenCombine(g, subtract);
1336 <        assertTrue(f.cancel(true));
1337 <        checkIncomplete(h);
1338 <        g.complete(1);
1339 <        checkCompletedWithWrappedCancellationException(h);
1340 <
1341 <        f = new CompletableFuture<Integer>();
1342 <        g = new CompletableFuture<Integer>();
1343 <        h = f.thenCombine(g, subtract);
1344 <        assertTrue(g.cancel(true));
1345 <        checkIncomplete(h);
1346 <        f.complete(3);
1347 <        checkCompletedWithWrappedCancellationException(h);
1330 >    public void testThenCombine_sourceCancelled() {
1331 >        for (ExecutionMode m : ExecutionMode.values())
1332 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333 >        for (boolean createIncomplete : new boolean[] { true, false })
1334 >        for (boolean fFirst : new boolean[] { true, false })
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 >
1341 >        (fFirst ? f : g).complete(v1);
1342 >        if (!createIncomplete)
1343 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1344 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1345 >        if (createIncomplete) {
1346 >            checkIncomplete(h);
1347 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1348 >        }
1349  
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);
1350          checkCompletedWithWrappedCancellationException(h);
1351 <    }
1351 >        checkCancelled(!fFirst ? f : g);
1352 >        assertEquals(0, r.invocationCount);
1353 >        checkCompletedNormally(fFirst ? f : g, v1);
1354 >    }}
1355  
1356      /**
1357       * thenAcceptBoth result completes normally after normal
1358       * completion of sources
1359       */
1360 <    public void testThenAcceptBoth() {
1361 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1362 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1363 <        AddAction r = new AddAction();
1364 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1365 <        f.complete(one);
1366 <        checkIncomplete(g);
1367 <        f2.complete(two);
1368 <        checkCompletedNormally(g, null);
1369 <        assertEquals(r.value, 3);
1360 >    public void testThenAcceptBoth_normalCompletion() {
1361 >        for (ExecutionMode m : ExecutionMode.values())
1362 >        for (boolean createIncomplete : new boolean[] { true, false })
1363 >        for (boolean fFirst : new boolean[] { true, false })
1364 >        for (Integer v1 : new Integer[] { 1, null })
1365 >        for (Integer v2 : new Integer[] { 2, null })
1366 >    {
1367 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1368 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1369 >        final SubtractAction r = new SubtractAction();
1370 >
1371 >        if (fFirst) f.complete(v1); else g.complete(v2);
1372 >        if (!createIncomplete)
1373 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1374 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1375 >        if (createIncomplete) {
1376 >            checkIncomplete(h);
1377 >            assertEquals(0, r.invocationCount);
1378 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1379 >        }
1380  
1381 <        r = new AddAction();
1382 <        f = new CompletableFuture<Integer>();
1383 <        f.complete(one);
1384 <        f2 = new CompletableFuture<Integer>();
1385 <        g = f.thenAcceptBoth(f2, r);
769 <        checkIncomplete(g);
770 <        f2.complete(two);
771 <        checkCompletedNormally(g, null);
772 <        assertEquals(r.value, 3);
773 <    }
1381 >        checkCompletedNormally(h, null);
1382 >        assertEquals(subtract(v1, v2), r.value);
1383 >        checkCompletedNormally(f, v1);
1384 >        checkCompletedNormally(g, v2);
1385 >    }}
1386  
1387      /**
1388       * thenAcceptBoth result completes exceptionally after exceptional
1389       * completion of either source
1390       */
1391 <    public void testThenAcceptBoth2() {
1392 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1393 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1394 <        AddAction r = new AddAction();
1395 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1396 <        f.completeExceptionally(new CFException());
1397 <        f2.complete(two);
1398 <        checkCompletedWithWrappedCFException(g);
1391 >    public void testThenAcceptBoth_exceptionalCompletion() {
1392 >        for (ExecutionMode m : ExecutionMode.values())
1393 >        for (boolean createIncomplete : new boolean[] { true, false })
1394 >        for (boolean fFirst : new boolean[] { true, false })
1395 >        for (Integer v1 : new Integer[] { 1, null })
1396 >    {
1397 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1398 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1399 >        final CFException ex = new CFException();
1400 >        final SubtractAction r = new SubtractAction();
1401 >
1402 >        (fFirst ? f : g).complete(v1);
1403 >        if (!createIncomplete)
1404 >            (!fFirst ? f : g).completeExceptionally(ex);
1405 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1406 >        if (createIncomplete) {
1407 >            checkIncomplete(h);
1408 >            (!fFirst ? f : g).completeExceptionally(ex);
1409 >        }
1410  
1411 <        r = new AddAction();
1412 <        f = new CompletableFuture<Integer>();
1413 <        f.complete(one);
1414 <        f2 = new CompletableFuture<Integer>();
1415 <        g = f.thenAcceptBoth(f2, r);
793 <        f2.completeExceptionally(new CFException());
794 <        checkCompletedWithWrappedCFException(g);
795 <    }
1411 >        checkCompletedWithWrappedCFException(h, ex);
1412 >        assertEquals(0, r.invocationCount);
1413 >        checkCompletedNormally(fFirst ? f : g, v1);
1414 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1415 >    }}
1416  
1417      /**
1418       * thenAcceptBoth result completes exceptionally if action does
1419       */
1420 <    public void testThenAcceptBoth3() {
1421 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1422 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1423 <        FailingBiConsumer r = new FailingBiConsumer();
1424 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1425 <        f.complete(one);
1426 <        checkIncomplete(g);
1427 <        f2.complete(two);
1428 <        checkCompletedWithWrappedCFException(g);
1429 <    }
1420 >    public void testThenAcceptBoth_actionFailed() {
1421 >        for (ExecutionMode m : ExecutionMode.values())
1422 >        for (boolean fFirst : new boolean[] { true, false })
1423 >        for (Integer v1 : new Integer[] { 1, null })
1424 >        for (Integer v2 : new Integer[] { 2, null })
1425 >    {
1426 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1427 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1428 >        final FailingBiConsumer r = new FailingBiConsumer();
1429 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1430 >
1431 >        if (fFirst) {
1432 >            f.complete(v1);
1433 >            g.complete(v2);
1434 >        } else {
1435 >            g.complete(v2);
1436 >            f.complete(v1);
1437 >        }
1438 >
1439 >        checkCompletedWithWrappedCFException(h);
1440 >        checkCompletedNormally(f, v1);
1441 >        checkCompletedNormally(g, v2);
1442 >    }}
1443  
1444      /**
1445       * thenAcceptBoth result completes exceptionally if either source cancelled
1446       */
1447 <    public void testThenAcceptBoth4() {
1448 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1449 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1450 <        AddAction r = new AddAction();
1451 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1452 <        assertTrue(f.cancel(true));
1453 <        f2.complete(two);
1454 <        checkCompletedWithWrappedCancellationException(g);
1455 <        f = new CompletableFuture<Integer>();
1456 <        f2 = new CompletableFuture<Integer>();
1457 <        r = new AddAction();
1458 <        g = f.thenAcceptBoth(f2, r);
1459 <        f.complete(one);
1460 <        assertTrue(f2.cancel(true));
1461 <        checkCompletedWithWrappedCancellationException(g);
1462 <    }
1447 >    public void testThenAcceptBoth_sourceCancelled() {
1448 >        for (ExecutionMode m : ExecutionMode.values())
1449 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1450 >        for (boolean createIncomplete : new boolean[] { true, false })
1451 >        for (boolean fFirst : new boolean[] { true, false })
1452 >        for (Integer v1 : new Integer[] { 1, null })
1453 >    {
1454 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1455 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1456 >        final SubtractAction r = new SubtractAction();
1457 >
1458 >        (fFirst ? f : g).complete(v1);
1459 >        if (!createIncomplete)
1460 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1461 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1462 >        if (createIncomplete) {
1463 >            checkIncomplete(h);
1464 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1465 >        }
1466 >
1467 >        checkCompletedWithWrappedCancellationException(h);
1468 >        checkCancelled(!fFirst ? f : g);
1469 >        assertEquals(0, r.invocationCount);
1470 >        checkCompletedNormally(fFirst ? f : g, v1);
1471 >    }}
1472  
1473      /**
1474       * runAfterBoth result completes normally after normal
1475       * completion of sources
1476       */
1477 <    public void testRunAfterBoth() {
1478 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1479 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1480 <        Noop r = new Noop();
1481 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1482 <        f.complete(one);
1483 <        checkIncomplete(g);
1484 <        f2.complete(two);
1485 <        checkCompletedNormally(g, null);
844 <        assertTrue(r.ran);
845 <
846 <        r = new Noop();
847 <        f = new CompletableFuture<Integer>();
848 <        f.complete(one);
849 <        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 <    }
856 <
857 <    /**
858 <     * runAfterBoth result completes exceptionally after exceptional
859 <     * completion of either source
860 <     */
861 <    public void testRunAfterBoth2() {
862 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
863 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
864 <        Noop r = new Noop();
865 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
866 <        f.completeExceptionally(new CFException());
867 <        f2.complete(two);
868 <        checkCompletedWithWrappedCFException(g);
1477 >    public void testRunAfterBoth_normalCompletion1() {
1478 >        for (ExecutionMode m : ExecutionMode.values())
1479 >        for (Integer v1 : new Integer[] { 1, null })
1480 >        for (Integer v2 : new Integer[] { 2, null })
1481 >    {
1482 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1483 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1484 >        final Noop r = new Noop();
1485 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1486  
1487 <        r = new Noop();
1488 <        f = new CompletableFuture<Integer>();
1489 <        f.complete(one);
1490 <        f2 = new CompletableFuture<Integer>();
874 <        g = f.runAfterBoth(f2, r);
875 <        f2.completeExceptionally(new CFException());
876 <        checkCompletedWithWrappedCFException(g);
877 <    }
878 <
879 <    /**
880 <     * runAfterBoth result completes exceptionally if action does
881 <     */
882 <    public void testRunAfterBoth3() {
883 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
884 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
885 <        FailingNoop r = new FailingNoop();
886 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
887 <        f.complete(one);
888 <        checkIncomplete(g);
889 <        f2.complete(two);
890 <        checkCompletedWithWrappedCFException(g);
891 <    }
892 <
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));
910 <        checkCompletedWithWrappedCancellationException(g);
911 <    }
912 <
913 <    /**
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 <    }
932 <
933 <    /**
934 <     * applyToEither result completes exceptionally after exceptional
935 <     * completion of either source
936 <     */
937 <    public void testApplyToEither2() {
938 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
939 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
940 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
941 <        f.completeExceptionally(new CFException());
942 <        f2.complete(one);
943 <        checkCompletedWithWrappedCFException(g);
944 <
945 <        f = new CompletableFuture<Integer>();
946 <        f2 = new CompletableFuture<Integer>();
947 <        f2.completeExceptionally(new CFException());
948 <        g = f.applyToEither(f2, inc);
949 <        checkCompletedWithWrappedCFException(g);
950 <    }
951 <
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);
961 <        checkCompletedWithWrappedCFException(g);
962 <    }
963 <
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 <    }
978 <
979 <    /**
980 <     * acceptEither result completes normally after normal completion
981 <     * of either source
982 <     */
983 <    public void testAcceptEither() {
984 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
985 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
986 <        IncAction r = new IncAction();
987 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
988 <        f.complete(one);
989 <        checkCompletedNormally(g, null);
990 <        f2.complete(one);
991 <        checkCompletedNormally(g, null);
992 <        assertEquals(r.value, 2);
993 <
994 <        r = new IncAction();
995 <        f = new CompletableFuture<Integer>();
996 <        f.complete(one);
997 <        f2 = new CompletableFuture<Integer>();
998 <        g = f.acceptEither(f2, r);
999 <        checkCompletedNormally(g, null);
1000 <        assertEquals(r.value, 2);
1001 <    }
1002 <
1003 <    /**
1004 <     * acceptEither result completes exceptionally after exceptional
1005 <     * 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 <    }
1487 >        f.complete(v1);
1488 >        checkIncomplete(h);
1489 >        assertEquals(0, r.invocationCount);
1490 >        g.complete(v2);
1491  
1492 +        checkCompletedNormally(h, null);
1493 +        assertEquals(1, r.invocationCount);
1494 +        checkCompletedNormally(f, v1);
1495 +        checkCompletedNormally(g, v2);
1496 +    }}
1497 +
1498 +    public void testRunAfterBoth_normalCompletion2() {
1499 +        for (ExecutionMode m : ExecutionMode.values())
1500 +        for (Integer v1 : new Integer[] { 1, null })
1501 +        for (Integer v2 : new Integer[] { 2, null })
1502 +    {
1503 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1504 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1505 +        final Noop r = new Noop();
1506 +        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1507  
1508 <    /**
1509 <     * runAfterEither result completes normally after normal completion
1510 <     * of either source
1511 <     */
1057 <    public void testRunAfterEither() {
1058 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1059 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1060 <        Noop r = new Noop();
1061 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1062 <        f.complete(one);
1063 <        checkCompletedNormally(g, null);
1064 <        f2.complete(one);
1065 <        checkCompletedNormally(g, null);
1066 <        assertTrue(r.ran);
1508 >        g.complete(v2);
1509 >        checkIncomplete(h);
1510 >        assertEquals(0, r.invocationCount);
1511 >        f.complete(v1);
1512  
1513 <        r = new Noop();
1514 <        f = new CompletableFuture<Integer>();
1515 <        f.complete(one);
1516 <        f2 = new CompletableFuture<Integer>();
1517 <        g = f.runAfterEither(f2, r);
1518 <        checkCompletedNormally(g, null);
1519 <        assertTrue(r.ran);
1520 <    }
1513 >        checkCompletedNormally(h, null);
1514 >        assertEquals(1, r.invocationCount);
1515 >        checkCompletedNormally(f, v1);
1516 >        checkCompletedNormally(g, v2);
1517 >    }}
1518 >
1519 >    public void testRunAfterBoth_normalCompletion3() {
1520 >        for (ExecutionMode m : ExecutionMode.values())
1521 >        for (Integer v1 : new Integer[] { 1, null })
1522 >        for (Integer v2 : new Integer[] { 2, null })
1523 >    {
1524 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1525 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1526 >        final Noop r = new Noop();
1527 >
1528 >        g.complete(v2);
1529 >        f.complete(v1);
1530 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1531 >
1532 >        checkCompletedNormally(h, null);
1533 >        assertEquals(1, r.invocationCount);
1534 >        checkCompletedNormally(f, v1);
1535 >        checkCompletedNormally(g, v2);
1536 >    }}
1537 >
1538 >    public void testRunAfterBoth_normalCompletion4() {
1539 >        for (ExecutionMode m : ExecutionMode.values())
1540 >        for (Integer v1 : new Integer[] { 1, null })
1541 >        for (Integer v2 : new Integer[] { 2, null })
1542 >    {
1543 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1544 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1545 >        final Noop r = new Noop();
1546 >
1547 >        f.complete(v1);
1548 >        g.complete(v2);
1549 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1550 >
1551 >        checkCompletedNormally(h, null);
1552 >        assertEquals(1, r.invocationCount);
1553 >        checkCompletedNormally(f, v1);
1554 >        checkCompletedNormally(g, v2);
1555 >    }}
1556  
1557      /**
1558 <     * runAfterEither result completes exceptionally after exceptional
1558 >     * runAfterBoth result completes exceptionally after exceptional
1559       * completion of either source
1560       */
1561 <    public void testRunAfterEither2() {
1562 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1563 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1564 <        Noop r = new Noop();
1565 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1566 <        f.completeExceptionally(new CFException());
1567 <        f2.complete(one);
1568 <        checkCompletedWithWrappedCFException(g);
1569 <
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);
1095 <        checkCompletedWithWrappedCFException(g);
1096 <    }
1097 <
1098 <    /**
1099 <     * runAfterEither result completes exceptionally if action does
1100 <     */
1101 <    public void testRunAfterEither3() {
1102 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1103 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1104 <        FailingNoop r = new FailingNoop();
1105 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1106 <        f2.complete(two);
1107 <        checkCompletedWithWrappedCFException(g);
1108 <    }
1109 <
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));
1123 <        checkCompletedWithWrappedCancellationException(g);
1124 <    }
1125 <
1126 <    /**
1127 <     * thenCompose result completes normally after normal completion of source
1128 <     */
1129 <    public void testThenCompose() {
1130 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1131 <        CompletableFutureInc r = new CompletableFutureInc();
1132 <        CompletableFuture<Integer> g = f.thenCompose(r);
1133 <        f.complete(one);
1134 <        checkCompletedNormally(g, two);
1135 <    }
1136 <
1137 <    /**
1138 <     * thenCompose result completes exceptionally after exceptional
1139 <     * completion of source
1140 <     */
1141 <    public void testThenCompose2() {
1142 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1143 <        CompletableFutureInc r = new CompletableFutureInc();
1144 <        CompletableFuture<Integer> g = f.thenCompose(r);
1145 <        f.completeExceptionally(new CFException());
1146 <        checkCompletedWithWrappedCFException(g);
1147 <    }
1148 <
1149 <    /**
1150 <     * thenCompose result completes exceptionally if action does
1151 <     */
1152 <    public void testThenCompose3() {
1153 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1154 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
1155 <        CompletableFuture<Integer> g = f.thenCompose(r);
1156 <        f.complete(one);
1157 <        checkCompletedWithWrappedCFException(g);
1158 <    }
1159 <
1160 <    /**
1161 <     * thenCompose result completes exceptionally if source cancelled
1162 <     */
1163 <    public void testThenCompose4() {
1164 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1165 <        CompletableFutureInc r = new CompletableFutureInc();
1166 <        CompletableFuture<Integer> g = f.thenCompose(r);
1167 <        assertTrue(f.cancel(true));
1168 <        checkCompletedWithWrappedCancellationException(g);
1169 <    }
1170 <
1171 <
1172 <    // asyncs
1173 <
1174 <    /**
1175 <     * thenRunAsync result completes normally after normal completion of source
1176 <     */
1177 <    public void testThenRunAsync() {
1178 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1179 <        Noop r = new Noop();
1180 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1181 <        f.complete(null);
1182 <        checkCompletedNormally(g, null);
1183 <
1184 <        // reordered version
1185 <        f = new CompletableFuture<Integer>();
1186 <        f.complete(null);
1187 <        r = new Noop();
1188 <        g = f.thenRunAsync(r);
1189 <        checkCompletedNormally(g, null);
1190 <    }
1191 <
1192 <    /**
1193 <     * thenRunAsync result completes exceptionally after exceptional
1194 <     * completion of source
1195 <     */
1196 <    public void testThenRunAsync2() {
1197 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1198 <        Noop r = new Noop();
1199 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1200 <        f.completeExceptionally(new CFException());
1201 <        try {
1202 <            g.join();
1203 <            shouldThrow();
1204 <        } catch (Exception ok) {
1205 <        }
1206 <        checkCompletedWithWrappedCFException(g);
1207 <    }
1208 <
1209 <    /**
1210 <     * thenRunAsync result completes exceptionally if action does
1211 <     */
1212 <    public void testThenRunAsync3() {
1213 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1214 <        FailingNoop r = new FailingNoop();
1215 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1216 <        f.complete(null);
1217 <        checkCompletedWithWrappedCFException(g);
1218 <    }
1219 <
1220 <    /**
1221 <     * thenRunAsync result completes exceptionally if source cancelled
1222 <     */
1223 <    public void testThenRunAsync4() {
1224 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1225 <        Noop r = new Noop();
1226 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1227 <        assertTrue(f.cancel(true));
1228 <        checkCompletedWithWrappedCancellationException(g);
1229 <    }
1230 <
1231 <    /**
1232 <     * thenApplyAsync result completes normally after normal completion of source
1233 <     */
1234 <    public void testThenApplyAsync() {
1235 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1236 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1237 <        f.complete(one);
1238 <        checkCompletedNormally(g, two);
1239 <    }
1240 <
1241 <    /**
1242 <     * thenApplyAsync result completes exceptionally after exceptional
1243 <     * completion of source
1244 <     */
1245 <    public void testThenApplyAsync2() {
1246 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1247 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1248 <        f.completeExceptionally(new CFException());
1249 <        checkCompletedWithWrappedCFException(g);
1250 <    }
1251 <
1252 <    /**
1253 <     * thenApplyAsync result completes exceptionally if action does
1254 <     */
1255 <    public void testThenApplyAsync3() {
1256 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1257 <        FailingFunction r = new FailingFunction();
1258 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1259 <        f.complete(null);
1260 <        checkCompletedWithWrappedCFException(g);
1261 <    }
1262 <
1263 <    /**
1264 <     * thenApplyAsync result completes exceptionally if source cancelled
1265 <     */
1266 <    public void testThenApplyAsync4() {
1267 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1268 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1269 <        assertTrue(f.cancel(true));
1270 <        checkCompletedWithWrappedCancellationException(g);
1271 <    }
1272 <
1273 <    /**
1274 <     * thenAcceptAsync result completes normally after normal
1275 <     * completion of source
1276 <     */
1277 <    public void testThenAcceptAsync() {
1278 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1279 <        IncAction r = new IncAction();
1280 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1281 <        f.complete(one);
1282 <        checkCompletedNormally(g, null);
1283 <        assertEquals(r.value, 2);
1284 <    }
1285 <
1286 <    /**
1287 <     * thenAcceptAsync result completes exceptionally after exceptional
1288 <     * completion of source
1289 <     */
1290 <    public void testThenAcceptAsync2() {
1291 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1292 <        IncAction r = new IncAction();
1293 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1294 <        f.completeExceptionally(new CFException());
1295 <        checkCompletedWithWrappedCFException(g);
1296 <    }
1297 <
1298 <    /**
1299 <     * thenAcceptAsync result completes exceptionally if action does
1300 <     */
1301 <    public void testThenAcceptAsync3() {
1302 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1303 <        FailingConsumer r = new FailingConsumer();
1304 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1305 <        f.complete(null);
1306 <        checkCompletedWithWrappedCFException(g);
1307 <    }
1308 <
1309 <    /**
1310 <     * thenAcceptAsync result completes exceptionally if source cancelled
1311 <     */
1312 <    public void testThenAcceptAsync4() {
1313 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1314 <        IncAction r = new IncAction();
1315 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1316 <        assertTrue(f.cancel(true));
1317 <        checkCompletedWithWrappedCancellationException(g);
1318 <    }
1319 <
1320 <    /**
1321 <     * thenCombineAsync result completes normally after normal
1322 <     * completion of sources
1323 <     */
1324 <    public void testThenCombineAsync() {
1325 <        CompletableFuture<Integer> f, g, h;
1561 >    public void testRunAfterBoth_exceptionalCompletion1() {
1562 >        for (ExecutionMode m : ExecutionMode.values())
1563 >        for (Integer v1 : new Integer[] { 1, null })
1564 >    {
1565 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1566 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1567 >        final Noop r = new Noop();
1568 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1569 >        final CFException ex = new CFException();
1570  
1571 <        f = new CompletableFuture<Integer>();
1328 <        g = new CompletableFuture<Integer>();
1329 <        h = f.thenCombineAsync(g, subtract);
1330 <        f.complete(3);
1571 >        f.completeExceptionally(ex);
1572          checkIncomplete(h);
1573 <        g.complete(1);
1574 <        checkCompletedNormally(h, 2);
1573 >        g.complete(v1);
1574 >
1575 >        checkCompletedWithWrappedCFException(h, ex);
1576 >        checkCompletedWithWrappedCFException(f, ex);
1577 >        assertEquals(0, r.invocationCount);
1578 >        checkCompletedNormally(g, v1);
1579 >    }}
1580 >
1581 >    public void testRunAfterBoth_exceptionalCompletion2() {
1582 >        for (ExecutionMode m : ExecutionMode.values())
1583 >        for (Integer v1 : new Integer[] { 1, null })
1584 >    {
1585 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1586 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1587 >        final Noop r = new Noop();
1588 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1589 >        final CFException ex = new CFException();
1590  
1591 <        f = new CompletableFuture<Integer>();
1336 <        g = new CompletableFuture<Integer>();
1337 <        h = f.thenCombineAsync(g, subtract);
1338 <        g.complete(1);
1591 >        g.completeExceptionally(ex);
1592          checkIncomplete(h);
1593 <        f.complete(3);
1341 <        checkCompletedNormally(h, 2);
1593 >        f.complete(v1);
1594  
1595 <        f = new CompletableFuture<Integer>();
1596 <        g = new CompletableFuture<Integer>();
1597 <        g.complete(1);
1598 <        f.complete(3);
1599 <        h = f.thenCombineAsync(g, subtract);
1600 <        checkCompletedNormally(h, 2);
1601 <    }
1595 >        checkCompletedWithWrappedCFException(h, ex);
1596 >        checkCompletedWithWrappedCFException(g, ex);
1597 >        assertEquals(0, r.invocationCount);
1598 >        checkCompletedNormally(f, v1);
1599 >    }}
1600 >
1601 >    public void testRunAfterBoth_exceptionalCompletion3() {
1602 >        for (ExecutionMode m : ExecutionMode.values())
1603 >        for (Integer v1 : new Integer[] { 1, null })
1604 >    {
1605 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1606 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1607 >        final Noop r = new Noop();
1608 >        final CFException ex = new CFException();
1609 >
1610 >        g.completeExceptionally(ex);
1611 >        f.complete(v1);
1612 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1613 >
1614 >        checkCompletedWithWrappedCFException(h, ex);
1615 >        checkCompletedWithWrappedCFException(g, ex);
1616 >        assertEquals(0, r.invocationCount);
1617 >        checkCompletedNormally(f, v1);
1618 >    }}
1619 >
1620 >    public void testRunAfterBoth_exceptionalCompletion4() {
1621 >        for (ExecutionMode m : ExecutionMode.values())
1622 >        for (Integer v1 : new Integer[] { 1, null })
1623 >    {
1624 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1625 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1626 >        final Noop r = new Noop();
1627 >        final CFException ex = new CFException();
1628 >
1629 >        f.completeExceptionally(ex);
1630 >        g.complete(v1);
1631 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1632 >
1633 >        checkCompletedWithWrappedCFException(h, ex);
1634 >        checkCompletedWithWrappedCFException(f, ex);
1635 >        assertEquals(0, r.invocationCount);
1636 >        checkCompletedNormally(g, v1);
1637 >    }}
1638  
1639      /**
1640 <     * thenCombineAsync result completes exceptionally after exceptional
1353 <     * completion of either source
1640 >     * runAfterBoth result completes exceptionally if action does
1641       */
1642 <    public void testThenCombineAsync2() {
1643 <        CompletableFuture<Integer> f, g, h;
1642 >    public void testRunAfterBoth_actionFailed1() {
1643 >        for (ExecutionMode m : ExecutionMode.values())
1644 >        for (Integer v1 : new Integer[] { 1, null })
1645 >        for (Integer v2 : new Integer[] { 2, null })
1646 >    {
1647 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1648 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1649 >        final FailingRunnable r = new FailingRunnable();
1650 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1651  
1652 <        f = new CompletableFuture<Integer>();
1359 <        g = new CompletableFuture<Integer>();
1360 <        h = f.thenCombineAsync(g, subtract);
1361 <        f.completeExceptionally(new CFException());
1652 >        f.complete(v1);
1653          checkIncomplete(h);
1654 <        g.complete(1);
1654 >        g.complete(v2);
1655 >
1656          checkCompletedWithWrappedCFException(h);
1657 +        checkCompletedNormally(f, v1);
1658 +        checkCompletedNormally(g, v2);
1659 +    }}
1660 +
1661 +    public void testRunAfterBoth_actionFailed2() {
1662 +        for (ExecutionMode m : ExecutionMode.values())
1663 +        for (Integer v1 : new Integer[] { 1, null })
1664 +        for (Integer v2 : new Integer[] { 2, null })
1665 +    {
1666 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1667 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 +        final FailingRunnable r = new FailingRunnable();
1669 +        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670  
1671 <        f = new CompletableFuture<Integer>();
1367 <        g = new CompletableFuture<Integer>();
1368 <        h = f.thenCombineAsync(g, subtract);
1369 <        g.completeExceptionally(new CFException());
1671 >        g.complete(v2);
1672          checkIncomplete(h);
1673 <        f.complete(3);
1372 <        checkCompletedWithWrappedCFException(h);
1673 >        f.complete(v1);
1674  
1374        f = new CompletableFuture<Integer>();
1375        g = new CompletableFuture<Integer>();
1376        g.completeExceptionally(new CFException());
1377        f.complete(3);
1378        h = f.thenCombineAsync(g, subtract);
1675          checkCompletedWithWrappedCFException(h);
1676 <    }
1677 <
1678 <    /**
1383 <     * thenCombineAsync result completes exceptionally if action does
1384 <     */
1385 <    public void testThenCombineAsync3() {
1386 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1387 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1388 <        FailingBiFunction r = new FailingBiFunction();
1389 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1390 <        f.complete(one);
1391 <        checkIncomplete(g);
1392 <        assertFalse(r.ran);
1393 <        f2.complete(two);
1394 <        checkCompletedWithWrappedCFException(g);
1395 <        assertTrue(r.ran);
1396 <    }
1676 >        checkCompletedNormally(f, v1);
1677 >        checkCompletedNormally(g, v2);
1678 >    }}
1679  
1680      /**
1681 <     * thenCombineAsync result completes exceptionally if either source cancelled
1681 >     * runAfterBoth result completes exceptionally if either source cancelled
1682       */
1683 <    public void testThenCombineAsync4() {
1684 <        CompletableFuture<Integer> f, g, h;
1683 >    public void testRunAfterBoth_sourceCancelled1() {
1684 >        for (ExecutionMode m : ExecutionMode.values())
1685 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1686 >        for (Integer v1 : new Integer[] { 1, null })
1687 >    {
1688 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1689 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1690 >        final Noop r = new Noop();
1691 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1692  
1693 <        f = new CompletableFuture<Integer>();
1405 <        g = new CompletableFuture<Integer>();
1406 <        h = f.thenCombineAsync(g, subtract);
1407 <        assertTrue(f.cancel(true));
1693 >        assertTrue(f.cancel(mayInterruptIfRunning));
1694          checkIncomplete(h);
1695 <        g.complete(1);
1695 >        g.complete(v1);
1696 >
1697          checkCompletedWithWrappedCancellationException(h);
1698 +        checkCancelled(f);
1699 +        assertEquals(0, r.invocationCount);
1700 +        checkCompletedNormally(g, v1);
1701 +    }}
1702 +
1703 +    public void testRunAfterBoth_sourceCancelled2() {
1704 +        for (ExecutionMode m : ExecutionMode.values())
1705 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1706 +        for (Integer v1 : new Integer[] { 1, null })
1707 +    {
1708 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1709 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1710 +        final Noop r = new Noop();
1711 +        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1712  
1713 <        f = new CompletableFuture<Integer>();
1413 <        g = new CompletableFuture<Integer>();
1414 <        h = f.thenCombineAsync(g, subtract);
1415 <        assertTrue(g.cancel(true));
1713 >        assertTrue(g.cancel(mayInterruptIfRunning));
1714          checkIncomplete(h);
1715 <        f.complete(3);
1418 <        checkCompletedWithWrappedCancellationException(h);
1715 >        f.complete(v1);
1716  
1420        f = new CompletableFuture<Integer>();
1421        g = new CompletableFuture<Integer>();
1422        g.complete(3);
1423        assertTrue(f.cancel(true));
1424        h = f.thenCombineAsync(g, subtract);
1717          checkCompletedWithWrappedCancellationException(h);
1718 +        checkCancelled(g);
1719 +        assertEquals(0, r.invocationCount);
1720 +        checkCompletedNormally(f, v1);
1721 +    }}
1722 +
1723 +    public void testRunAfterBoth_sourceCancelled3() {
1724 +        for (ExecutionMode m : ExecutionMode.values())
1725 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1726 +        for (Integer v1 : new Integer[] { 1, null })
1727 +    {
1728 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1729 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1730 +        final Noop r = new Noop();
1731 +
1732 +        assertTrue(g.cancel(mayInterruptIfRunning));
1733 +        f.complete(v1);
1734 +        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1735  
1427        f = new CompletableFuture<Integer>();
1428        g = new CompletableFuture<Integer>();
1429        f.complete(3);
1430        assertTrue(g.cancel(true));
1431        h = f.thenCombineAsync(g, subtract);
1736          checkCompletedWithWrappedCancellationException(h);
1737 <    }
1737 >        checkCancelled(g);
1738 >        assertEquals(0, r.invocationCount);
1739 >        checkCompletedNormally(f, v1);
1740 >    }}
1741 >
1742 >    public void testRunAfterBoth_sourceCancelled4() {
1743 >        for (ExecutionMode m : ExecutionMode.values())
1744 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1745 >        for (Integer v1 : new Integer[] { 1, null })
1746 >    {
1747 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1748 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1749 >        final Noop r = new Noop();
1750 >
1751 >        assertTrue(f.cancel(mayInterruptIfRunning));
1752 >        g.complete(v1);
1753 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1754  
1755 <    /**
1756 <     * thenAcceptBothAsync result completes normally after normal
1757 <     * completion of sources
1758 <     */
1759 <    public void testThenAcceptBothAsync() {
1440 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1441 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1442 <        AddAction r = new AddAction();
1443 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1444 <        f.complete(one);
1445 <        checkIncomplete(g);
1446 <        f2.complete(two);
1447 <        checkCompletedNormally(g, null);
1448 <        assertEquals(r.value, 3);
1449 <    }
1450 <
1451 <    /**
1452 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1453 <     * completion of source
1454 <     */
1455 <    public void testThenAcceptBothAsync2() {
1456 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1457 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1458 <        AddAction r = new AddAction();
1459 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1460 <        f.completeExceptionally(new CFException());
1461 <        f2.complete(two);
1462 <        checkCompletedWithWrappedCFException(g);
1463 <
1464 <        r = new AddAction();
1465 <        f = new CompletableFuture<Integer>();
1466 <        f2 = new CompletableFuture<Integer>();
1467 <        g = f.thenAcceptBothAsync(f2, r);
1468 <        f.complete(one);
1469 <        f2.completeExceptionally(new CFException());
1470 <        checkCompletedWithWrappedCFException(g);
1471 <    }
1472 <
1473 <    /**
1474 <     * thenAcceptBothAsync result completes exceptionally if action does
1475 <     */
1476 <    public void testThenAcceptBothAsync3() {
1477 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1478 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1479 <        FailingBiConsumer r = new FailingBiConsumer();
1480 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1481 <        f.complete(one);
1482 <        checkIncomplete(g);
1483 <        f2.complete(two);
1484 <        checkCompletedWithWrappedCFException(g);
1485 <    }
1486 <
1487 <    /**
1488 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1489 <     */
1490 <    public void testThenAcceptBothAsync4() {
1491 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1492 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1493 <        AddAction r = new AddAction();
1494 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1495 <        assertTrue(f.cancel(true));
1496 <        f2.complete(two);
1497 <        checkCompletedWithWrappedCancellationException(g);
1498 <
1499 <        r = new AddAction();
1500 <        f = new CompletableFuture<Integer>();
1501 <        f2 = new CompletableFuture<Integer>();
1502 <        g = f.thenAcceptBothAsync(f2, r);
1503 <        f.complete(one);
1504 <        assertTrue(f2.cancel(true));
1505 <        checkCompletedWithWrappedCancellationException(g);
1506 <    }
1507 <
1508 <    /**
1509 <     * runAfterBothAsync result completes normally after normal
1510 <     * completion of sources
1511 <     */
1512 <    public void testRunAfterBothAsync() {
1513 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1514 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1515 <        Noop r = new Noop();
1516 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1517 <        f.complete(one);
1518 <        checkIncomplete(g);
1519 <        f2.complete(two);
1520 <        checkCompletedNormally(g, null);
1521 <        assertTrue(r.ran);
1522 <    }
1523 <
1524 <    /**
1525 <     * runAfterBothAsync result completes exceptionally after exceptional
1526 <     * completion of source
1527 <     */
1528 <    public void testRunAfterBothAsync2() {
1529 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1530 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1531 <        Noop r = new Noop();
1532 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1533 <        f.completeExceptionally(new CFException());
1534 <        f2.complete(two);
1535 <        checkCompletedWithWrappedCFException(g);
1536 <
1537 <        r = new Noop();
1538 <        f = new CompletableFuture<Integer>();
1539 <        f2 = new CompletableFuture<Integer>();
1540 <        g = f.runAfterBothAsync(f2, r);
1541 <        f.complete(one);
1542 <        f2.completeExceptionally(new CFException());
1543 <        checkCompletedWithWrappedCFException(g);
1544 <    }
1755 >        checkCompletedWithWrappedCancellationException(h);
1756 >        checkCancelled(f);
1757 >        assertEquals(0, r.invocationCount);
1758 >        checkCompletedNormally(g, v1);
1759 >    }}
1760  
1761      /**
1762 <     * runAfterBothAsync result completes exceptionally if action does
1762 >     * applyToEither result completes normally after normal completion
1763 >     * of either source
1764       */
1765 <    public void testRunAfterBothAsync3() {
1766 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1767 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1768 <        FailingNoop r = new FailingNoop();
1769 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1770 <        f.complete(one);
1771 <        checkIncomplete(g);
1772 <        f2.complete(two);
1773 <        checkCompletedWithWrappedCFException(g);
1774 <    }
1765 >    public void testApplyToEither_normalCompletion1() {
1766 >        for (ExecutionMode m : ExecutionMode.values())
1767 >        for (Integer v1 : new Integer[] { 1, null })
1768 >        for (Integer v2 : new Integer[] { 2, null })
1769 >    {
1770 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1771 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1772 >        final IncFunction r = new IncFunction();
1773 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1774 >
1775 >        f.complete(v1);
1776 >        checkCompletedNormally(h, inc(v1));
1777 >        g.complete(v2);
1778 >
1779 >        checkCompletedNormally(f, v1);
1780 >        checkCompletedNormally(g, v2);
1781 >        checkCompletedNormally(h, inc(v1));
1782 >    }}
1783 >
1784 >    public void testApplyToEither_normalCompletion2() {
1785 >        for (ExecutionMode m : ExecutionMode.values())
1786 >        for (Integer v1 : new Integer[] { 1, null })
1787 >        for (Integer v2 : new Integer[] { 2, null })
1788 >    {
1789 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1790 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1791 >        final IncFunction r = new IncFunction();
1792 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1793 >
1794 >        g.complete(v2);
1795 >        checkCompletedNormally(h, inc(v2));
1796 >        f.complete(v1);
1797 >
1798 >        checkCompletedNormally(f, v1);
1799 >        checkCompletedNormally(g, v2);
1800 >        checkCompletedNormally(h, inc(v2));
1801 >        }}
1802 >
1803 >    public void testApplyToEither_normalCompletion3() {
1804 >        for (ExecutionMode m : ExecutionMode.values())
1805 >        for (Integer v1 : new Integer[] { 1, null })
1806 >        for (Integer v2 : new Integer[] { 2, null })
1807 >    {
1808 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1809 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1810 >        final IncFunction r = new IncFunction();
1811 >
1812 >        f.complete(v1);
1813 >        g.complete(v2);
1814 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1815 >
1816 >        checkCompletedNormally(f, v1);
1817 >        checkCompletedNormally(g, v2);
1818 >
1819 >        // unspecified behavior
1820 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1821 >                   Objects.equals(h.join(), inc(v2)));
1822 >        assertEquals(1, r.invocationCount);
1823 >    }}
1824  
1825      /**
1826 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1826 >     * applyToEither result completes exceptionally after exceptional
1827 >     * completion of either source
1828       */
1829 <    public void testRunAfterBothAsync4() {
1830 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1831 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1832 <        Noop r = new Noop();
1833 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1834 <        assertTrue(f.cancel(true));
1835 <        f2.complete(two);
1836 <        checkCompletedWithWrappedCancellationException(g);
1837 <
1838 <        r = new Noop();
1839 <        f = new CompletableFuture<Integer>();
1840 <        f2 = new CompletableFuture<Integer>();
1841 <        g = f.runAfterBothAsync(f2, r);
1842 <        f.complete(one);
1843 <        assertTrue(f2.cancel(true));
1844 <        checkCompletedWithWrappedCancellationException(g);
1845 <    }
1829 >    public void testApplyToEither_exceptionalCompletion1() {
1830 >        for (ExecutionMode m : ExecutionMode.values())
1831 >        for (Integer v1 : new Integer[] { 1, null })
1832 >    {
1833 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1834 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1835 >        final IncFunction r = new IncFunction();
1836 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1837 >        final CFException ex = new CFException();
1838 >
1839 >        f.completeExceptionally(ex);
1840 >        checkCompletedWithWrappedCFException(h, ex);
1841 >        g.complete(v1);
1842 >
1843 >        assertEquals(0, r.invocationCount);
1844 >        checkCompletedNormally(g, v1);
1845 >        checkCompletedWithWrappedCFException(f, ex);
1846 >        checkCompletedWithWrappedCFException(h, ex);
1847 >    }}
1848 >
1849 >    public void testApplyToEither_exceptionalCompletion2() {
1850 >        for (ExecutionMode m : ExecutionMode.values())
1851 >        for (Integer v1 : new Integer[] { 1, null })
1852 >    {
1853 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1854 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1855 >        final IncFunction r = new IncFunction();
1856 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1857 >        final CFException ex = new CFException();
1858 >
1859 >        g.completeExceptionally(ex);
1860 >        checkCompletedWithWrappedCFException(h, ex);
1861 >        f.complete(v1);
1862 >
1863 >        assertEquals(0, r.invocationCount);
1864 >        checkCompletedNormally(f, v1);
1865 >        checkCompletedWithWrappedCFException(g, ex);
1866 >        checkCompletedWithWrappedCFException(h, ex);
1867 >    }}
1868 >
1869 >    public void testApplyToEither_exceptionalCompletion3() {
1870 >        for (ExecutionMode m : ExecutionMode.values())
1871 >        for (Integer v1 : new Integer[] { 1, null })
1872 >    {
1873 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1874 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1875 >        final IncFunction r = new IncFunction();
1876 >        final CFException ex = new CFException();
1877 >
1878 >        g.completeExceptionally(ex);
1879 >        f.complete(v1);
1880 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1881  
1882 <    /**
1883 <     * applyToEitherAsync result completes normally after normal
1884 <     * completion of sources
1885 <     */
1886 <    public void testApplyToEitherAsync() {
1887 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1888 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1889 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1890 <        f.complete(one);
1590 <        checkCompletedNormally(g, two);
1882 >        // unspecified behavior
1883 >        Integer v;
1884 >        try {
1885 >            assertEquals(inc(v1), h.join());
1886 >            assertEquals(1, r.invocationCount);
1887 >        } catch (CompletionException ok) {
1888 >            checkCompletedWithWrappedCFException(h, ex);
1889 >            assertEquals(0, r.invocationCount);
1890 >        }
1891  
1892 <        f = new CompletableFuture<Integer>();
1893 <        f.complete(one);
1894 <        f2 = new CompletableFuture<Integer>();
1895 <        g = f.applyToEitherAsync(f2, inc);
1896 <        checkCompletedNormally(g, two);
1897 <    }
1892 >        checkCompletedWithWrappedCFException(g, ex);
1893 >        checkCompletedNormally(f, v1);
1894 >    }}
1895 >
1896 >    public void testApplyToEither_exceptionalCompletion4() {
1897 >        for (ExecutionMode m : ExecutionMode.values())
1898 >        for (Integer v1 : new Integer[] { 1, null })
1899 >    {
1900 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1901 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1902 >        final IncFunction r = new IncFunction();
1903 >        final CFException ex = new CFException();
1904 >
1905 >        f.completeExceptionally(ex);
1906 >        g.complete(v1);
1907 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1908  
1909 <    /**
1910 <     * applyToEitherAsync result completes exceptionally after exceptional
1911 <     * completion of source
1912 <     */
1913 <    public void testApplyToEitherAsync2() {
1914 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1915 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1916 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1917 <        f.completeExceptionally(new CFException());
1608 <        checkCompletedWithWrappedCFException(g);
1909 >        // unspecified behavior
1910 >        Integer v;
1911 >        try {
1912 >            assertEquals(inc(v1), h.join());
1913 >            assertEquals(1, r.invocationCount);
1914 >        } catch (CompletionException ok) {
1915 >            checkCompletedWithWrappedCFException(h, ex);
1916 >            assertEquals(0, r.invocationCount);
1917 >        }
1918  
1919 <        f = new CompletableFuture<Integer>();
1920 <        f2 = new CompletableFuture<Integer>();
1921 <        f2.completeExceptionally(new CFException());
1613 <        g = f.applyToEitherAsync(f2, inc);
1614 <        f.complete(one);
1615 <        checkCompletedWithWrappedCFException(g);
1616 <    }
1919 >        checkCompletedWithWrappedCFException(f, ex);
1920 >        checkCompletedNormally(g, v1);
1921 >    }}
1922  
1923      /**
1924 <     * applyToEitherAsync result completes exceptionally if action does
1924 >     * applyToEither result completes exceptionally if action does
1925       */
1926 <    public void testApplyToEitherAsync3() {
1927 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1928 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1929 <        FailingFunction r = new FailingFunction();
1930 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1931 <        f.complete(one);
1932 <        checkCompletedWithWrappedCFException(g);
1933 <    }
1926 >    public void testApplyToEither_actionFailed1() {
1927 >        for (ExecutionMode m : ExecutionMode.values())
1928 >        for (Integer v1 : new Integer[] { 1, null })
1929 >        for (Integer v2 : new Integer[] { 2, null })
1930 >    {
1931 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1932 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1933 >        final FailingFunction r = new FailingFunction();
1934 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1935  
1936 <    /**
1937 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1938 <     */
1939 <    public void testApplyToEitherAsync4() {
1940 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1941 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1942 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1943 <        assertTrue(f.cancel(true));
1944 <        checkCompletedWithWrappedCancellationException(g);
1936 >        f.complete(v1);
1937 >        checkCompletedWithWrappedCFException(h);
1938 >        g.complete(v2);
1939 >        checkCompletedNormally(f, v1);
1940 >        checkCompletedNormally(g, v2);
1941 >    }}
1942 >
1943 >    public void testApplyToEither_actionFailed2() {
1944 >        for (ExecutionMode m : ExecutionMode.values())
1945 >        for (Integer v1 : new Integer[] { 1, null })
1946 >        for (Integer v2 : new Integer[] { 2, null })
1947 >    {
1948 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1949 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1950 >        final FailingFunction r = new FailingFunction();
1951 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1952  
1953 <        f = new CompletableFuture<Integer>();
1954 <        f2 = new CompletableFuture<Integer>();
1955 <        assertTrue(f2.cancel(true));
1956 <        g = f.applyToEitherAsync(f2, inc);
1957 <        checkCompletedWithWrappedCancellationException(g);
1958 <    }
1953 >        g.complete(v2);
1954 >        checkCompletedWithWrappedCFException(h);
1955 >        f.complete(v1);
1956 >        checkCompletedNormally(f, v1);
1957 >        checkCompletedNormally(g, v2);
1958 >    }}
1959  
1960      /**
1961 <     * acceptEitherAsync result completes normally after normal
1649 <     * completion of sources
1961 >     * applyToEither result completes exceptionally if either source cancelled
1962       */
1963 <    public void testAcceptEitherAsync() {
1964 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1965 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1966 <        IncAction r = new IncAction();
1967 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1968 <        f.complete(one);
1969 <        checkCompletedNormally(g, null);
1970 <        assertEquals(r.value, 2);
1963 >    public void testApplyToEither_sourceCancelled1() {
1964 >        for (ExecutionMode m : ExecutionMode.values())
1965 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1966 >        for (Integer v1 : new Integer[] { 1, null })
1967 >    {
1968 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1969 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1970 >        final IncFunction r = new IncFunction();
1971 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1972  
1973 <        r = new IncAction();
1974 <        f = new CompletableFuture<Integer>();
1975 <        f.complete(one);
1663 <        f2 = new CompletableFuture<Integer>();
1664 <        g = f.acceptEitherAsync(f2, r);
1665 <        checkCompletedNormally(g, null);
1666 <        assertEquals(r.value, 2);
1667 <    }
1973 >        assertTrue(f.cancel(mayInterruptIfRunning));
1974 >        checkCompletedWithWrappedCancellationException(h);
1975 >        g.complete(v1);
1976  
1977 <    /**
1978 <     * acceptEitherAsync result completes exceptionally after exceptional
1979 <     * completion of source
1980 <     */
1981 <    public void testAcceptEitherAsync2() {
1674 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1675 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1676 <        IncAction r = new IncAction();
1677 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1678 <        f.completeExceptionally(new CFException());
1679 <        checkCompletedWithWrappedCFException(g);
1977 >        checkCancelled(f);
1978 >        assertEquals(0, r.invocationCount);
1979 >        checkCompletedNormally(g, v1);
1980 >        checkCompletedWithWrappedCancellationException(h);
1981 >    }}
1982  
1983 <        r = new IncAction();
1984 <        f = new CompletableFuture<Integer>();
1985 <        f2 = new CompletableFuture<Integer>();
1986 <        f2.completeExceptionally(new CFException());
1987 <        g = f.acceptEitherAsync(f2, r);
1988 <        f.complete(one);
1989 <        checkCompletedWithWrappedCFException(g);
1990 <    }
1983 >    public void testApplyToEither_sourceCancelled2() {
1984 >        for (ExecutionMode m : ExecutionMode.values())
1985 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1986 >        for (Integer v1 : new Integer[] { 1, null })
1987 >    {
1988 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1989 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1990 >        final IncFunction r = new IncFunction();
1991 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1992  
1993 <    /**
1994 <     * acceptEitherAsync result completes exceptionally if action does
1995 <     */
1693 <    public void testAcceptEitherAsync3() {
1694 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1695 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1696 <        FailingConsumer r = new FailingConsumer();
1697 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1698 <        f.complete(one);
1699 <        checkCompletedWithWrappedCFException(g);
1700 <    }
1993 >        assertTrue(g.cancel(mayInterruptIfRunning));
1994 >        checkCompletedWithWrappedCancellationException(h);
1995 >        f.complete(v1);
1996  
1997 <    /**
1998 <     * acceptEitherAsync result completes exceptionally if either
1999 <     * source cancelled
2000 <     */
2001 <    public void testAcceptEitherAsync4() {
1707 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1708 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1709 <        IncAction r = new IncAction();
1710 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1711 <        assertTrue(f.cancel(true));
1712 <        checkCompletedWithWrappedCancellationException(g);
1997 >        checkCancelled(g);
1998 >        assertEquals(0, r.invocationCount);
1999 >        checkCompletedNormally(f, v1);
2000 >        checkCompletedWithWrappedCancellationException(h);
2001 >    }}
2002  
2003 <        r = new IncAction();
2004 <        f = new CompletableFuture<Integer>();
2005 <        f2 = new CompletableFuture<Integer>();
2006 <        assertTrue(f2.cancel(true));
2007 <        g = f.acceptEitherAsync(f2, r);
2008 <        checkCompletedWithWrappedCancellationException(g);
2009 <    }
2003 >    public void testApplyToEither_sourceCancelled3() {
2004 >        for (ExecutionMode m : ExecutionMode.values())
2005 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2006 >        for (Integer v1 : new Integer[] { 1, null })
2007 >    {
2008 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2009 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2010 >        final IncFunction r = new IncFunction();
2011 >
2012 >        assertTrue(g.cancel(mayInterruptIfRunning));
2013 >        f.complete(v1);
2014 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2015  
2016 <    /**
2017 <     * runAfterEitherAsync result completes normally after normal
2018 <     * completion of sources
2019 <     */
2020 <    public void testRunAfterEitherAsync() {
2021 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2022 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2023 <        Noop r = new Noop();
2024 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1731 <        f.complete(one);
1732 <        checkCompletedNormally(g, null);
1733 <        assertTrue(r.ran);
2016 >        // unspecified behavior
2017 >        Integer v;
2018 >        try {
2019 >            assertEquals(inc(v1), h.join());
2020 >            assertEquals(1, r.invocationCount);
2021 >        } catch (CompletionException ok) {
2022 >            checkCompletedWithWrappedCancellationException(h);
2023 >            assertEquals(0, r.invocationCount);
2024 >        }
2025  
2026 <        r = new Noop();
2027 <        f = new CompletableFuture<Integer>();
2028 <        f.complete(one);
2029 <        f2 = new CompletableFuture<Integer>();
2030 <        g = f.runAfterEitherAsync(f2, r);
2031 <        checkCompletedNormally(g, null);
2032 <        assertTrue(r.ran);
2033 <    }
2026 >        checkCancelled(g);
2027 >        checkCompletedNormally(f, v1);
2028 >    }}
2029 >
2030 >    public void testApplyToEither_sourceCancelled4() {
2031 >        for (ExecutionMode m : ExecutionMode.values())
2032 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2033 >        for (Integer v1 : new Integer[] { 1, null })
2034 >    {
2035 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2036 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2037 >        final IncFunction r = new IncFunction();
2038 >
2039 >        assertTrue(f.cancel(mayInterruptIfRunning));
2040 >        g.complete(v1);
2041 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2042  
2043 <    /**
2044 <     * runAfterEitherAsync result completes exceptionally after exceptional
2045 <     * completion of source
2046 <     */
2047 <    public void testRunAfterEitherAsync2() {
2048 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2049 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2050 <        Noop r = new Noop();
2051 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1753 <        f.completeExceptionally(new CFException());
1754 <        checkCompletedWithWrappedCFException(g);
2043 >        // unspecified behavior
2044 >        Integer v;
2045 >        try {
2046 >            assertEquals(inc(v1), h.join());
2047 >            assertEquals(1, r.invocationCount);
2048 >        } catch (CompletionException ok) {
2049 >            checkCompletedWithWrappedCancellationException(h);
2050 >            assertEquals(0, r.invocationCount);
2051 >        }
2052  
2053 <        r = new Noop();
2054 <        f = new CompletableFuture<Integer>();
2055 <        f2 = new CompletableFuture<Integer>();
1759 <        f2.completeExceptionally(new CFException());
1760 <        g = f.runAfterEitherAsync(f2, r);
1761 <        f.complete(one);
1762 <        checkCompletedWithWrappedCFException(g);
1763 <    }
2053 >        checkCancelled(f);
2054 >        checkCompletedNormally(g, v1);
2055 >    }}
2056  
2057      /**
2058 <     * runAfterEitherAsync result completes exceptionally if action does
2058 >     * acceptEither result completes normally after normal completion
2059 >     * of either source
2060       */
2061 <    public void testRunAfterEitherAsync3() {
2062 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2063 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2064 <        FailingNoop r = new FailingNoop();
2065 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2066 <        f.complete(one);
2067 <        checkCompletedWithWrappedCFException(g);
2068 <    }
2061 >    public void testAcceptEither_normalCompletion1() {
2062 >        for (ExecutionMode m : ExecutionMode.values())
2063 >        for (Integer v1 : new Integer[] { 1, null })
2064 >        for (Integer v2 : new Integer[] { 2, null })
2065 >    {
2066 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2067 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2068 >        final IncAction r = new IncAction();
2069 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2070 >
2071 >        f.complete(v1);
2072 >        checkCompletedNormally(h, null);
2073 >        assertEquals(inc(v1), r.value);
2074 >        g.complete(v2);
2075 >
2076 >        checkCompletedNormally(f, v1);
2077 >        checkCompletedNormally(g, v2);
2078 >        checkCompletedNormally(h, null);
2079 >    }}
2080 >
2081 >    public void testAcceptEither_normalCompletion2() {
2082 >        for (ExecutionMode m : ExecutionMode.values())
2083 >        for (Integer v1 : new Integer[] { 1, null })
2084 >        for (Integer v2 : new Integer[] { 2, null })
2085 >    {
2086 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2087 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2088 >        final IncAction r = new IncAction();
2089 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2090 >
2091 >        g.complete(v2);
2092 >        checkCompletedNormally(h, null);
2093 >        assertEquals(inc(v2), r.value);
2094 >        f.complete(v1);
2095 >
2096 >        checkCompletedNormally(f, v1);
2097 >        checkCompletedNormally(g, v2);
2098 >        checkCompletedNormally(h, null);
2099 >    }}
2100 >
2101 >    public void testAcceptEither_normalCompletion3() {
2102 >        for (ExecutionMode m : ExecutionMode.values())
2103 >        for (Integer v1 : new Integer[] { 1, null })
2104 >        for (Integer v2 : new Integer[] { 2, null })
2105 >    {
2106 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2107 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2108 >        final IncAction r = new IncAction();
2109 >
2110 >        f.complete(v1);
2111 >        g.complete(v2);
2112 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2113 >
2114 >        checkCompletedNormally(h, null);
2115 >        checkCompletedNormally(f, v1);
2116 >        checkCompletedNormally(g, v2);
2117 >
2118 >        // unspecified behavior
2119 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2120 >                   Objects.equals(r.value, inc(v2)));
2121 >    }}
2122  
2123      /**
2124 <     * runAfterEitherAsync result completes exceptionally if either
2125 <     * source cancelled
2124 >     * acceptEither result completes exceptionally after exceptional
2125 >     * completion of either source
2126       */
2127 <    public void testRunAfterEitherAsync4() {
2128 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2129 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2130 <        Noop r = new Noop();
2131 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2132 <        assertTrue(f.cancel(true));
2133 <        checkCompletedWithWrappedCancellationException(g);
2127 >    public void testAcceptEither_exceptionalCompletion1() {
2128 >        for (ExecutionMode m : ExecutionMode.values())
2129 >        for (Integer v1 : new Integer[] { 1, null })
2130 >    {
2131 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2132 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2133 >        final IncAction r = new IncAction();
2134 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2135 >        final CFException ex = new CFException();
2136 >
2137 >        f.completeExceptionally(ex);
2138 >        checkCompletedWithWrappedCFException(h, ex);
2139 >        g.complete(v1);
2140 >
2141 >        assertEquals(0, r.invocationCount);
2142 >        checkCompletedNormally(g, v1);
2143 >        checkCompletedWithWrappedCFException(f, ex);
2144 >        checkCompletedWithWrappedCFException(h, ex);
2145 >    }}
2146 >
2147 >    public void testAcceptEither_exceptionalCompletion2() {
2148 >        for (ExecutionMode m : ExecutionMode.values())
2149 >        for (Integer v1 : new Integer[] { 1, null })
2150 >    {
2151 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2152 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2153 >        final IncAction r = new IncAction();
2154 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2155 >        final CFException ex = new CFException();
2156 >
2157 >        g.completeExceptionally(ex);
2158 >        checkCompletedWithWrappedCFException(h, ex);
2159 >        f.complete(v1);
2160 >
2161 >        assertEquals(0, r.invocationCount);
2162 >        checkCompletedNormally(f, v1);
2163 >        checkCompletedWithWrappedCFException(g, ex);
2164 >        checkCompletedWithWrappedCFException(h, ex);
2165 >    }}
2166 >
2167 >    public void testAcceptEither_exceptionalCompletion3() {
2168 >        for (ExecutionMode m : ExecutionMode.values())
2169 >        for (Integer v1 : new Integer[] { 1, null })
2170 >    {
2171 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2172 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2173 >        final IncAction r = new IncAction();
2174 >        final CFException ex = new CFException();
2175 >
2176 >        g.completeExceptionally(ex);
2177 >        f.complete(v1);
2178 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2179  
2180 <        r = new Noop();
2181 <        f = new CompletableFuture<Integer>();
2182 <        f2 = new CompletableFuture<Integer>();
2183 <        assertTrue(f2.cancel(true));
2184 <        g = f.runAfterEitherAsync(f2, r);
2185 <        checkCompletedWithWrappedCancellationException(g);
2186 <    }
2180 >        // unspecified behavior
2181 >        Integer v;
2182 >        try {
2183 >            assertNull(h.join());
2184 >            assertEquals(1, r.invocationCount);
2185 >            assertEquals(inc(v1), r.value);
2186 >        } catch (CompletionException ok) {
2187 >            checkCompletedWithWrappedCFException(h, ex);
2188 >            assertEquals(0, r.invocationCount);
2189 >        }
2190  
2191 <    /**
2192 <     * thenComposeAsync result completes normally after normal
2193 <     * completion of source
2194 <     */
2195 <    public void testThenComposeAsync() {
2196 <        CompletableFuture<Integer> f, g;
2197 <        CompletableFutureInc r;
2191 >        checkCompletedWithWrappedCFException(g, ex);
2192 >        checkCompletedNormally(f, v1);
2193 >    }}
2194 >
2195 >    public void testAcceptEither_exceptionalCompletion4() {
2196 >        for (ExecutionMode m : ExecutionMode.values())
2197 >        for (Integer v1 : new Integer[] { 1, null })
2198 >    {
2199 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2200 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2201 >        final IncAction r = new IncAction();
2202 >        final CFException ex = new CFException();
2203 >
2204 >        f.completeExceptionally(ex);
2205 >        g.complete(v1);
2206 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2207  
2208 <        f = new CompletableFuture<Integer>();
2209 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2210 <        f.complete(one);
2211 <        checkCompletedNormally(g, two);
2208 >        // unspecified behavior
2209 >        Integer v;
2210 >        try {
2211 >            assertNull(h.join());
2212 >            assertEquals(1, r.invocationCount);
2213 >            assertEquals(inc(v1), r.value);
2214 >        } catch (CompletionException ok) {
2215 >            checkCompletedWithWrappedCFException(h, ex);
2216 >            assertEquals(0, r.invocationCount);
2217 >        }
2218  
2219 <        f = new CompletableFuture<Integer>();
2220 <        f.complete(one);
2221 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1813 <        checkCompletedNormally(g, two);
1814 <    }
2219 >        checkCompletedWithWrappedCFException(f, ex);
2220 >        checkCompletedNormally(g, v1);
2221 >    }}
2222  
2223      /**
2224 <     * thenComposeAsync result completes exceptionally after
1818 <     * exceptional completion of source
2224 >     * acceptEither result completes exceptionally if action does
2225       */
2226 <    public void testThenComposeAsync2() {
2227 <        CompletableFuture<Integer> f, g;
2228 <        CompletableFutureInc r;
2229 <
2230 <        f = new CompletableFuture<Integer>();
2231 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2232 <        f.completeExceptionally(new CFException());
2233 <        checkCompletedWithWrappedCFException(g);
2234 <        assertFalse(r.ran);
2226 >    public void testAcceptEither_actionFailed1() {
2227 >        for (ExecutionMode m : ExecutionMode.values())
2228 >        for (Integer v1 : new Integer[] { 1, null })
2229 >        for (Integer v2 : new Integer[] { 2, null })
2230 >    {
2231 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2232 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2233 >        final FailingConsumer r = new FailingConsumer();
2234 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2235  
2236 <        f = new CompletableFuture<Integer>();
2237 <        f.completeExceptionally(new CFException());
2238 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2239 <        checkCompletedWithWrappedCFException(g);
2240 <        assertFalse(r.ran);
2241 <    }
2236 >        f.complete(v1);
2237 >        checkCompletedWithWrappedCFException(h);
2238 >        g.complete(v2);
2239 >        checkCompletedNormally(f, v1);
2240 >        checkCompletedNormally(g, v2);
2241 >    }}
2242 >
2243 >    public void testAcceptEither_actionFailed2() {
2244 >        for (ExecutionMode m : ExecutionMode.values())
2245 >        for (Integer v1 : new Integer[] { 1, null })
2246 >        for (Integer v2 : new Integer[] { 2, null })
2247 >    {
2248 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2249 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2250 >        final FailingConsumer r = new FailingConsumer();
2251 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2252  
2253 <    /**
2254 <     * thenComposeAsync result completes exceptionally if action does
2255 <     */
2256 <    public void testThenComposeAsync3() {
2257 <        CompletableFuture<Integer> f, g;
2258 <        FailingCompletableFutureFunction r;
1843 <        
1844 <        f = new CompletableFuture<Integer>();
1845 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
1846 <        f.complete(one);
1847 <        checkCompletedWithWrappedCFException(g);
1848 <        
1849 <        f = new CompletableFuture<Integer>();
1850 <        f.complete(one);
1851 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
1852 <        checkCompletedWithWrappedCFException(g);
1853 <    }
2253 >        g.complete(v2);
2254 >        checkCompletedWithWrappedCFException(h);
2255 >        f.complete(v1);
2256 >        checkCompletedNormally(f, v1);
2257 >        checkCompletedNormally(g, v2);
2258 >    }}
2259  
2260      /**
2261 <     * thenComposeAsync result completes exceptionally if source cancelled
2261 >     * acceptEither result completes exceptionally if either source cancelled
2262       */
2263 <    public void testThenComposeAsync4() {
2264 <        CompletableFuture<Integer> f, g;
2265 <        CompletableFutureInc r;
2263 >    public void testAcceptEither_sourceCancelled1() {
2264 >        for (ExecutionMode m : ExecutionMode.values())
2265 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2266 >        for (Integer v1 : new Integer[] { 1, null })
2267 >    {
2268 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2269 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2270 >        final IncAction r = new IncAction();
2271 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2272  
2273 <        f = new CompletableFuture<Integer>();
2274 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2275 <        assertTrue(f.cancel(true));
1865 <        checkCompletedWithWrappedCancellationException(g);
2273 >        assertTrue(f.cancel(mayInterruptIfRunning));
2274 >        checkCompletedWithWrappedCancellationException(h);
2275 >        g.complete(v1);
2276  
2277 <        f = new CompletableFuture<Integer>();
2278 <        assertTrue(f.cancel(true));
2279 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2280 <        checkCompletedWithWrappedCancellationException(g);
2281 <    }
2277 >        checkCancelled(f);
2278 >        assertEquals(0, r.invocationCount);
2279 >        checkCompletedNormally(g, v1);
2280 >        checkCompletedWithWrappedCancellationException(h);
2281 >    }}
2282  
2283 +    public void testAcceptEither_sourceCancelled2() {
2284 +        for (ExecutionMode m : ExecutionMode.values())
2285 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2286 +        for (Integer v1 : new Integer[] { 1, null })
2287 +    {
2288 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2289 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2290 +        final IncAction r = new IncAction();
2291 +        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2292  
2293 <    // async with explicit executors
2293 >        assertTrue(g.cancel(mayInterruptIfRunning));
2294 >        checkCompletedWithWrappedCancellationException(h);
2295 >        f.complete(v1);
2296  
2297 <    /**
2298 <     * thenRunAsync result completes normally after normal completion of source
2299 <     */
2300 <    public void testThenRunAsyncE() {
2301 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1881 <        Noop r = new Noop();
1882 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1883 <        f.complete(null);
1884 <        checkCompletedNormally(g, null);
2297 >        checkCancelled(g);
2298 >        assertEquals(0, r.invocationCount);
2299 >        checkCompletedNormally(f, v1);
2300 >        checkCompletedWithWrappedCancellationException(h);
2301 >    }}
2302  
2303 <        // reordered version
2304 <        f = new CompletableFuture<Integer>();
2305 <        f.complete(null);
2306 <        r = new Noop();
2307 <        g = f.thenRunAsync(r, new ThreadExecutor());
2308 <        checkCompletedNormally(g, null);
2309 <    }
2303 >    public void testAcceptEither_sourceCancelled3() {
2304 >        for (ExecutionMode m : ExecutionMode.values())
2305 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2306 >        for (Integer v1 : new Integer[] { 1, null })
2307 >    {
2308 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2309 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2310 >        final IncAction r = new IncAction();
2311 >
2312 >        assertTrue(g.cancel(mayInterruptIfRunning));
2313 >        f.complete(v1);
2314 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2315  
2316 <    /**
2317 <     * thenRunAsync result completes exceptionally after exceptional
1896 <     * completion of source
1897 <     */
1898 <    public void testThenRunAsync2E() {
1899 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1900 <        Noop r = new Noop();
1901 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1902 <        f.completeExceptionally(new CFException());
2316 >        // unspecified behavior
2317 >        Integer v;
2318          try {
2319 <            g.join();
2320 <            shouldThrow();
2321 <        } catch (Exception ok) {
2319 >            assertNull(h.join());
2320 >            assertEquals(1, r.invocationCount);
2321 >            assertEquals(inc(v1), r.value);
2322 >        } catch (CompletionException ok) {
2323 >            checkCompletedWithWrappedCancellationException(h);
2324 >            assertEquals(0, r.invocationCount);
2325          }
1908        checkCompletedWithWrappedCFException(g);
1909    }
1910
1911    /**
1912     * thenRunAsync result completes exceptionally if action does
1913     */
1914    public void testThenRunAsync3E() {
1915        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1916        FailingNoop r = new FailingNoop();
1917        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1918        f.complete(null);
1919        checkCompletedWithWrappedCFException(g);
1920    }
1921
1922    /**
1923     * thenRunAsync result completes exceptionally if source cancelled
1924     */
1925    public void testThenRunAsync4E() {
1926        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1927        Noop r = new Noop();
1928        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1929        assertTrue(f.cancel(true));
1930        checkCompletedWithWrappedCancellationException(g);
1931    }
1932
1933    /**
1934     * thenApplyAsync result completes normally after normal completion of source
1935     */
1936    public void testThenApplyAsyncE() {
1937        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1938        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1939        f.complete(one);
1940        checkCompletedNormally(g, two);
1941    }
2326  
2327 <    /**
2328 <     * thenApplyAsync result completes exceptionally after exceptional
2329 <     * completion of source
2330 <     */
2331 <    public void testThenApplyAsync2E() {
2332 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2333 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2334 <        f.completeExceptionally(new CFException());
2335 <        checkCompletedWithWrappedCFException(g);
2336 <    }
2327 >        checkCancelled(g);
2328 >        checkCompletedNormally(f, v1);
2329 >    }}
2330 >
2331 >    public void testAcceptEither_sourceCancelled4() {
2332 >        for (ExecutionMode m : ExecutionMode.values())
2333 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2334 >        for (Integer v1 : new Integer[] { 1, null })
2335 >    {
2336 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2337 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2338 >        final IncAction r = new IncAction();
2339 >
2340 >        assertTrue(f.cancel(mayInterruptIfRunning));
2341 >        g.complete(v1);
2342 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2343  
2344 <    /**
2345 <     * thenApplyAsync result completes exceptionally if action does
2346 <     */
2347 <    public void testThenApplyAsync3E() {
2348 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2349 <        FailingFunction r = new FailingFunction();
2350 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2351 <        f.complete(null);
2352 <        checkCompletedWithWrappedCFException(g);
2353 <    }
2344 >        // unspecified behavior
2345 >        Integer v;
2346 >        try {
2347 >            assertNull(h.join());
2348 >            assertEquals(1, r.invocationCount);
2349 >            assertEquals(inc(v1), r.value);
2350 >        } catch (CompletionException ok) {
2351 >            checkCompletedWithWrappedCancellationException(h);
2352 >            assertEquals(0, r.invocationCount);
2353 >        }
2354  
2355 <    /**
2356 <     * thenApplyAsync result completes exceptionally if source cancelled
2357 <     */
1968 <    public void testThenApplyAsync4E() {
1969 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1970 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1971 <        assertTrue(f.cancel(true));
1972 <        checkCompletedWithWrappedCancellationException(g);
1973 <    }
2355 >        checkCancelled(f);
2356 >        checkCompletedNormally(g, v1);
2357 >    }}
2358  
2359      /**
2360 <     * thenAcceptAsync result completes normally after normal
2361 <     * completion of source
2360 >     * runAfterEither result completes normally after normal completion
2361 >     * of either source
2362       */
2363 <    public void testThenAcceptAsyncE() {
2364 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2365 <        IncAction r = new IncAction();
2366 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2367 <        f.complete(one);
2368 <        checkCompletedNormally(g, null);
2369 <        assertEquals(r.value, 2);
2370 <    }
2363 >    public void testRunAfterEither_normalCompletion1() {
2364 >        for (ExecutionMode m : ExecutionMode.values())
2365 >        for (Integer v1 : new Integer[] { 1, null })
2366 >        for (Integer v2 : new Integer[] { 2, null })
2367 >    {
2368 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2369 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2370 >        final Noop r = new Noop();
2371 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2372 >
2373 >        f.complete(v1);
2374 >        checkCompletedNormally(h, null);
2375 >        assertEquals(1, r.invocationCount);
2376 >        g.complete(v2);
2377 >
2378 >        checkCompletedNormally(f, v1);
2379 >        checkCompletedNormally(g, v2);
2380 >        checkCompletedNormally(h, null);
2381 >        assertEquals(1, r.invocationCount);
2382 >    }}
2383 >
2384 >    public void testRunAfterEither_normalCompletion2() {
2385 >        for (ExecutionMode m : ExecutionMode.values())
2386 >        for (Integer v1 : new Integer[] { 1, null })
2387 >        for (Integer v2 : new Integer[] { 2, null })
2388 >    {
2389 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2390 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 >        final Noop r = new Noop();
2392 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2393 >
2394 >        g.complete(v2);
2395 >        checkCompletedNormally(h, null);
2396 >        assertEquals(1, r.invocationCount);
2397 >        f.complete(v1);
2398 >
2399 >        checkCompletedNormally(f, v1);
2400 >        checkCompletedNormally(g, v2);
2401 >        checkCompletedNormally(h, null);
2402 >        assertEquals(1, r.invocationCount);
2403 >        }}
2404 >
2405 >    public void testRunAfterEither_normalCompletion3() {
2406 >        for (ExecutionMode m : ExecutionMode.values())
2407 >        for (Integer v1 : new Integer[] { 1, null })
2408 >        for (Integer v2 : new Integer[] { 2, null })
2409 >    {
2410 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2411 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2412 >        final Noop r = new Noop();
2413 >
2414 >        f.complete(v1);
2415 >        g.complete(v2);
2416 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2417 >
2418 >        checkCompletedNormally(h, null);
2419 >        checkCompletedNormally(f, v1);
2420 >        checkCompletedNormally(g, v2);
2421 >        assertEquals(1, r.invocationCount);
2422 >    }}
2423  
2424      /**
2425 <     * thenAcceptAsync result completes exceptionally after exceptional
2426 <     * completion of source
2425 >     * runAfterEither result completes exceptionally after exceptional
2426 >     * completion of either source
2427       */
2428 <    public void testThenAcceptAsync2E() {
2429 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2430 <        IncAction r = new IncAction();
2431 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2432 <        f.completeExceptionally(new CFException());
2433 <        checkCompletedWithWrappedCFException(g);
2434 <    }
2428 >    public void testRunAfterEither_exceptionalCompletion1() {
2429 >        for (ExecutionMode m : ExecutionMode.values())
2430 >        for (Integer v1 : new Integer[] { 1, null })
2431 >    {
2432 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2433 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2434 >        final Noop r = new Noop();
2435 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2436 >        final CFException ex = new CFException();
2437 >
2438 >        f.completeExceptionally(ex);
2439 >        checkCompletedWithWrappedCFException(h, ex);
2440 >        g.complete(v1);
2441 >
2442 >        assertEquals(0, r.invocationCount);
2443 >        checkCompletedNormally(g, v1);
2444 >        checkCompletedWithWrappedCFException(f, ex);
2445 >        checkCompletedWithWrappedCFException(h, ex);
2446 >    }}
2447 >
2448 >    public void testRunAfterEither_exceptionalCompletion2() {
2449 >        for (ExecutionMode m : ExecutionMode.values())
2450 >        for (Integer v1 : new Integer[] { 1, null })
2451 >    {
2452 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2453 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2454 >        final Noop r = new Noop();
2455 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456 >        final CFException ex = new CFException();
2457 >
2458 >        g.completeExceptionally(ex);
2459 >        checkCompletedWithWrappedCFException(h, ex);
2460 >        f.complete(v1);
2461 >
2462 >        assertEquals(0, r.invocationCount);
2463 >        checkCompletedNormally(f, v1);
2464 >        checkCompletedWithWrappedCFException(g, ex);
2465 >        checkCompletedWithWrappedCFException(h, ex);
2466 >    }}
2467 >
2468 >    public void testRunAfterEither_exceptionalCompletion3() {
2469 >        for (ExecutionMode m : ExecutionMode.values())
2470 >        for (Integer v1 : new Integer[] { 1, null })
2471 >    {
2472 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2473 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2474 >        final Noop r = new Noop();
2475 >        final CFException ex = new CFException();
2476 >
2477 >        g.completeExceptionally(ex);
2478 >        f.complete(v1);
2479 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2480  
2481 <    /**
2482 <     * thenAcceptAsync result completes exceptionally if action does
2483 <     */
2484 <    public void testThenAcceptAsync3E() {
2485 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2486 <        FailingConsumer r = new FailingConsumer();
2487 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2488 <        f.complete(null);
2489 <        checkCompletedWithWrappedCFException(g);
2009 <    }
2481 >        // unspecified behavior
2482 >        Integer v;
2483 >        try {
2484 >            assertNull(h.join());
2485 >            assertEquals(1, r.invocationCount);
2486 >        } catch (CompletionException ok) {
2487 >            checkCompletedWithWrappedCFException(h, ex);
2488 >            assertEquals(0, r.invocationCount);
2489 >        }
2490  
2491 <    /**
2492 <     * thenAcceptAsync result completes exceptionally if source cancelled
2493 <     */
2494 <    public void testThenAcceptAsync4E() {
2495 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2496 <        IncAction r = new IncAction();
2497 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2498 <        assertTrue(f.cancel(true));
2499 <        checkCompletedWithWrappedCancellationException(g);
2500 <    }
2491 >        checkCompletedWithWrappedCFException(g, ex);
2492 >        checkCompletedNormally(f, v1);
2493 >    }}
2494 >
2495 >    public void testRunAfterEither_exceptionalCompletion4() {
2496 >        for (ExecutionMode m : ExecutionMode.values())
2497 >        for (Integer v1 : new Integer[] { 1, null })
2498 >    {
2499 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2500 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2501 >        final Noop r = new Noop();
2502 >        final CFException ex = new CFException();
2503 >
2504 >        f.completeExceptionally(ex);
2505 >        g.complete(v1);
2506 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2507  
2508 <    /**
2509 <     * thenCombineAsync result completes normally after normal
2510 <     * completion of sources
2511 <     */
2512 <    public void testThenCombineAsyncE() {
2513 <        CompletableFuture<Integer> f, g, h;
2514 <        ThreadExecutor e = new ThreadExecutor();
2515 <        int count = 0;
2516 <
2031 <        f = new CompletableFuture<Integer>();
2032 <        g = new CompletableFuture<Integer>();
2033 <        h = f.thenCombineAsync(g, subtract, e);
2034 <        f.complete(3);
2035 <        checkIncomplete(h);
2036 <        g.complete(1);
2037 <        checkCompletedNormally(h, 2);
2038 <        assertEquals(++count, e.count.get());
2039 <
2040 <        f = new CompletableFuture<Integer>();
2041 <        g = new CompletableFuture<Integer>();
2042 <        h = f.thenCombineAsync(g, subtract, e);
2043 <        g.complete(1);
2044 <        checkIncomplete(h);
2045 <        f.complete(3);
2046 <        checkCompletedNormally(h, 2);
2047 <        assertEquals(++count, e.count.get());
2508 >        // unspecified behavior
2509 >        Integer v;
2510 >        try {
2511 >            assertNull(h.join());
2512 >            assertEquals(1, r.invocationCount);
2513 >        } catch (CompletionException ok) {
2514 >            checkCompletedWithWrappedCFException(h, ex);
2515 >            assertEquals(0, r.invocationCount);
2516 >        }
2517  
2518 <        f = new CompletableFuture<Integer>();
2519 <        g = new CompletableFuture<Integer>();
2520 <        g.complete(1);
2052 <        f.complete(3);
2053 <        h = f.thenCombineAsync(g, subtract, e);
2054 <        checkCompletedNormally(h, 2);
2055 <        assertEquals(++count, e.count.get());
2056 <    }
2518 >        checkCompletedWithWrappedCFException(f, ex);
2519 >        checkCompletedNormally(g, v1);
2520 >    }}
2521  
2522      /**
2523 <     * thenCombineAsync result completes exceptionally after exceptional
2060 <     * completion of either source
2523 >     * runAfterEither result completes exceptionally if action does
2524       */
2525 <    public void testThenCombineAsync2E() {
2526 <        CompletableFuture<Integer> f, g, h;
2527 <        ThreadExecutor e = new ThreadExecutor();
2528 <        int count = 0;
2529 <
2530 <        f = new CompletableFuture<Integer>();
2531 <        g = new CompletableFuture<Integer>();
2532 <        h = f.thenCombineAsync(g, subtract, e);
2533 <        f.completeExceptionally(new CFException());
2071 <        checkIncomplete(h);
2072 <        g.complete(1);
2073 <        checkCompletedWithWrappedCFException(h);
2525 >    public void testRunAfterEither_actionFailed1() {
2526 >        for (ExecutionMode m : ExecutionMode.values())
2527 >        for (Integer v1 : new Integer[] { 1, null })
2528 >        for (Integer v2 : new Integer[] { 2, null })
2529 >    {
2530 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2531 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2532 >        final FailingRunnable r = new FailingRunnable();
2533 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2534  
2535 <        f = new CompletableFuture<Integer>();
2076 <        g = new CompletableFuture<Integer>();
2077 <        h = f.thenCombineAsync(g, subtract, e);
2078 <        g.completeExceptionally(new CFException());
2079 <        checkIncomplete(h);
2080 <        f.complete(3);
2535 >        f.complete(v1);
2536          checkCompletedWithWrappedCFException(h);
2537 +        g.complete(v2);
2538 +        checkCompletedNormally(f, v1);
2539 +        checkCompletedNormally(g, v2);
2540 +    }}
2541 +
2542 +    public void testRunAfterEither_actionFailed2() {
2543 +        for (ExecutionMode m : ExecutionMode.values())
2544 +        for (Integer v1 : new Integer[] { 1, null })
2545 +        for (Integer v2 : new Integer[] { 2, null })
2546 +    {
2547 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2548 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2549 +        final FailingRunnable r = new FailingRunnable();
2550 +        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2551  
2552 <        f = new CompletableFuture<Integer>();
2084 <        g = new CompletableFuture<Integer>();
2085 <        g.completeExceptionally(new CFException());
2086 <        h = f.thenCombineAsync(g, subtract, e);
2087 <        checkIncomplete(h);
2088 <        f.complete(3);
2552 >        g.complete(v2);
2553          checkCompletedWithWrappedCFException(h);
2554 <
2555 <        assertEquals(0, e.count.get());
2556 <    }
2557 <
2094 <    /**
2095 <     * thenCombineAsync result completes exceptionally if action does
2096 <     */
2097 <    public void testThenCombineAsync3E() {
2098 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2099 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2100 <        FailingBiFunction r = new FailingBiFunction();
2101 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2102 <        f.complete(one);
2103 <        checkIncomplete(g);
2104 <        assertFalse(r.ran);
2105 <        f2.complete(two);
2106 <        checkCompletedWithWrappedCFException(g);
2107 <        assertTrue(r.ran);
2108 <    }
2554 >        f.complete(v1);
2555 >        checkCompletedNormally(f, v1);
2556 >        checkCompletedNormally(g, v2);
2557 >    }}
2558  
2559      /**
2560 <     * thenCombineAsync result completes exceptionally if either source cancelled
2560 >     * runAfterEither result completes exceptionally if either source cancelled
2561       */
2562 <    public void testThenCombineAsync4E() {
2563 <        CompletableFuture<Integer> f, g, h;
2564 <        ThreadExecutor e = new ThreadExecutor();
2562 >    public void testRunAfterEither_sourceCancelled1() {
2563 >        for (ExecutionMode m : ExecutionMode.values())
2564 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2565 >        for (Integer v1 : new Integer[] { 1, null })
2566 >    {
2567 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2568 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2569 >        final Noop r = new Noop();
2570 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2571  
2572 <        f = new CompletableFuture<Integer>();
2118 <        g = new CompletableFuture<Integer>();
2119 <        h = f.thenCombineAsync(g, subtract, e);
2120 <        assertTrue(f.cancel(true));
2121 <        checkIncomplete(h);
2122 <        g.complete(1);
2572 >        assertTrue(f.cancel(mayInterruptIfRunning));
2573          checkCompletedWithWrappedCancellationException(h);
2574 +        g.complete(v1);
2575  
2576 <        f = new CompletableFuture<Integer>();
2577 <        g = new CompletableFuture<Integer>();
2578 <        h = f.thenCombineAsync(g, subtract, e);
2128 <        assertTrue(g.cancel(true));
2129 <        checkIncomplete(h);
2130 <        f.complete(3);
2576 >        checkCancelled(f);
2577 >        assertEquals(0, r.invocationCount);
2578 >        checkCompletedNormally(g, v1);
2579          checkCompletedWithWrappedCancellationException(h);
2580 +    }}
2581  
2582 <        f = new CompletableFuture<Integer>();
2583 <        g = new CompletableFuture<Integer>();
2584 <        assertTrue(g.cancel(true));
2585 <        h = f.thenCombineAsync(g, subtract, e);
2586 <        checkIncomplete(h);
2587 <        f.complete(3);
2588 <        checkCompletedWithWrappedCancellationException(h);
2582 >    public void testRunAfterEither_sourceCancelled2() {
2583 >        for (ExecutionMode m : ExecutionMode.values())
2584 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2585 >        for (Integer v1 : new Integer[] { 1, null })
2586 >    {
2587 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2588 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2589 >        final Noop r = new Noop();
2590 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2591  
2592 <        f = new CompletableFuture<Integer>();
2142 <        g = new CompletableFuture<Integer>();
2143 <        assertTrue(f.cancel(true));
2144 <        assertTrue(g.cancel(true));
2145 <        h = f.thenCombineAsync(g, subtract, e);
2592 >        assertTrue(g.cancel(mayInterruptIfRunning));
2593          checkCompletedWithWrappedCancellationException(h);
2594 +        f.complete(v1);
2595  
2596 <        assertEquals(0, e.count.get());
2597 <    }
2598 <
2599 <    /**
2600 <     * thenAcceptBothAsync result completes normally after normal
2153 <     * completion of sources
2154 <     */
2155 <    public void testThenAcceptBothAsyncE() {
2156 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2157 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2158 <        AddAction r = new AddAction();
2159 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2160 <        f.complete(one);
2161 <        checkIncomplete(g);
2162 <        f2.complete(two);
2163 <        checkCompletedNormally(g, null);
2164 <        assertEquals(r.value, 3);
2165 <    }
2166 <
2167 <    /**
2168 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2169 <     * completion of source
2170 <     */
2171 <    public void testThenAcceptBothAsync2E() {
2172 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2173 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2174 <        AddAction r = new AddAction();
2175 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2176 <        f.completeExceptionally(new CFException());
2177 <        f2.complete(two);
2178 <        checkCompletedWithWrappedCFException(g);
2179 <
2180 <        r = new AddAction();
2181 <        f = new CompletableFuture<Integer>();
2182 <        f2 = new CompletableFuture<Integer>();
2183 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2184 <        f.complete(one);
2185 <        f2.completeExceptionally(new CFException());
2186 <        checkCompletedWithWrappedCFException(g);
2187 <    }
2188 <
2189 <    /**
2190 <     * thenAcceptBothAsync result completes exceptionally if action does
2191 <     */
2192 <    public void testThenAcceptBothAsync3E() {
2193 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2194 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2195 <        FailingBiConsumer r = new FailingBiConsumer();
2196 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2197 <        f.complete(one);
2198 <        checkIncomplete(g);
2199 <        f2.complete(two);
2200 <        checkCompletedWithWrappedCFException(g);
2201 <    }
2202 <
2203 <    /**
2204 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2205 <     */
2206 <    public void testThenAcceptBothAsync4E() {
2207 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2208 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2209 <        AddAction r = new AddAction();
2210 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2211 <        assertTrue(f.cancel(true));
2212 <        f2.complete(two);
2213 <        checkCompletedWithWrappedCancellationException(g);
2214 <
2215 <        r = new AddAction();
2216 <        f = new CompletableFuture<Integer>();
2217 <        f2 = new CompletableFuture<Integer>();
2218 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2219 <        f.complete(one);
2220 <        assertTrue(f2.cancel(true));
2221 <        checkCompletedWithWrappedCancellationException(g);
2222 <    }
2223 <
2224 <    /**
2225 <     * runAfterBothAsync result completes normally after normal
2226 <     * completion of sources
2227 <     */
2228 <    public void testRunAfterBothAsyncE() {
2229 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2230 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2231 <        Noop r = new Noop();
2232 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2233 <        f.complete(one);
2234 <        checkIncomplete(g);
2235 <        f2.complete(two);
2236 <        checkCompletedNormally(g, null);
2237 <        assertTrue(r.ran);
2238 <    }
2239 <
2240 <    /**
2241 <     * runAfterBothAsync result completes exceptionally after exceptional
2242 <     * completion of source
2243 <     */
2244 <    public void testRunAfterBothAsync2E() {
2245 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2246 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2247 <        Noop r = new Noop();
2248 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2249 <        f.completeExceptionally(new CFException());
2250 <        f2.complete(two);
2251 <        checkCompletedWithWrappedCFException(g);
2252 <
2253 <        r = new Noop();
2254 <        f = new CompletableFuture<Integer>();
2255 <        f2 = new CompletableFuture<Integer>();
2256 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2257 <        f.complete(one);
2258 <        f2.completeExceptionally(new CFException());
2259 <        checkCompletedWithWrappedCFException(g);
2260 <    }
2261 <
2262 <    /**
2263 <     * runAfterBothAsync result completes exceptionally if action does
2264 <     */
2265 <    public void testRunAfterBothAsync3E() {
2266 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2267 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2268 <        FailingNoop r = new FailingNoop();
2269 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2270 <        f.complete(one);
2271 <        checkIncomplete(g);
2272 <        f2.complete(two);
2273 <        checkCompletedWithWrappedCFException(g);
2274 <    }
2275 <
2276 <    /**
2277 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2278 <     */
2279 <    public void testRunAfterBothAsync4E() {
2280 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2281 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2282 <        Noop r = new Noop();
2283 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2284 <        assertTrue(f.cancel(true));
2285 <        f2.complete(two);
2286 <        checkCompletedWithWrappedCancellationException(g);
2287 <
2288 <        r = new Noop();
2289 <        f = new CompletableFuture<Integer>();
2290 <        f2 = new CompletableFuture<Integer>();
2291 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2292 <        f.complete(one);
2293 <        assertTrue(f2.cancel(true));
2294 <        checkCompletedWithWrappedCancellationException(g);
2295 <    }
2296 <
2297 <    /**
2298 <     * applyToEitherAsync result completes normally after normal
2299 <     * completion of sources
2300 <     */
2301 <    public void testApplyToEitherAsyncE() {
2302 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2303 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2304 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2305 <        f.complete(one);
2306 <        checkCompletedNormally(g, two);
2307 <
2308 <        f = new CompletableFuture<Integer>();
2309 <        f.complete(one);
2310 <        f2 = new CompletableFuture<Integer>();
2311 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2312 <        checkCompletedNormally(g, two);
2313 <    }
2314 <
2315 <    /**
2316 <     * applyToEitherAsync result completes exceptionally after exceptional
2317 <     * completion of source
2318 <     */
2319 <    public void testApplyToEitherAsync2E() {
2320 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2321 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2322 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2323 <        f.completeExceptionally(new CFException());
2324 <        checkCompletedWithWrappedCFException(g);
2325 <
2326 <        f = new CompletableFuture<Integer>();
2327 <        f2 = new CompletableFuture<Integer>();
2328 <        f2.completeExceptionally(new CFException());
2329 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2330 <        f.complete(one);
2331 <        checkCompletedWithWrappedCFException(g);
2332 <    }
2333 <
2334 <    /**
2335 <     * applyToEitherAsync result completes exceptionally if action does
2336 <     */
2337 <    public void testApplyToEitherAsync3E() {
2338 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2339 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2340 <        FailingFunction r = new FailingFunction();
2341 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2342 <        f.complete(one);
2343 <        checkCompletedWithWrappedCFException(g);
2344 <    }
2345 <
2346 <    /**
2347 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2348 <     */
2349 <    public void testApplyToEitherAsync4E() {
2350 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2351 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2352 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2353 <        assertTrue(f.cancel(true));
2354 <        checkCompletedWithWrappedCancellationException(g);
2355 <
2356 <        f = new CompletableFuture<Integer>();
2357 <        f2 = new CompletableFuture<Integer>();
2358 <        assertTrue(f2.cancel(true));
2359 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2360 <        checkCompletedWithWrappedCancellationException(g);
2361 <    }
2362 <
2363 <    /**
2364 <     * acceptEitherAsync result completes normally after normal
2365 <     * completion of sources
2366 <     */
2367 <    public void testAcceptEitherAsyncE() {
2368 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2369 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2370 <        IncAction r = new IncAction();
2371 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2372 <        f.complete(one);
2373 <        checkCompletedNormally(g, null);
2374 <        assertEquals(r.value, 2);
2375 <
2376 <        r = new IncAction();
2377 <        f = new CompletableFuture<Integer>();
2378 <        f.complete(one);
2379 <        f2 = new CompletableFuture<Integer>();
2380 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2381 <        checkCompletedNormally(g, null);
2382 <        assertEquals(r.value, 2);
2383 <    }
2596 >        checkCancelled(g);
2597 >        assertEquals(0, r.invocationCount);
2598 >        checkCompletedNormally(f, v1);
2599 >        checkCompletedWithWrappedCancellationException(h);
2600 >    }}
2601  
2602 <    /**
2603 <     * acceptEitherAsync result completes exceptionally after exceptional
2604 <     * completion of source
2605 <     */
2606 <    public void testAcceptEitherAsync2E() {
2607 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2608 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2609 <        IncAction r = new IncAction();
2610 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2611 <        f.completeExceptionally(new CFException());
2612 <        checkCompletedWithWrappedCFException(g);
2602 >    public void testRunAfterEither_sourceCancelled3() {
2603 >        for (ExecutionMode m : ExecutionMode.values())
2604 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2605 >        for (Integer v1 : new Integer[] { 1, null })
2606 >    {
2607 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2608 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2609 >        final Noop r = new Noop();
2610 >
2611 >        assertTrue(g.cancel(mayInterruptIfRunning));
2612 >        f.complete(v1);
2613 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2614  
2615 <        r = new IncAction();
2616 <        f = new CompletableFuture<Integer>();
2617 <        f2 = new CompletableFuture<Integer>();
2618 <        f2.completeExceptionally(new CFException());
2619 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2620 <        f.complete(one);
2621 <        checkCompletedWithWrappedCFException(g);
2622 <    }
2615 >        // unspecified behavior
2616 >        Integer v;
2617 >        try {
2618 >            assertNull(h.join());
2619 >            assertEquals(1, r.invocationCount);
2620 >        } catch (CompletionException ok) {
2621 >            checkCompletedWithWrappedCancellationException(h);
2622 >            assertEquals(0, r.invocationCount);
2623 >        }
2624  
2625 <    /**
2626 <     * acceptEitherAsync result completes exceptionally if action does
2627 <     */
2628 <    public void testAcceptEitherAsync3E() {
2629 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2630 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2631 <        FailingConsumer r = new FailingConsumer();
2632 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2633 <        f.complete(one);
2634 <        checkCompletedWithWrappedCFException(g);
2635 <    }
2625 >        checkCancelled(g);
2626 >        checkCompletedNormally(f, v1);
2627 >    }}
2628 >
2629 >    public void testRunAfterEither_sourceCancelled4() {
2630 >        for (ExecutionMode m : ExecutionMode.values())
2631 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2632 >        for (Integer v1 : new Integer[] { 1, null })
2633 >    {
2634 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2635 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2636 >        final Noop r = new Noop();
2637 >
2638 >        assertTrue(f.cancel(mayInterruptIfRunning));
2639 >        g.complete(v1);
2640 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2641  
2642 <    /**
2643 <     * acceptEitherAsync result completes exceptionally if either
2644 <     * source cancelled
2645 <     */
2646 <    public void testAcceptEitherAsync4E() {
2647 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2648 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2649 <        IncAction r = new IncAction();
2650 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2427 <        assertTrue(f.cancel(true));
2428 <        checkCompletedWithWrappedCancellationException(g);
2642 >        // unspecified behavior
2643 >        Integer v;
2644 >        try {
2645 >            assertNull(h.join());
2646 >            assertEquals(1, r.invocationCount);
2647 >        } catch (CompletionException ok) {
2648 >            checkCompletedWithWrappedCancellationException(h);
2649 >            assertEquals(0, r.invocationCount);
2650 >        }
2651  
2652 <        r = new IncAction();
2653 <        f = new CompletableFuture<Integer>();
2654 <        f2 = new CompletableFuture<Integer>();
2433 <        assertTrue(f2.cancel(true));
2434 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2435 <        checkCompletedWithWrappedCancellationException(g);
2436 <    }
2652 >        checkCancelled(f);
2653 >        checkCompletedNormally(g, v1);
2654 >    }}
2655  
2656      /**
2657 <     * runAfterEitherAsync result completes normally after normal
2440 <     * completion of sources
2657 >     * thenCompose result completes normally after normal completion of source
2658       */
2659 <    public void testRunAfterEitherAsyncE() {
2660 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2661 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2662 <        Noop r = new Noop();
2663 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2664 <        f.complete(one);
2665 <        checkCompletedNormally(g, null);
2666 <        assertTrue(r.ran);
2667 <
2668 <        r = new Noop();
2669 <        f = new CompletableFuture<Integer>();
2670 <        f.complete(one);
2671 <        f2 = new CompletableFuture<Integer>();
2672 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2673 <        checkCompletedNormally(g, null);
2457 <        assertTrue(r.ran);
2458 <    }
2659 >    public void testThenCompose_normalCompletion() {
2660 >        for (ExecutionMode m : ExecutionMode.values())
2661 >        for (boolean createIncomplete : new boolean[] { true, false })
2662 >        for (Integer v1 : new Integer[] { 1, null })
2663 >    {
2664 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2665 >        final CompletableFutureInc r = new CompletableFutureInc();
2666 >        if (!createIncomplete) f.complete(v1);
2667 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2668 >        if (createIncomplete) f.complete(v1);
2669 >
2670 >        checkCompletedNormally(g, inc(v1));
2671 >        checkCompletedNormally(f, v1);
2672 >        assertEquals(1, r.invocationCount);
2673 >    }}
2674  
2675      /**
2676 <     * runAfterEitherAsync result completes exceptionally after exceptional
2676 >     * thenCompose result completes exceptionally after exceptional
2677       * completion of source
2678       */
2679 <    public void testRunAfterEitherAsync2E() {
2680 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2681 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2682 <        Noop r = new Noop();
2683 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2684 <        f.completeExceptionally(new CFException());
2685 <        checkCompletedWithWrappedCFException(g);
2686 <
2687 <        r = new Noop();
2688 <        f = new CompletableFuture<Integer>();
2689 <        f2 = new CompletableFuture<Integer>();
2690 <        f2.completeExceptionally(new CFException());
2691 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2692 <        f.complete(one);
2693 <        checkCompletedWithWrappedCFException(g);
2479 <    }
2480 <
2481 <    /**
2482 <     * runAfterEitherAsync result completes exceptionally if action does
2483 <     */
2484 <    public void testRunAfterEitherAsync3E() {
2485 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2486 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2487 <        FailingNoop r = new FailingNoop();
2488 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2489 <        f.complete(one);
2490 <        checkCompletedWithWrappedCFException(g);
2491 <    }
2492 <
2493 <    /**
2494 <     * runAfterEitherAsync result completes exceptionally if either
2495 <     * source cancelled
2496 <     */
2497 <    public void testRunAfterEitherAsync4E() {
2498 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2499 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2500 <        Noop r = new Noop();
2501 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2502 <        assertTrue(f.cancel(true));
2503 <        checkCompletedWithWrappedCancellationException(g);
2504 <
2505 <        r = new Noop();
2506 <        f = new CompletableFuture<Integer>();
2507 <        f2 = new CompletableFuture<Integer>();
2508 <        assertTrue(f2.cancel(true));
2509 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2510 <        checkCompletedWithWrappedCancellationException(g);
2511 <    }
2679 >    public void testThenCompose_exceptionalCompletion() {
2680 >        for (ExecutionMode m : ExecutionMode.values())
2681 >        for (boolean createIncomplete : new boolean[] { true, false })
2682 >    {
2683 >        final CFException ex = new CFException();
2684 >        final CompletableFutureInc r = new CompletableFutureInc();
2685 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2686 >        if (!createIncomplete) f.completeExceptionally(ex);
2687 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2688 >        if (createIncomplete) f.completeExceptionally(ex);
2689 >
2690 >        checkCompletedWithWrappedCFException(g, ex);
2691 >        checkCompletedWithWrappedCFException(f, ex);
2692 >        assertEquals(0, r.invocationCount);
2693 >    }}
2694  
2695      /**
2696 <     * thenComposeAsync result completes normally after normal
2515 <     * completion of source
2696 >     * thenCompose result completes exceptionally if action does
2697       */
2698 <    public void testThenComposeAsyncE() {
2699 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2700 <        CompletableFutureInc r = new CompletableFutureInc();
2701 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2702 <        f.complete(one);
2703 <        checkCompletedNormally(g, two);
2704 <    }
2698 >    public void testThenCompose_actionFailed() {
2699 >        for (ExecutionMode m : ExecutionMode.values())
2700 >        for (boolean createIncomplete : new boolean[] { true, false })
2701 >        for (Integer v1 : new Integer[] { 1, null })
2702 >    {
2703 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2704 >        final FailingCompletableFutureFunction r
2705 >            = new FailingCompletableFutureFunction();
2706 >        if (!createIncomplete) f.complete(v1);
2707 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2708 >        if (createIncomplete) f.complete(v1);
2709  
2525    /**
2526     * thenComposeAsync result completes exceptionally after
2527     * exceptional completion of source
2528     */
2529    public void testThenComposeAsync2E() {
2530        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2531        CompletableFutureInc r = new CompletableFutureInc();
2532        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2533        f.completeExceptionally(new CFException());
2710          checkCompletedWithWrappedCFException(g);
2711 <    }
2711 >        checkCompletedNormally(f, v1);
2712 >    }}
2713  
2714      /**
2715 <     * thenComposeAsync result completes exceptionally if action does
2715 >     * thenCompose result completes exceptionally if source cancelled
2716       */
2717 <    public void testThenComposeAsync3E() {
2718 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2719 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2720 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2721 <        f.complete(one);
2722 <        checkCompletedWithWrappedCFException(g);
2723 <    }
2717 >    public void testThenCompose_sourceCancelled() {
2718 >        for (ExecutionMode m : ExecutionMode.values())
2719 >        for (boolean createIncomplete : new boolean[] { true, false })
2720 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2721 >    {
2722 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2723 >        final CompletableFutureInc r = new CompletableFutureInc();
2724 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2725 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2726 >        if (createIncomplete) {
2727 >            checkIncomplete(g);
2728 >            assertTrue(f.cancel(mayInterruptIfRunning));
2729 >        }
2730  
2548    /**
2549     * thenComposeAsync result completes exceptionally if source cancelled
2550     */
2551    public void testThenComposeAsync4E() {
2552        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2553        CompletableFutureInc r = new CompletableFutureInc();
2554        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2555        assertTrue(f.cancel(true));
2731          checkCompletedWithWrappedCancellationException(g);
2732 <    }
2732 >        checkCancelled(f);
2733 >    }}
2734  
2735      // other static methods
2736  
# Line 2563 | Line 2739 | public class CompletableFutureTest exten
2739       * with the value null
2740       */
2741      public void testAllOf_empty() throws Exception {
2742 <        CompletableFuture<?> f = CompletableFuture.allOf();
2742 >        CompletableFuture<Void> f = CompletableFuture.allOf();
2743          checkCompletedNormally(f, null);
2744      }
2745  
2746      /**
2747 <     * allOf returns a future completed when all components complete
2747 >     * allOf returns a future completed normally with the value null
2748 >     * when all components complete normally
2749       */
2750 <    public void testAllOf() throws Exception {
2750 >    public void testAllOf_normal() throws Exception {
2751          for (int k = 1; k < 20; ++k) {
2752 <            CompletableFuture[] fs = new CompletableFuture[k];
2752 >            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2753              for (int i = 0; i < k; ++i)
2754 <                fs[i] = new CompletableFuture<Integer>();
2754 >                fs[i] = new CompletableFuture<>();
2755              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2756              for (int i = 0; i < k; ++i) {
2757                  checkIncomplete(f);
2758 +                checkIncomplete(CompletableFuture.allOf(fs));
2759                  fs[i].complete(one);
2760              }
2761              checkCompletedNormally(f, null);
2762 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2763          }
2764      }
2765  
# Line 2588 | Line 2767 | public class CompletableFutureTest exten
2767       * anyOf(no component futures) returns an incomplete future
2768       */
2769      public void testAnyOf_empty() throws Exception {
2770 <        CompletableFuture<?> f = CompletableFuture.anyOf();
2770 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
2771          checkIncomplete(f);
2772      }
2773  
2774      /**
2775 <     * anyOf returns a future completed when any components complete
2775 >     * anyOf returns a future completed normally with a value when
2776 >     * a component future does
2777       */
2778 <    public void testAnyOf() throws Exception {
2779 <        for (int k = 1; k < 20; ++k) {
2778 >    public void testAnyOf_normal() throws Exception {
2779 >        for (int k = 0; k < 10; ++k) {
2780              CompletableFuture[] fs = new CompletableFuture[k];
2781              for (int i = 0; i < k; ++i)
2782 <                fs[i] = new CompletableFuture<Integer>();
2782 >                fs[i] = new CompletableFuture<>();
2783              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2784              checkIncomplete(f);
2785              for (int i = 0; i < k; ++i) {
2786                  fs[i].complete(one);
2787                  checkCompletedNormally(f, one);
2788 +                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
2789 +            }
2790 +        }
2791 +    }
2792 +
2793 +    /**
2794 +     * anyOf result completes exceptionally when any component does.
2795 +     */
2796 +    public void testAnyOf_exceptional() throws Exception {
2797 +        for (int k = 0; k < 10; ++k) {
2798 +            CompletableFuture[] fs = new CompletableFuture[k];
2799 +            for (int i = 0; i < k; ++i)
2800 +                fs[i] = new CompletableFuture<>();
2801 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2802 +            checkIncomplete(f);
2803 +            for (int i = 0; i < k; ++i) {
2804 +                fs[i].completeExceptionally(new CFException());
2805 +                checkCompletedWithWrappedCFException(f);
2806 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
2807              }
2808          }
2809      }
# Line 2613 | Line 2812 | public class CompletableFutureTest exten
2812       * Completion methods throw NullPointerException with null arguments
2813       */
2814      public void testNPE() {
2815 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2816 <        CompletableFuture<Integer> g = new CompletableFuture<Integer>();
2815 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2816 >        CompletableFuture<Integer> g = new CompletableFuture<>();
2817          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2818          CompletableFuture<?> h;
2819          ThreadExecutor exec = new ThreadExecutor();
2820  
2821          Runnable[] throwingActions = {
2822 <            () -> { CompletableFuture.supplyAsync(null); },
2823 <            () -> { CompletableFuture.supplyAsync(null, exec); },
2824 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
2825 <
2826 <            () -> { CompletableFuture.runAsync(null); },
2827 <            () -> { CompletableFuture.runAsync(null, exec); },
2828 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
2829 <
2830 <            () -> { f.completeExceptionally(null); },
2831 <
2832 <            () -> { f.thenApply(null); },
2833 <            () -> { f.thenApplyAsync(null); },
2834 <            () -> { f.thenApplyAsync((x) -> x, null); },
2835 <            () -> { f.thenApplyAsync(null, exec); },
2836 <
2837 <            () -> { f.thenAccept(null); },
2838 <            () -> { f.thenAcceptAsync(null); },
2839 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
2840 <            () -> { f.thenAcceptAsync(null, exec); },
2841 <
2842 <            () -> { f.thenRun(null); },
2843 <            () -> { f.thenRunAsync(null); },
2844 <            () -> { f.thenRunAsync(() -> { ; }, null); },
2845 <            () -> { f.thenRunAsync(null, exec); },
2846 <
2847 <            () -> { f.thenCombine(g, null); },
2848 <            () -> { f.thenCombineAsync(g, null); },
2849 <            () -> { f.thenCombineAsync(g, null, exec); },
2850 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
2851 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
2852 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
2853 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
2854 <
2855 <            () -> { f.thenAcceptBoth(g, null); },
2856 <            () -> { f.thenAcceptBothAsync(g, null); },
2857 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
2858 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
2859 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
2860 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
2861 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
2862 <
2863 <            () -> { f.runAfterBoth(g, null); },
2864 <            () -> { f.runAfterBothAsync(g, null); },
2865 <            () -> { f.runAfterBothAsync(g, null, exec); },
2866 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
2867 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
2868 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
2869 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
2870 <
2871 <            () -> { f.applyToEither(g, null); },
2872 <            () -> { f.applyToEitherAsync(g, null); },
2873 <            () -> { f.applyToEitherAsync(g, null, exec); },
2874 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
2875 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
2876 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
2877 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
2878 <
2879 <            () -> { f.acceptEither(g, null); },
2880 <            () -> { f.acceptEitherAsync(g, null); },
2881 <            () -> { f.acceptEitherAsync(g, null, exec); },
2882 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
2883 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
2884 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
2885 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
2886 <
2887 <            () -> { f.runAfterEither(g, null); },
2888 <            () -> { f.runAfterEitherAsync(g, null); },
2889 <            () -> { f.runAfterEitherAsync(g, null, exec); },
2890 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
2891 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
2892 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
2893 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
2894 <
2895 <            () -> { f.thenCompose(null); },
2896 <            () -> { f.thenComposeAsync(null); },
2897 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
2898 <            () -> { f.thenComposeAsync(null, exec); },
2899 <
2900 <            () -> { f.exceptionally(null); },
2901 <
2902 <            () -> { f.handle(null); },
2903 <
2904 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
2905 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
2906 <            () -> { CompletableFuture.allOf(f, null); },
2907 <            () -> { CompletableFuture.allOf(null, f); },
2908 <
2909 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
2910 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
2911 <            () -> { CompletableFuture.anyOf(f, null); },
2912 <            () -> { CompletableFuture.anyOf(null, f); },
2822 >            () -> CompletableFuture.supplyAsync(null),
2823 >            () -> CompletableFuture.supplyAsync(null, exec),
2824 >            () -> CompletableFuture.supplyAsync(supplyOne, null),
2825 >
2826 >            () -> CompletableFuture.runAsync(null),
2827 >            () -> CompletableFuture.runAsync(null, exec),
2828 >            () -> CompletableFuture.runAsync(() -> {}, null),
2829 >
2830 >            () -> f.completeExceptionally(null),
2831 >
2832 >            () -> f.thenApply(null),
2833 >            () -> f.thenApplyAsync(null),
2834 >            () -> f.thenApplyAsync((x) -> x, null),
2835 >            () -> f.thenApplyAsync(null, exec),
2836 >
2837 >            () -> f.thenAccept(null),
2838 >            () -> f.thenAcceptAsync(null),
2839 >            () -> f.thenAcceptAsync((x) -> {} , null),
2840 >            () -> f.thenAcceptAsync(null, exec),
2841 >
2842 >            () -> f.thenRun(null),
2843 >            () -> f.thenRunAsync(null),
2844 >            () -> f.thenRunAsync(() -> {} , null),
2845 >            () -> f.thenRunAsync(null, exec),
2846 >
2847 >            () -> f.thenCombine(g, null),
2848 >            () -> f.thenCombineAsync(g, null),
2849 >            () -> f.thenCombineAsync(g, null, exec),
2850 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
2851 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
2852 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
2853 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
2854 >
2855 >            () -> f.thenAcceptBoth(g, null),
2856 >            () -> f.thenAcceptBothAsync(g, null),
2857 >            () -> f.thenAcceptBothAsync(g, null, exec),
2858 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
2859 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
2860 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
2861 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
2862 >
2863 >            () -> f.runAfterBoth(g, null),
2864 >            () -> f.runAfterBothAsync(g, null),
2865 >            () -> f.runAfterBothAsync(g, null, exec),
2866 >            () -> f.runAfterBoth(nullFuture, () -> {}),
2867 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
2868 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
2869 >            () -> f.runAfterBothAsync(g, () -> {}, null),
2870 >
2871 >            () -> f.applyToEither(g, null),
2872 >            () -> f.applyToEitherAsync(g, null),
2873 >            () -> f.applyToEitherAsync(g, null, exec),
2874 >            () -> f.applyToEither(nullFuture, (x) -> x),
2875 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
2876 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
2877 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
2878 >
2879 >            () -> f.acceptEither(g, null),
2880 >            () -> f.acceptEitherAsync(g, null),
2881 >            () -> f.acceptEitherAsync(g, null, exec),
2882 >            () -> f.acceptEither(nullFuture, (x) -> {}),
2883 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
2884 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
2885 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
2886 >
2887 >            () -> f.runAfterEither(g, null),
2888 >            () -> f.runAfterEitherAsync(g, null),
2889 >            () -> f.runAfterEitherAsync(g, null, exec),
2890 >            () -> f.runAfterEither(nullFuture, () -> {}),
2891 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
2892 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
2893 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
2894 >
2895 >            () -> f.thenCompose(null),
2896 >            () -> f.thenComposeAsync(null),
2897 >            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2898 >            () -> f.thenComposeAsync(null, exec),
2899 >
2900 >            () -> f.exceptionally(null),
2901 >
2902 >            () -> f.handle(null),
2903 >
2904 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
2905 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
2906 >            () -> CompletableFuture.allOf(f, null),
2907 >            () -> CompletableFuture.allOf(null, f),
2908 >
2909 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
2910 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
2911 >            () -> CompletableFuture.anyOf(f, null),
2912 >            () -> CompletableFuture.anyOf(null, f),
2913 >
2914 >            () -> f.obtrudeException(null),
2915          };
2916  
2917          assertThrows(NullPointerException.class, throwingActions);
2918          assertEquals(0, exec.count.get());
2919      }
2920  
2921 +    /**
2922 +     * toCompletableFuture returns this CompletableFuture.
2923 +     */
2924 +    public void testToCompletableFuture() {
2925 +        CompletableFuture<Integer> f = new CompletableFuture<>();
2926 +        assertSame(f, f.toCompletableFuture());
2927 +    }
2928 +
2929 +    /**
2930 +     * whenComplete action executes on normal completion, propagating
2931 +     * source result.
2932 +     */
2933 +    public void testWhenComplete_normalCompletion1() {
2934 +        for (ExecutionMode m : ExecutionMode.values())
2935 +        for (boolean createIncomplete : new boolean[] { true, false })
2936 +        for (Integer v1 : new Integer[] { 1, null })
2937 +    {
2938 +        final AtomicInteger a = new AtomicInteger(0);
2939 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2940 +        if (!createIncomplete) f.complete(v1);
2941 +        final CompletableFuture<Integer> g = m.whenComplete
2942 +            (f,
2943 +             (Integer x, Throwable t) -> {
2944 +                threadAssertSame(x, v1);
2945 +                threadAssertNull(t);
2946 +                a.getAndIncrement();
2947 +            });
2948 +        if (createIncomplete) f.complete(v1);
2949 +
2950 +        checkCompletedNormally(g, v1);
2951 +        checkCompletedNormally(f, v1);
2952 +        assertEquals(1, a.get());
2953 +    }}
2954 +
2955 +    /**
2956 +     * whenComplete action executes on exceptional completion, propagating
2957 +     * source result.
2958 +     */
2959 +    public void testWhenComplete_exceptionalCompletion() {
2960 +        for (ExecutionMode m : ExecutionMode.values())
2961 +        for (boolean createIncomplete : new boolean[] { true, false })
2962 +        for (Integer v1 : new Integer[] { 1, null })
2963 +    {
2964 +        final AtomicInteger a = new AtomicInteger(0);
2965 +        final CFException ex = new CFException();
2966 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2967 +        if (!createIncomplete) f.completeExceptionally(ex);
2968 +        final CompletableFuture<Integer> g = m.whenComplete
2969 +            (f,
2970 +             (Integer x, Throwable t) -> {
2971 +                threadAssertNull(x);
2972 +                threadAssertSame(t, ex);
2973 +                a.getAndIncrement();
2974 +            });
2975 +        if (createIncomplete) f.completeExceptionally(ex);
2976 +        checkCompletedWithWrappedCFException(f, ex);
2977 +        checkCompletedWithWrappedCFException(g, ex);
2978 +        assertEquals(1, a.get());
2979 +    }}
2980 +
2981 +    /**
2982 +     * whenComplete action executes on cancelled source, propagating
2983 +     * CancellationException.
2984 +     */
2985 +    public void testWhenComplete_sourceCancelled() {
2986 +        for (ExecutionMode m : ExecutionMode.values())
2987 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2988 +        for (boolean createIncomplete : new boolean[] { true, false })
2989 +    {
2990 +        final AtomicInteger a = new AtomicInteger(0);
2991 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2992 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2993 +        final CompletableFuture<Integer> g = m.whenComplete
2994 +            (f,
2995 +             (Integer x, Throwable t) -> {
2996 +                threadAssertNull(x);
2997 +                threadAssertTrue(t instanceof CancellationException);
2998 +                a.getAndIncrement();
2999 +            });
3000 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3001 +
3002 +        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3003 +        checkCompletedWithWrappedCancellationException(g);
3004 +        checkCancelled(f);
3005 +        assertEquals(1, a.get());
3006 +    }}
3007 +
3008 +    /**
3009 +     * If a whenComplete action throws an exception when triggered by
3010 +     * a normal completion, it completes exceptionally
3011 +     */
3012 +    public void testWhenComplete_actionFailed() {
3013 +        for (boolean createIncomplete : new boolean[] { true, false })
3014 +        for (ExecutionMode m : ExecutionMode.values())
3015 +        for (Integer v1 : new Integer[] { 1, null })
3016 +    {
3017 +        final AtomicInteger a = new AtomicInteger(0);
3018 +        final CFException ex = new CFException();
3019 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3020 +        if (!createIncomplete) f.complete(v1);
3021 +        final CompletableFuture<Integer> g = m.whenComplete
3022 +            (f,
3023 +             (Integer x, Throwable t) -> {
3024 +                threadAssertSame(x, v1);
3025 +                threadAssertNull(t);
3026 +                a.getAndIncrement();
3027 +                throw ex;
3028 +            });
3029 +        if (createIncomplete) f.complete(v1);
3030 +        checkCompletedNormally(f, v1);
3031 +        checkCompletedWithWrappedCFException(g, ex);
3032 +        assertEquals(1, a.get());
3033 +    }}
3034 +
3035 +    /**
3036 +     * If a whenComplete action throws an exception when triggered by
3037 +     * a source completion that also throws an exception, the source
3038 +     * exception takes precedence.
3039 +     */
3040 +    public void testWhenComplete_actionFailedSourceFailed() {
3041 +        for (boolean createIncomplete : new boolean[] { true, false })
3042 +        for (ExecutionMode m : ExecutionMode.values())
3043 +        for (Integer v1 : new Integer[] { 1, null })
3044 +    {
3045 +        final AtomicInteger a = new AtomicInteger(0);
3046 +        final CFException ex1 = new CFException();
3047 +        final CFException ex2 = new CFException();
3048 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3049 +
3050 +        if (!createIncomplete) f.completeExceptionally(ex1);
3051 +        final CompletableFuture<Integer> g = m.whenComplete
3052 +            (f,
3053 +             (Integer x, Throwable t) -> {
3054 +                threadAssertSame(t, ex1);
3055 +                threadAssertNull(x);
3056 +                a.getAndIncrement();
3057 +                throw ex2;
3058 +            });
3059 +        if (createIncomplete) f.completeExceptionally(ex1);
3060 +
3061 +        checkCompletedWithWrappedCFException(f, ex1);
3062 +        checkCompletedWithWrappedCFException(g, ex1);
3063 +        assertEquals(1, a.get());
3064 +    }}
3065 +
3066   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines