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.58 by jsr166, Mon Jun 2 23:10:08 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);
287 <        CompletableFuture g = f.thenRun(new Noop());
288 <        assertEquals(f.getNumberOfDependents(), 1);
289 <        assertEquals(g.getNumberOfDependents(), 0);
290 <        CompletableFuture h = f.thenRun(new Noop());
291 <        assertEquals(f.getNumberOfDependents(), 2);
285 >        CompletableFuture<Integer> f = new CompletableFuture<>();
286 >        assertEquals(0, f.getNumberOfDependents());
287 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
288 >        assertEquals(1, f.getNumberOfDependents());
289 >        assertEquals(0, g.getNumberOfDependents());
290 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
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 <    static final Supplier<Integer> supplyOne =
326 <        () -> Integer.valueOf(1);
327 <    static final Function<Integer, Integer> inc =
328 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
329 <    static final BiFunction<Integer, Integer, Integer> subtract =
330 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
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 class IntegerSupplier implements Supplier<Integer> {
338 >        final ExecutionMode m;
339 >        int invocationCount = 0;
340 >        final Integer value;
341 >        IntegerSupplier(ExecutionMode m, Integer value) {
342 >            this.m = m;
343 >            this.value = value;
344 >        }
345 >        public Integer get() {
346 >            m.checkExecutionMode();
347 >            invocationCount++;
348 >            return value;
349 >        }
350 >    }
351 >        
352      static final class IncAction implements Consumer<Integer> {
353 <        int value;
354 <        public void accept(Integer x) { value = x.intValue() + 1; }
353 >        int invocationCount = 0;
354 >        Integer value;
355 >        public void accept(Integer x) {
356 >            invocationCount++;
357 >            value = inc(x);
358 >        }
359      }
360 <    static final class AddAction implements BiConsumer<Integer, Integer> {
361 <        int value;
360 >    static final class IncFunction implements Function<Integer,Integer> {
361 >        final ExecutionMode m;
362 >        int invocationCount = 0;
363 >        Integer value;
364 >        IncFunction(ExecutionMode m) { this.m = m; }
365 >        public Integer apply(Integer x) {
366 >            m.checkExecutionMode();
367 >            invocationCount++;
368 >            return value = inc(x);
369 >        }
370 >    }
371 >    static final class SubtractAction implements BiConsumer<Integer, Integer> {
372 >        final ExecutionMode m;
373 >        int invocationCount = 0;
374 >        Integer value;
375 >        // Check this action was invoked exactly once when result is computed.
376 >        SubtractAction(ExecutionMode m) { this.m = m; }
377          public void accept(Integer x, Integer y) {
378 <            value = x.intValue() + y.intValue();
378 >            m.checkExecutionMode();
379 >            invocationCount++;
380 >            value = subtract(x, y);
381 >        }
382 >    }
383 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
384 >        final ExecutionMode m;
385 >        int invocationCount = 0;
386 >        Integer value;
387 >        // Check this action was invoked exactly once when result is computed.
388 >        SubtractFunction(ExecutionMode m) { this.m = m; }
389 >        public Integer apply(Integer x, Integer y) {
390 >            m.checkExecutionMode();
391 >            invocationCount++;
392 >            return value = subtract(x, y);
393          }
394      }
395      static final class Noop implements Runnable {
396 <        boolean ran;
397 <        public void run() { ran = true; }
396 >        final ExecutionMode m;
397 >        int invocationCount = 0;
398 >        Noop(ExecutionMode m) { this.m = m; }
399 >        public void run() {
400 >            m.checkExecutionMode();
401 >            invocationCount++;
402 >        }
403      }
404  
405      static final class FailingSupplier implements Supplier<Integer> {
406 <        boolean ran;
407 <        public Integer get() { ran = true; throw new CFException(); }
406 >        final ExecutionMode m;
407 >        int invocationCount = 0;
408 >        FailingSupplier(ExecutionMode m) { this.m = m; }
409 >        public Integer get() {
410 >            m.checkExecutionMode();
411 >            invocationCount++;
412 >            throw new CFException();
413 >        }
414      }
415      static final class FailingConsumer implements Consumer<Integer> {
416 <        boolean ran;
417 <        public void accept(Integer x) { ran = true; throw new CFException(); }
416 >        final ExecutionMode m;
417 >        int invocationCount = 0;
418 >        FailingConsumer(ExecutionMode m) { this.m = m; }
419 >        public void accept(Integer x) {
420 >            m.checkExecutionMode();
421 >            invocationCount++;
422 >            throw new CFException();
423 >        }
424      }
425      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
426 <        boolean ran;
427 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
426 >        final ExecutionMode m;
427 >        int invocationCount = 0;
428 >        FailingBiConsumer(ExecutionMode m) { this.m = m; }
429 >        public void accept(Integer x, Integer y) {
430 >            m.checkExecutionMode();
431 >            invocationCount++;
432 >            throw new CFException();
433 >        }
434      }
435      static final class FailingFunction implements Function<Integer, Integer> {
436 <        boolean ran;
437 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
436 >        final ExecutionMode m;
437 >        int invocationCount = 0;
438 >        FailingFunction(ExecutionMode m) { this.m = m; }
439 >        public Integer apply(Integer x) {
440 >            m.checkExecutionMode();
441 >            invocationCount++;
442 >            throw new CFException();
443 >        }
444      }
445      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
446 <        boolean ran;
447 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
446 >        final ExecutionMode m;
447 >        int invocationCount = 0;
448 >        FailingBiFunction(ExecutionMode m) { this.m = m; }
449 >        public Integer apply(Integer x, Integer y) {
450 >            m.checkExecutionMode();
451 >            invocationCount++;
452 >            throw new CFException();
453 >        }
454      }
455 <    static final class FailingNoop implements Runnable {
456 <        boolean ran;
457 <        public void run() { ran = true; throw new CFException(); }
455 >    static final class FailingRunnable implements Runnable {
456 >        final ExecutionMode m;
457 >        int invocationCount = 0;
458 >        FailingRunnable(ExecutionMode m) { this.m = m; }
459 >        public void run() {
460 >            m.checkExecutionMode();
461 >            invocationCount++;
462 >            throw new CFException();
463 >        }
464      }
465  
466      static final class CompletableFutureInc
467          implements Function<Integer, CompletableFuture<Integer>> {
468 <        boolean ran;
468 >        final ExecutionMode m;
469 >        int invocationCount = 0;
470 >        CompletableFutureInc(ExecutionMode m) { this.m = m; }
471          public CompletableFuture<Integer> apply(Integer x) {
472 <            ran = true;
473 <            CompletableFuture<Integer> f = new CompletableFuture<Integer>();
474 <            f.complete(Integer.valueOf(x.intValue() + 1));
472 >            m.checkExecutionMode();
473 >            invocationCount++;
474 >            CompletableFuture<Integer> f = new CompletableFuture<>();
475 >            f.complete(inc(x));
476              return f;
477          }
478      }
479  
480      static final class FailingCompletableFutureFunction
481          implements Function<Integer, CompletableFuture<Integer>> {
482 <        boolean ran;
482 >        final ExecutionMode m;
483 >        int invocationCount = 0;
484 >        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
485          public CompletableFuture<Integer> apply(Integer x) {
486 <            ran = true; throw new CFException();
486 >            m.checkExecutionMode();
487 >            invocationCount++;
488 >            throw new CFException();
489          }
490      }
491  
492      // Used for explicit executor tests
493      static final class ThreadExecutor implements Executor {
494 <        AtomicInteger count = new AtomicInteger(0);
494 >        final AtomicInteger count = new AtomicInteger(0);
495 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
496 >        static boolean startedCurrentThread() {
497 >            return Thread.currentThread().getThreadGroup() == tg;
498 >        }
499  
500          public void execute(Runnable r) {
501              count.getAndIncrement();
502 <            new Thread(r).start();
502 >            new Thread(tg, r).start();
503          }
504      }
505  
506 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
507 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
508 <    }
506 >    /**
507 >     * Permits the testing of parallel code for the 3 different
508 >     * execution modes without repeating all the testing code.
509 >     */
510 >    enum ExecutionMode {
511 >        DEFAULT {
512 >            public void checkExecutionMode() {
513 >                assertNull(ForkJoinTask.getPool());
514 >            }
515 >            public CompletableFuture<Void> runAsync(Runnable a) {
516 >                throw new UnsupportedOperationException();
517 >            }
518 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
519 >                throw new UnsupportedOperationException();
520 >            }
521 >            public <T> CompletableFuture<Void> thenRun
522 >                (CompletableFuture<T> f, Runnable a) {
523 >                return f.thenRun(a);
524 >            }
525 >            public <T> CompletableFuture<Void> thenAccept
526 >                (CompletableFuture<T> f, Consumer<? super T> a) {
527 >                return f.thenAccept(a);
528 >            }
529 >            public <T,U> CompletableFuture<U> thenApply
530 >                (CompletableFuture<T> f, Function<? super T,U> a) {
531 >                return f.thenApply(a);
532 >            }
533 >            public <T,U> CompletableFuture<U> thenCompose
534 >                (CompletableFuture<T> f,
535 >                 Function<? super T,? extends CompletionStage<U>> a) {
536 >                return f.thenCompose(a);
537 >            }
538 >            public <T,U> CompletableFuture<U> handle
539 >                (CompletableFuture<T> f,
540 >                 BiFunction<? super T,Throwable,? extends U> a) {
541 >                return f.handle(a);
542 >            }
543 >            public <T> CompletableFuture<T> whenComplete
544 >                (CompletableFuture<T> f,
545 >                 BiConsumer<? super T,? super Throwable> a) {
546 >                return f.whenComplete(a);
547 >            }
548 >            public <T,U> CompletableFuture<Void> runAfterBoth
549 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
550 >                return f.runAfterBoth(g, a);
551 >            }
552 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
553 >                (CompletableFuture<T> f,
554 >                 CompletionStage<? extends U> g,
555 >                 BiConsumer<? super T,? super U> a) {
556 >                return f.thenAcceptBoth(g, a);
557 >            }
558 >            public <T,U,V> CompletableFuture<V> thenCombine
559 >                (CompletableFuture<T> f,
560 >                 CompletionStage<? extends U> g,
561 >                 BiFunction<? super T,? super U,? extends V> a) {
562 >                return f.thenCombine(g, a);
563 >            }
564 >            public <T> CompletableFuture<Void> runAfterEither
565 >                (CompletableFuture<T> f,
566 >                 CompletionStage<?> g,
567 >                 java.lang.Runnable a) {
568 >                return f.runAfterEither(g, a);
569 >            }
570 >            public <T> CompletableFuture<Void> acceptEither
571 >                (CompletableFuture<T> f,
572 >                 CompletionStage<? extends T> g,
573 >                 Consumer<? super T> a) {
574 >                return f.acceptEither(g, a);
575 >            }
576 >            public <T,U> CompletableFuture<U> applyToEither
577 >                (CompletableFuture<T> f,
578 >                 CompletionStage<? extends T> g,
579 >                 Function<? super T,U> a) {
580 >                return f.applyToEither(g, a);
581 >            }
582 >        },
583  
584 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
585 <        boolean ran;
586 <        public Integer apply(Integer x, Throwable t) {
587 <            ran = true;
588 <            return (t == null) ? two : three;
589 <        }
590 <    }
584 >        ASYNC {
585 >            public void checkExecutionMode() {
586 >                assertSame(ForkJoinPool.commonPool(),
587 >                           ForkJoinTask.getPool());
588 >            }
589 >            public CompletableFuture<Void> runAsync(Runnable a) {
590 >                return CompletableFuture.runAsync(a);
591 >            }
592 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
593 >                return CompletableFuture.supplyAsync(a);
594 >            }
595 >            public <T> CompletableFuture<Void> thenRun
596 >                (CompletableFuture<T> f, Runnable a) {
597 >                return f.thenRunAsync(a);
598 >            }
599 >            public <T> CompletableFuture<Void> thenAccept
600 >                (CompletableFuture<T> f, Consumer<? super T> a) {
601 >                return f.thenAcceptAsync(a);
602 >            }
603 >            public <T,U> CompletableFuture<U> thenApply
604 >                (CompletableFuture<T> f, Function<? super T,U> a) {
605 >                return f.thenApplyAsync(a);
606 >            }
607 >            public <T,U> CompletableFuture<U> thenCompose
608 >                (CompletableFuture<T> f,
609 >                 Function<? super T,? extends CompletionStage<U>> a) {
610 >                return f.thenComposeAsync(a);
611 >            }
612 >            public <T,U> CompletableFuture<U> handle
613 >                (CompletableFuture<T> f,
614 >                 BiFunction<? super T,Throwable,? extends U> a) {
615 >                return f.handleAsync(a);
616 >            }
617 >            public <T> CompletableFuture<T> whenComplete
618 >                (CompletableFuture<T> f,
619 >                 BiConsumer<? super T,? super Throwable> a) {
620 >                return f.whenCompleteAsync(a);
621 >            }
622 >            public <T,U> CompletableFuture<Void> runAfterBoth
623 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
624 >                return f.runAfterBothAsync(g, a);
625 >            }
626 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
627 >                (CompletableFuture<T> f,
628 >                 CompletionStage<? extends U> g,
629 >                 BiConsumer<? super T,? super U> a) {
630 >                return f.thenAcceptBothAsync(g, a);
631 >            }
632 >            public <T,U,V> CompletableFuture<V> thenCombine
633 >                (CompletableFuture<T> f,
634 >                 CompletionStage<? extends U> g,
635 >                 BiFunction<? super T,? super U,? extends V> a) {
636 >                return f.thenCombineAsync(g, a);
637 >            }
638 >            public <T> CompletableFuture<Void> runAfterEither
639 >                (CompletableFuture<T> f,
640 >                 CompletionStage<?> g,
641 >                 java.lang.Runnable a) {
642 >                return f.runAfterEitherAsync(g, a);
643 >            }
644 >            public <T> CompletableFuture<Void> acceptEither
645 >                (CompletableFuture<T> f,
646 >                 CompletionStage<? extends T> g,
647 >                 Consumer<? super T> a) {
648 >                return f.acceptEitherAsync(g, a);
649 >            }
650 >            public <T,U> CompletableFuture<U> applyToEither
651 >                (CompletableFuture<T> f,
652 >                 CompletionStage<? extends T> g,
653 >                 Function<? super T,U> a) {
654 >                return f.applyToEitherAsync(g, a);
655 >            }
656 >        },
657 >
658 >        EXECUTOR {
659 >            public void checkExecutionMode() {
660 >                assertTrue(ThreadExecutor.startedCurrentThread());
661 >            }
662 >            public CompletableFuture<Void> runAsync(Runnable a) {
663 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
664 >            }
665 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
666 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
667 >            }
668 >            public <T> CompletableFuture<Void> thenRun
669 >                (CompletableFuture<T> f, Runnable a) {
670 >                return f.thenRunAsync(a, new ThreadExecutor());
671 >            }
672 >            public <T> CompletableFuture<Void> thenAccept
673 >                (CompletableFuture<T> f, Consumer<? super T> a) {
674 >                return f.thenAcceptAsync(a, new ThreadExecutor());
675 >            }
676 >            public <T,U> CompletableFuture<U> thenApply
677 >                (CompletableFuture<T> f, Function<? super T,U> a) {
678 >                return f.thenApplyAsync(a, new ThreadExecutor());
679 >            }
680 >            public <T,U> CompletableFuture<U> thenCompose
681 >                (CompletableFuture<T> f,
682 >                 Function<? super T,? extends CompletionStage<U>> a) {
683 >                return f.thenComposeAsync(a, new ThreadExecutor());
684 >            }
685 >            public <T,U> CompletableFuture<U> handle
686 >                (CompletableFuture<T> f,
687 >                 BiFunction<? super T,Throwable,? extends U> a) {
688 >                return f.handleAsync(a, new ThreadExecutor());
689 >            }
690 >            public <T> CompletableFuture<T> whenComplete
691 >                (CompletableFuture<T> f,
692 >                 BiConsumer<? super T,? super Throwable> a) {
693 >                return f.whenCompleteAsync(a, new ThreadExecutor());
694 >            }
695 >            public <T,U> CompletableFuture<Void> runAfterBoth
696 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
697 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
698 >            }
699 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
700 >                (CompletableFuture<T> f,
701 >                 CompletionStage<? extends U> g,
702 >                 BiConsumer<? super T,? super U> a) {
703 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
704 >            }
705 >            public <T,U,V> CompletableFuture<V> thenCombine
706 >                (CompletableFuture<T> f,
707 >                 CompletionStage<? extends U> g,
708 >                 BiFunction<? super T,? super U,? extends V> a) {
709 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
710 >            }
711 >            public <T> CompletableFuture<Void> runAfterEither
712 >                (CompletableFuture<T> f,
713 >                 CompletionStage<?> g,
714 >                 java.lang.Runnable a) {
715 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
716 >            }
717 >            public <T> CompletableFuture<Void> acceptEither
718 >                (CompletableFuture<T> f,
719 >                 CompletionStage<? extends T> g,
720 >                 Consumer<? super T> a) {
721 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
722 >            }
723 >            public <T,U> CompletableFuture<U> applyToEither
724 >                (CompletableFuture<T> f,
725 >                 CompletionStage<? extends T> g,
726 >                 Function<? super T,U> a) {
727 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
728 >            }
729 >        };
730 >
731 >        public abstract void checkExecutionMode();
732 >        public abstract CompletableFuture<Void> runAsync(Runnable a);
733 >        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
734 >        public abstract <T> CompletableFuture<Void> thenRun
735 >            (CompletableFuture<T> f, Runnable a);
736 >        public abstract <T> CompletableFuture<Void> thenAccept
737 >            (CompletableFuture<T> f, Consumer<? super T> a);
738 >        public abstract <T,U> CompletableFuture<U> thenApply
739 >            (CompletableFuture<T> f, Function<? super T,U> a);
740 >        public abstract <T,U> CompletableFuture<U> thenCompose
741 >            (CompletableFuture<T> f,
742 >             Function<? super T,? extends CompletionStage<U>> a);
743 >        public abstract <T,U> CompletableFuture<U> handle
744 >            (CompletableFuture<T> f,
745 >             BiFunction<? super T,Throwable,? extends U> a);
746 >        public abstract <T> CompletableFuture<T> whenComplete
747 >            (CompletableFuture<T> f,
748 >             BiConsumer<? super T,? super Throwable> a);
749 >        public abstract <T,U> CompletableFuture<Void> runAfterBoth
750 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
751 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
752 >            (CompletableFuture<T> f,
753 >             CompletionStage<? extends U> g,
754 >             BiConsumer<? super T,? super U> a);
755 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
756 >            (CompletableFuture<T> f,
757 >             CompletionStage<? extends U> g,
758 >             BiFunction<? super T,? super U,? extends V> a);
759 >        public abstract <T> CompletableFuture<Void> runAfterEither
760 >            (CompletableFuture<T> f,
761 >             CompletionStage<?> g,
762 >             java.lang.Runnable a);
763 >        public abstract <T> CompletableFuture<Void> acceptEither
764 >            (CompletableFuture<T> f,
765 >             CompletionStage<? extends T> g,
766 >             Consumer<? super T> a);
767 >        public abstract <T,U> CompletableFuture<U> applyToEither
768 >            (CompletableFuture<T> f,
769 >             CompletionStage<? extends T> g,
770 >             Function<? super T,U> a);
771 >    }
772 >
773 >    /**
774 >     * exceptionally action is not invoked when source completes
775 >     * normally, and source result is propagated
776 >     */
777 >    public void testExceptionally_normalCompletion() {
778 >        for (boolean createIncomplete : new boolean[] { true, false })
779 >        for (Integer v1 : new Integer[] { 1, null })
780 >    {
781 >        final AtomicInteger a = new AtomicInteger(0);
782 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
783 >        if (!createIncomplete) f.complete(v1);
784 >        final CompletableFuture<Integer> g = f.exceptionally
785 >            ((Throwable t) -> {
786 >                // Should not be called
787 >                a.getAndIncrement();
788 >                throw new AssertionError();
789 >            });
790 >        if (createIncomplete) f.complete(v1);
791 >
792 >        checkCompletedNormally(g, v1);
793 >        checkCompletedNormally(f, v1);
794 >        assertEquals(0, a.get());
795 >    }}
796  
797  
798      /**
799       * exceptionally action completes with function value on source
800 <     * exception;  otherwise with source value
800 >     * exception
801       */
802 <    public void testExceptionally() {
803 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
804 <        ExceptionToInteger r = new ExceptionToInteger();
805 <        CompletableFuture<Integer> g = f.exceptionally(r);
806 <        f.completeExceptionally(new CFException());
807 <        checkCompletedNormally(g, three);
808 <
809 <        f = new CompletableFuture<Integer>();
810 <        r = new ExceptionToInteger();
811 <        g = f.exceptionally(r);
812 <        f.complete(one);
813 <        checkCompletedNormally(g, one);
814 <    }
802 >    public void testExceptionally_exceptionalCompletion() {
803 >        for (boolean createIncomplete : new boolean[] { true, false })
804 >        for (Integer v1 : new Integer[] { 1, null })
805 >    {
806 >        final AtomicInteger a = new AtomicInteger(0);
807 >        final CFException ex = new CFException();
808 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
809 >        if (!createIncomplete) f.completeExceptionally(ex);
810 >        final CompletableFuture<Integer> g = f.exceptionally
811 >            ((Throwable t) -> {
812 >                ExecutionMode.DEFAULT.checkExecutionMode();
813 >                threadAssertSame(t, ex);
814 >                a.getAndIncrement();
815 >                return v1;
816 >            });
817 >        if (createIncomplete) f.completeExceptionally(ex);
818 >
819 >        checkCompletedNormally(g, v1);
820 >        assertEquals(1, a.get());
821 >    }}
822 >
823 >    public void testExceptionally_exceptionalCompletionActionFailed() {
824 >        for (boolean createIncomplete : new boolean[] { true, false })
825 >        for (Integer v1 : new Integer[] { 1, null })
826 >    {
827 >        final AtomicInteger a = new AtomicInteger(0);
828 >        final CFException ex1 = new CFException();
829 >        final CFException ex2 = new CFException();
830 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
831 >        if (!createIncomplete) f.completeExceptionally(ex1);
832 >        final CompletableFuture<Integer> g = f.exceptionally
833 >            ((Throwable t) -> {
834 >                ExecutionMode.DEFAULT.checkExecutionMode();
835 >                threadAssertSame(t, ex1);
836 >                a.getAndIncrement();
837 >                throw ex2;
838 >            });
839 >        if (createIncomplete) f.completeExceptionally(ex1);
840 >
841 >        checkCompletedWithWrappedCFException(g, ex2);
842 >        assertEquals(1, a.get());
843 >    }}
844 >
845 >    /**
846 >     * handle action completes normally with function value on normal
847 >     * completion of source
848 >     */
849 >    public void testHandle_normalCompletion() {
850 >        for (ExecutionMode m : ExecutionMode.values())
851 >        for (boolean createIncomplete : new boolean[] { true, false })
852 >        for (Integer v1 : new Integer[] { 1, null })
853 >    {
854 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
855 >        final AtomicInteger a = new AtomicInteger(0);
856 >        if (!createIncomplete) f.complete(v1);
857 >        final CompletableFuture<Integer> g = m.handle
858 >            (f,
859 >             (Integer x, Throwable t) -> {
860 >                m.checkExecutionMode();
861 >                threadAssertSame(x, v1);
862 >                threadAssertNull(t);
863 >                a.getAndIncrement();
864 >                return inc(v1);
865 >            });
866 >        if (createIncomplete) f.complete(v1);
867 >
868 >        checkCompletedNormally(g, inc(v1));
869 >        checkCompletedNormally(f, v1);
870 >        assertEquals(1, a.get());
871 >    }}
872  
873      /**
874 <     * handle action completes normally with function value on either
875 <     * normal or exceptional completion of source
874 >     * handle action completes normally with function value on
875 >     * exceptional completion of source
876       */
877 <    public void testHandle() {
878 <        CompletableFuture<Integer> f, g;
879 <        IntegerHandler r;
880 <
881 <        f = new CompletableFuture<Integer>();
882 <        f.completeExceptionally(new CFException());
883 <        g = f.handle(r = new IntegerHandler());
884 <        assertTrue(r.ran);
885 <        checkCompletedNormally(g, three);
886 <
887 <        f = new CompletableFuture<Integer>();
888 <        g = f.handle(r = new IntegerHandler());
889 <        assertFalse(r.ran);
890 <        f.completeExceptionally(new CFException());
891 <        checkCompletedNormally(g, three);
892 <        assertTrue(r.ran);
877 >    public void testHandle_exceptionalCompletion() {
878 >        for (ExecutionMode m : ExecutionMode.values())
879 >        for (boolean createIncomplete : new boolean[] { true, false })
880 >        for (Integer v1 : new Integer[] { 1, null })
881 >    {
882 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
883 >        final AtomicInteger a = new AtomicInteger(0);
884 >        final CFException ex = new CFException();
885 >        if (!createIncomplete) f.completeExceptionally(ex);
886 >        final CompletableFuture<Integer> g = m.handle
887 >            (f,
888 >             (Integer x, Throwable t) -> {
889 >                m.checkExecutionMode();
890 >                threadAssertNull(x);
891 >                threadAssertSame(t, ex);
892 >                a.getAndIncrement();
893 >                return v1;
894 >            });
895 >        if (createIncomplete) f.completeExceptionally(ex);
896 >
897 >        checkCompletedNormally(g, v1);
898 >        checkCompletedWithWrappedCFException(f, ex);
899 >        assertEquals(1, a.get());
900 >    }}
901 >
902 >    /**
903 >     * handle action completes normally with function value on
904 >     * cancelled source
905 >     */
906 >    public void testHandle_sourceCancelled() {
907 >        for (ExecutionMode m : ExecutionMode.values())
908 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
909 >        for (boolean createIncomplete : new boolean[] { true, false })
910 >        for (Integer v1 : new Integer[] { 1, null })
911 >    {
912 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
913 >        final AtomicInteger a = new AtomicInteger(0);
914 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
915 >        final CompletableFuture<Integer> g = m.handle
916 >            (f,
917 >             (Integer x, Throwable t) -> {
918 >                m.checkExecutionMode();
919 >                threadAssertNull(x);
920 >                threadAssertTrue(t instanceof CancellationException);
921 >                a.getAndIncrement();
922 >                return v1;
923 >            });
924 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
925  
926 <        f = new CompletableFuture<Integer>();
927 <        f.complete(one);
928 <        g = f.handle(r = new IntegerHandler());
929 <        assertTrue(r.ran);
418 <        checkCompletedNormally(g, two);
419 <
420 <        f = new CompletableFuture<Integer>();
421 <        g = f.handle(r = new IntegerHandler());
422 <        assertFalse(r.ran);
423 <        f.complete(one);
424 <        assertTrue(r.ran);
425 <        checkCompletedNormally(g, two);
426 <    }
926 >        checkCompletedNormally(g, v1);
927 >        checkCancelled(f);
928 >        assertEquals(1, a.get());
929 >    }}
930  
931      /**
932 <     * runAsync completes after running Runnable
932 >     * handle result completes exceptionally if action does
933       */
934 <    public void testRunAsync() {
935 <        Noop r = new Noop();
936 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
937 <        assertNull(f.join());
938 <        assertTrue(r.ran);
939 <        checkCompletedNormally(f, null);
940 <    }
934 >    public void testHandle_sourceFailedActionFailed() {
935 >        for (ExecutionMode m : ExecutionMode.values())
936 >        for (boolean createIncomplete : new boolean[] { true, false })
937 >    {
938 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
939 >        final AtomicInteger a = new AtomicInteger(0);
940 >        final CFException ex1 = new CFException();
941 >        final CFException ex2 = new CFException();
942 >        if (!createIncomplete) f.completeExceptionally(ex1);
943 >        final CompletableFuture<Integer> g = m.handle
944 >            (f,
945 >             (Integer x, Throwable t) -> {
946 >                m.checkExecutionMode();
947 >                threadAssertNull(x);
948 >                threadAssertSame(ex1, t);
949 >                a.getAndIncrement();
950 >                throw ex2;
951 >            });
952 >        if (createIncomplete) f.completeExceptionally(ex1);
953 >
954 >        checkCompletedWithWrappedCFException(g, ex2);
955 >        checkCompletedWithWrappedCFException(f, ex1);
956 >        assertEquals(1, a.get());
957 >    }}
958 >
959 >    public void testHandle_sourceCompletedNormallyActionFailed() {
960 >        for (ExecutionMode m : ExecutionMode.values())
961 >        for (boolean createIncomplete : new boolean[] { true, false })
962 >        for (Integer v1 : new Integer[] { 1, null })
963 >    {
964 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
965 >        final AtomicInteger a = new AtomicInteger(0);
966 >        final CFException ex = new CFException();
967 >        if (!createIncomplete) f.complete(v1);
968 >        final CompletableFuture<Integer> g = m.handle
969 >            (f,
970 >             (Integer x, Throwable t) -> {
971 >                m.checkExecutionMode();
972 >                threadAssertSame(x, v1);
973 >                threadAssertNull(t);
974 >                a.getAndIncrement();
975 >                throw ex;
976 >            });
977 >        if (createIncomplete) f.complete(v1);
978 >
979 >        checkCompletedWithWrappedCFException(g, ex);
980 >        checkCompletedNormally(f, v1);
981 >        assertEquals(1, a.get());
982 >    }}
983  
984      /**
985 <     * runAsync with executor completes after running Runnable
985 >     * runAsync completes after running Runnable
986       */
987 <    public void testRunAsync2() {
988 <        Noop r = new Noop();
989 <        ThreadExecutor exec = new ThreadExecutor();
990 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
987 >    public void testRunAsync_normalCompletion() {
988 >        ExecutionMode[] executionModes = {
989 >            ExecutionMode.ASYNC,
990 >            ExecutionMode.EXECUTOR,
991 >        };
992 >        for (ExecutionMode m : executionModes)
993 >    {
994 >        final Noop r = new Noop(m);
995 >        final CompletableFuture<Void> f = m.runAsync(r);
996          assertNull(f.join());
447        assertTrue(r.ran);
997          checkCompletedNormally(f, null);
998 <        assertEquals(1, exec.count.get());
999 <    }
998 >        assertEquals(1, r.invocationCount);
999 >    }}
1000  
1001      /**
1002       * failing runAsync completes exceptionally after running Runnable
1003       */
1004 <    public void testRunAsync3() {
1005 <        FailingNoop r = new FailingNoop();
1006 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1004 >    public void testRunAsync_exceptionalCompletion() {
1005 >        ExecutionMode[] executionModes = {
1006 >            ExecutionMode.ASYNC,
1007 >            ExecutionMode.EXECUTOR,
1008 >        };
1009 >        for (ExecutionMode m : executionModes)
1010 >    {
1011 >        final FailingRunnable r = new FailingRunnable(m);
1012 >        final CompletableFuture<Void> f = m.runAsync(r);
1013          checkCompletedWithWrappedCFException(f);
1014 <        assertTrue(r.ran);
1015 <    }
1014 >        assertEquals(1, r.invocationCount);
1015 >    }}
1016  
1017      /**
1018       * supplyAsync completes with result of supplier
1019       */
1020 <    public void testSupplyAsync() {
1021 <        CompletableFuture<Integer> f;
1022 <        f = CompletableFuture.supplyAsync(supplyOne);
1023 <        assertEquals(f.join(), one);
1024 <        checkCompletedNormally(f, one);
1025 <    }
1026 <
1027 <    /**
1028 <     * supplyAsync with executor completes with result of supplier
1029 <     */
1030 <    public void testSupplyAsync2() {
1031 <        CompletableFuture<Integer> f;
1032 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1033 <        assertEquals(f.join(), one);
479 <        checkCompletedNormally(f, one);
480 <    }
1020 >    public void testSupplyAsync_normalCompletion() {
1021 >        ExecutionMode[] executionModes = {
1022 >            ExecutionMode.ASYNC,
1023 >            ExecutionMode.EXECUTOR,
1024 >        };
1025 >        for (ExecutionMode m : executionModes)
1026 >        for (Integer v1 : new Integer[] { 1, null })
1027 >    {
1028 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1029 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1030 >        assertSame(v1, f.join());
1031 >        checkCompletedNormally(f, v1);
1032 >        assertEquals(1, r.invocationCount);
1033 >    }}
1034  
1035      /**
1036       * Failing supplyAsync completes exceptionally
1037       */
1038 <    public void testSupplyAsync3() {
1039 <        FailingSupplier r = new FailingSupplier();
1040 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1038 >    public void testSupplyAsync_exceptionalCompletion() {
1039 >        ExecutionMode[] executionModes = {
1040 >            ExecutionMode.ASYNC,
1041 >            ExecutionMode.EXECUTOR,
1042 >        };
1043 >        for (ExecutionMode m : executionModes)
1044 >    {
1045 >        FailingSupplier r = new FailingSupplier(m);
1046 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1047          checkCompletedWithWrappedCFException(f);
1048 <        assertTrue(r.ran);
1049 <    }
1048 >        assertEquals(1, r.invocationCount);
1049 >    }}
1050  
1051      // seq completion methods
1052  
1053      /**
1054       * thenRun result completes normally after normal completion of source
1055       */
1056 <    public void testThenRun() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1058 <        Noop r = new Noop();
1059 <        CompletableFuture<Void> g = f.thenRun(r);
1060 <        f.complete(null);
1061 <        checkCompletedNormally(g, null);
1062 <        // reordered version
1063 <        f = new CompletableFuture<Integer>();
1064 <        f.complete(null);
1065 <        r = new Noop();
1066 <        g = f.thenRun(r);
1056 >    public void testThenRun_normalCompletion() {
1057 >        for (ExecutionMode m : ExecutionMode.values())
1058 >        for (boolean createIncomplete : new boolean[] { true, false })
1059 >        for (Integer v1 : new Integer[] { 1, null })
1060 >    {
1061 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1062 >        final Noop r = new Noop(m);
1063 >        if (!createIncomplete) f.complete(v1);
1064 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1065 >        if (createIncomplete) {
1066 >            checkIncomplete(g);
1067 >            f.complete(v1);
1068 >        }
1069 >
1070          checkCompletedNormally(g, null);
1071 <    }
1071 >        checkCompletedNormally(f, v1);
1072 >        assertEquals(1, r.invocationCount);
1073 >    }}
1074  
1075      /**
1076       * thenRun result completes exceptionally after exceptional
1077       * completion of source
1078       */
1079 <    public void testThenRun2() {
1080 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1081 <        Noop r = new Noop();
1082 <        CompletableFuture<Void> g = f.thenRun(r);
1083 <        f.completeExceptionally(new CFException());
1084 <        checkCompletedWithWrappedCFException(g);
1085 <    }
1079 >    public void testThenRun_exceptionalCompletion() {
1080 >        for (ExecutionMode m : ExecutionMode.values())
1081 >        for (boolean createIncomplete : new boolean[] { true, false })
1082 >    {
1083 >        final CFException ex = new CFException();
1084 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1085 >        final Noop r = new Noop(m);
1086 >        if (!createIncomplete) f.completeExceptionally(ex);
1087 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1088 >        if (createIncomplete) {
1089 >            checkIncomplete(g);
1090 >            f.completeExceptionally(ex);
1091 >        }
1092  
1093 <    /**
1094 <     * thenRun result completes exceptionally if action does
1095 <     */
1096 <    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 <    }
1093 >        checkCompletedWithWrappedCFException(g, ex);
1094 >        checkCompletedWithWrappedCFException(f, ex);
1095 >        assertEquals(0, r.invocationCount);
1096 >    }}
1097  
1098      /**
1099       * thenRun result completes exceptionally if source cancelled
1100       */
1101 <    public void testThenRun4() {
1102 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1103 <        Noop r = new Noop();
1104 <        CompletableFuture<Void> g = f.thenRun(r);
1105 <        assertTrue(f.cancel(true));
1101 >    public void testThenRun_sourceCancelled() {
1102 >        for (ExecutionMode m : ExecutionMode.values())
1103 >        for (boolean createIncomplete : new boolean[] { true, false })
1104 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1105 >    {
1106 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1107 >        final Noop r = new Noop(m);
1108 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1109 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1110 >        if (createIncomplete) {
1111 >            checkIncomplete(g);
1112 >            assertTrue(f.cancel(mayInterruptIfRunning));
1113 >        }
1114 >
1115          checkCompletedWithWrappedCancellationException(g);
1116 <    }
1116 >        checkCancelled(f);
1117 >        assertEquals(0, r.invocationCount);
1118 >    }}
1119 >
1120 >    /**
1121 >     * thenRun result completes exceptionally if action does
1122 >     */
1123 >    public void testThenRun_actionFailed() {
1124 >        for (ExecutionMode m : ExecutionMode.values())
1125 >        for (boolean createIncomplete : new boolean[] { true, false })
1126 >        for (Integer v1 : new Integer[] { 1, null })
1127 >    {
1128 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1129 >        final FailingRunnable r = new FailingRunnable(m);
1130 >        if (!createIncomplete) f.complete(v1);
1131 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1132 >        if (createIncomplete) {
1133 >            checkIncomplete(g);
1134 >            f.complete(v1);
1135 >        }
1136 >
1137 >        checkCompletedWithWrappedCFException(g);
1138 >        checkCompletedNormally(f, v1);
1139 >    }}
1140  
1141      /**
1142       * thenApply result completes normally after normal completion of source
1143       */
1144 <    public void testThenApply() {
1145 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1146 <        CompletableFuture<Integer> g = f.thenApply(inc);
1147 <        f.complete(one);
1148 <        checkCompletedNormally(g, two);
1149 <    }
1144 >    public void testThenApply_normalCompletion() {
1145 >        for (ExecutionMode m : ExecutionMode.values())
1146 >        for (boolean createIncomplete : new boolean[] { true, false })
1147 >        for (Integer v1 : new Integer[] { 1, null })
1148 >    {
1149 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1150 >        final IncFunction r = new IncFunction(m);
1151 >        if (!createIncomplete) f.complete(v1);
1152 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1153 >        if (createIncomplete) {
1154 >            checkIncomplete(g);
1155 >            f.complete(v1);
1156 >        }
1157 >
1158 >        checkCompletedNormally(g, inc(v1));
1159 >        checkCompletedNormally(f, v1);
1160 >        assertEquals(1, r.invocationCount);
1161 >    }}
1162  
1163      /**
1164       * thenApply result completes exceptionally after exceptional
1165       * completion of source
1166       */
1167 <    public void testThenApply2() {
1168 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1169 <        CompletableFuture<Integer> g = f.thenApply(inc);
1170 <        f.completeExceptionally(new CFException());
1171 <        checkCompletedWithWrappedCFException(g);
1172 <    }
1167 >    public void testThenApply_exceptionalCompletion() {
1168 >        for (ExecutionMode m : ExecutionMode.values())
1169 >        for (boolean createIncomplete : new boolean[] { true, false })
1170 >    {
1171 >        final CFException ex = new CFException();
1172 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1173 >        final IncFunction r = new IncFunction(m);
1174 >        if (!createIncomplete) f.completeExceptionally(ex);
1175 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1176 >        if (createIncomplete) {
1177 >            checkIncomplete(g);
1178 >            f.completeExceptionally(ex);
1179 >        }
1180  
1181 <    /**
1182 <     * thenApply result completes exceptionally if action does
1183 <     */
1184 <    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 <    }
1181 >        checkCompletedWithWrappedCFException(g, ex);
1182 >        checkCompletedWithWrappedCFException(f, ex);
1183 >        assertEquals(0, r.invocationCount);
1184 >    }}
1185  
1186      /**
1187       * thenApply result completes exceptionally if source cancelled
1188       */
1189 <    public void testThenApply4() {
1190 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1191 <        CompletableFuture<Integer> g = f.thenApply(inc);
1192 <        assertTrue(f.cancel(true));
1189 >    public void testThenApply_sourceCancelled() {
1190 >        for (ExecutionMode m : ExecutionMode.values())
1191 >        for (boolean createIncomplete : new boolean[] { true, false })
1192 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1193 >    {
1194 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1195 >        final IncFunction r = new IncFunction(m);
1196 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1197 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1198 >        if (createIncomplete) {
1199 >            checkIncomplete(g);
1200 >            assertTrue(f.cancel(mayInterruptIfRunning));
1201 >        }
1202 >
1203          checkCompletedWithWrappedCancellationException(g);
1204 <    }
1204 >        checkCancelled(f);
1205 >        assertEquals(0, r.invocationCount);
1206 >    }}
1207 >
1208 >    /**
1209 >     * thenApply result completes exceptionally if action does
1210 >     */
1211 >    public void testThenApply_actionFailed() {
1212 >        for (ExecutionMode m : ExecutionMode.values())
1213 >        for (boolean createIncomplete : new boolean[] { true, false })
1214 >        for (Integer v1 : new Integer[] { 1, null })
1215 >    {
1216 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1217 >        final FailingFunction r = new FailingFunction(m);
1218 >        if (!createIncomplete) f.complete(v1);
1219 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1220 >        if (createIncomplete) {
1221 >            checkIncomplete(g);
1222 >            f.complete(v1);
1223 >        }
1224 >
1225 >        checkCompletedWithWrappedCFException(g);
1226 >        checkCompletedNormally(f, v1);
1227 >    }}
1228  
1229      /**
1230       * thenAccept result completes normally after normal completion of source
1231       */
1232 <    public void testThenAccept() {
1233 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1234 <        IncAction r = new IncAction();
1235 <        CompletableFuture<Void> g = f.thenAccept(r);
1236 <        f.complete(one);
1232 >    public void testThenAccept_normalCompletion() {
1233 >        for (ExecutionMode m : ExecutionMode.values())
1234 >        for (boolean createIncomplete : new boolean[] { true, false })
1235 >        for (Integer v1 : new Integer[] { 1, null })
1236 >    {
1237 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1238 >        final IncAction r = new IncAction();
1239 >        if (!createIncomplete) f.complete(v1);
1240 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1241 >        if (createIncomplete) {
1242 >            checkIncomplete(g);
1243 >            f.complete(v1);
1244 >        }
1245 >
1246          checkCompletedNormally(g, null);
1247 <        assertEquals(r.value, 2);
1248 <    }
1247 >        checkCompletedNormally(f, v1);
1248 >        assertEquals(1, r.invocationCount);
1249 >        assertEquals(inc(v1), r.value);
1250 >    }}
1251  
1252      /**
1253       * thenAccept result completes exceptionally after exceptional
1254       * completion of source
1255       */
1256 <    public void testThenAccept2() {
1257 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1258 <        IncAction r = new IncAction();
1259 <        CompletableFuture<Void> g = f.thenAccept(r);
1260 <        f.completeExceptionally(new CFException());
1261 <        checkCompletedWithWrappedCFException(g);
1262 <    }
1256 >    public void testThenAccept_exceptionalCompletion() {
1257 >        for (ExecutionMode m : ExecutionMode.values())
1258 >        for (boolean createIncomplete : new boolean[] { true, false })
1259 >    {
1260 >        final CFException ex = new CFException();
1261 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1262 >        final IncAction r = new IncAction();
1263 >        if (!createIncomplete) f.completeExceptionally(ex);
1264 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1265 >        if (createIncomplete) {
1266 >            checkIncomplete(g);
1267 >            f.completeExceptionally(ex);
1268 >        }
1269 >
1270 >        checkCompletedWithWrappedCFException(g, ex);
1271 >        checkCompletedWithWrappedCFException(f, ex);
1272 >        assertEquals(0, r.invocationCount);
1273 >    }}
1274  
1275      /**
1276       * thenAccept result completes exceptionally if action does
1277       */
1278 <    public void testThenAccept3() {
1279 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1280 <        FailingConsumer r = new FailingConsumer();
1281 <        CompletableFuture<Void> g = f.thenAccept(r);
1282 <        f.complete(one);
1278 >    public void testThenAccept_actionFailed() {
1279 >        for (ExecutionMode m : ExecutionMode.values())
1280 >        for (boolean createIncomplete : new boolean[] { true, false })
1281 >        for (Integer v1 : new Integer[] { 1, null })
1282 >    {
1283 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1284 >        final FailingConsumer r = new FailingConsumer(m);
1285 >        if (!createIncomplete) f.complete(v1);
1286 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1287 >        if (createIncomplete) {
1288 >            checkIncomplete(g);
1289 >            f.complete(v1);
1290 >        }
1291 >
1292          checkCompletedWithWrappedCFException(g);
1293 <        assertTrue(r.ran);
1294 <    }
1293 >        checkCompletedNormally(f, v1);
1294 >    }}
1295  
1296      /**
1297       * thenAccept result completes exceptionally if source cancelled
1298       */
1299 <    public void testThenAccept4() {
1300 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1301 <        IncAction r = new IncAction();
1302 <        CompletableFuture<Void> g = f.thenAccept(r);
1303 <        assertTrue(f.cancel(true));
1304 <        checkCompletedWithWrappedCancellationException(g);
1305 <    }
1299 >    public void testThenAccept_sourceCancelled() {
1300 >        for (ExecutionMode m : ExecutionMode.values())
1301 >        for (boolean createIncomplete : new boolean[] { true, false })
1302 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1303 >    {
1304 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1305 >        final IncAction r = new IncAction();
1306 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1307 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1308 >        if (createIncomplete) {
1309 >            checkIncomplete(g);
1310 >            assertTrue(f.cancel(mayInterruptIfRunning));
1311 >        }
1312  
1313 +        checkCompletedWithWrappedCancellationException(g);
1314 +        checkCancelled(f);
1315 +        assertEquals(0, r.invocationCount);
1316 +    }}
1317  
1318      /**
1319       * thenCombine result completes normally after normal completion
1320       * of sources
1321       */
1322 <    public void testThenCombine() {
1323 <        CompletableFuture<Integer> f, g, h;
1322 >    public void testThenCombine_normalCompletion() {
1323 >        for (ExecutionMode m : ExecutionMode.values())
1324 >        for (boolean createIncomplete : new boolean[] { true, false })
1325 >        for (boolean fFirst : new boolean[] { true, false })
1326 >        for (Integer v1 : new Integer[] { 1, null })
1327 >        for (Integer v2 : new Integer[] { 2, null })
1328 >    {
1329 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1330 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1331 >        final SubtractFunction r = new SubtractFunction(m);
1332 >
1333 >        if (fFirst) f.complete(v1); else g.complete(v2);
1334 >        if (!createIncomplete)
1335 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1336 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1337 >        if (createIncomplete) {
1338 >            checkIncomplete(h);
1339 >            assertEquals(0, r.invocationCount);
1340 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1341 >        }
1342  
1343 <        f = new CompletableFuture<Integer>();
1344 <        g = new CompletableFuture<Integer>();
1345 <        h = f.thenCombine(g, subtract);
1346 <        f.complete(3);
1347 <        checkIncomplete(h);
646 <        g.complete(1);
647 <        checkCompletedNormally(h, 2);
648 <
649 <        f = new CompletableFuture<Integer>();
650 <        g = new CompletableFuture<Integer>();
651 <        h = f.thenCombine(g, subtract);
652 <        g.complete(1);
653 <        checkIncomplete(h);
654 <        f.complete(3);
655 <        checkCompletedNormally(h, 2);
656 <
657 <        f = new CompletableFuture<Integer>();
658 <        g = new CompletableFuture<Integer>();
659 <        g.complete(1);
660 <        f.complete(3);
661 <        h = f.thenCombine(g, subtract);
662 <        checkCompletedNormally(h, 2);
663 <    }
1343 >        checkCompletedNormally(h, subtract(v1, v2));
1344 >        checkCompletedNormally(f, v1);
1345 >        checkCompletedNormally(g, v2);
1346 >        assertEquals(1, r.invocationCount);
1347 >    }}
1348  
1349      /**
1350       * thenCombine result completes exceptionally after exceptional
1351       * completion of either source
1352       */
1353 <    public void testThenCombine2() {
1354 <        CompletableFuture<Integer> f, g, h;
1355 <
1356 <        f = new CompletableFuture<Integer>();
1357 <        g = new CompletableFuture<Integer>();
1358 <        h = f.thenCombine(g, subtract);
1359 <        f.completeExceptionally(new CFException());
1360 <        checkIncomplete(h);
1361 <        g.complete(1);
1362 <        checkCompletedWithWrappedCFException(h);
1363 <
1364 <        f = new CompletableFuture<Integer>();
1365 <        g = new CompletableFuture<Integer>();
1366 <        h = f.thenCombine(g, subtract);
1367 <        g.completeExceptionally(new CFException());
1368 <        checkIncomplete(h);
1369 <        f.complete(3);
1370 <        checkCompletedWithWrappedCFException(h);
1353 >    public void testThenCombine_exceptionalCompletion() {
1354 >        for (ExecutionMode m : ExecutionMode.values())
1355 >        for (boolean createIncomplete : new boolean[] { true, false })
1356 >        for (boolean fFirst : new boolean[] { true, false })
1357 >        for (Integer v1 : new Integer[] { 1, null })
1358 >    {
1359 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1360 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1361 >        final CFException ex = new CFException();
1362 >        final SubtractFunction r = new SubtractFunction(m);
1363 >
1364 >        (fFirst ? f : g).complete(v1);
1365 >        if (!createIncomplete)
1366 >            (!fFirst ? f : g).completeExceptionally(ex);
1367 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1368 >        if (createIncomplete) {
1369 >            checkIncomplete(h);
1370 >            (!fFirst ? f : g).completeExceptionally(ex);
1371 >        }
1372  
1373 <        f = new CompletableFuture<Integer>();
1374 <        g = new CompletableFuture<Integer>();
1375 <        f.complete(3);
1376 <        g.completeExceptionally(new CFException());
1377 <        h = f.thenCombine(g, subtract);
693 <        checkCompletedWithWrappedCFException(h);
694 <
695 <        f = new CompletableFuture<Integer>();
696 <        g = new CompletableFuture<Integer>();
697 <        f.completeExceptionally(new CFException());
698 <        g.complete(3);
699 <        h = f.thenCombine(g, subtract);
700 <        checkCompletedWithWrappedCFException(h);
701 <    }
1373 >        checkCompletedWithWrappedCFException(h, ex);
1374 >        assertEquals(0, r.invocationCount);
1375 >        checkCompletedNormally(fFirst ? f : g, v1);
1376 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1377 >    }}
1378  
1379      /**
1380       * thenCombine result completes exceptionally if action does
1381       */
1382 <    public void testThenCombine3() {
1383 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1384 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1385 <        FailingBiFunction r = new FailingBiFunction();
1386 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1387 <        f.complete(one);
1388 <        checkIncomplete(g);
1389 <        assertFalse(r.ran);
1390 <        f2.complete(two);
1391 <        checkCompletedWithWrappedCFException(g);
1392 <        assertTrue(r.ran);
1393 <    }
1382 >    public void testThenCombine_actionFailed() {
1383 >        for (ExecutionMode m : ExecutionMode.values())
1384 >        for (boolean fFirst : new boolean[] { true, false })
1385 >        for (Integer v1 : new Integer[] { 1, null })
1386 >        for (Integer v2 : new Integer[] { 2, null })
1387 >    {
1388 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1389 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1390 >        final FailingBiFunction r = new FailingBiFunction(m);
1391 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1392 >
1393 >        if (fFirst) {
1394 >            f.complete(v1);
1395 >            g.complete(v2);
1396 >        } else {
1397 >            g.complete(v2);
1398 >            f.complete(v1);
1399 >        }
1400 >
1401 >        checkCompletedWithWrappedCFException(h);
1402 >        checkCompletedNormally(f, v1);
1403 >        checkCompletedNormally(g, v2);
1404 >    }}
1405  
1406      /**
1407       * thenCombine result completes exceptionally if either source cancelled
1408       */
1409 <    public void testThenCombine4() {
1410 <        CompletableFuture<Integer> f, g, h;
1411 <
1412 <        f = new CompletableFuture<Integer>();
1413 <        g = new CompletableFuture<Integer>();
1414 <        h = f.thenCombine(g, subtract);
1415 <        assertTrue(f.cancel(true));
1416 <        checkIncomplete(h);
1417 <        g.complete(1);
1418 <        checkCompletedWithWrappedCancellationException(h);
1419 <
1420 <        f = new CompletableFuture<Integer>();
1421 <        g = new CompletableFuture<Integer>();
1422 <        h = f.thenCombine(g, subtract);
1423 <        assertTrue(g.cancel(true));
1424 <        checkIncomplete(h);
1425 <        f.complete(3);
1426 <        checkCompletedWithWrappedCancellationException(h);
1409 >    public void testThenCombine_sourceCancelled() {
1410 >        for (ExecutionMode m : ExecutionMode.values())
1411 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1412 >        for (boolean createIncomplete : new boolean[] { true, false })
1413 >        for (boolean fFirst : new boolean[] { true, false })
1414 >        for (Integer v1 : new Integer[] { 1, null })
1415 >    {
1416 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1417 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1418 >        final SubtractFunction r = new SubtractFunction(m);
1419 >
1420 >        (fFirst ? f : g).complete(v1);
1421 >        if (!createIncomplete)
1422 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1423 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1424 >        if (createIncomplete) {
1425 >            checkIncomplete(h);
1426 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1427 >        }
1428  
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);
1429          checkCompletedWithWrappedCancellationException(h);
1430 <    }
1430 >        checkCancelled(!fFirst ? f : g);
1431 >        assertEquals(0, r.invocationCount);
1432 >        checkCompletedNormally(fFirst ? f : g, v1);
1433 >    }}
1434  
1435      /**
1436       * thenAcceptBoth result completes normally after normal
1437       * completion of sources
1438       */
1439 <    public void testThenAcceptBoth() {
1440 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1441 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1442 <        AddAction r = new AddAction();
1443 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1444 <        f.complete(one);
1445 <        checkIncomplete(g);
1446 <        f2.complete(two);
1447 <        checkCompletedNormally(g, null);
1448 <        assertEquals(r.value, 3);
1439 >    public void testThenAcceptBoth_normalCompletion() {
1440 >        for (ExecutionMode m : ExecutionMode.values())
1441 >        for (boolean createIncomplete : new boolean[] { true, false })
1442 >        for (boolean fFirst : new boolean[] { true, false })
1443 >        for (Integer v1 : new Integer[] { 1, null })
1444 >        for (Integer v2 : new Integer[] { 2, null })
1445 >    {
1446 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1447 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1448 >        final SubtractAction r = new SubtractAction(m);
1449 >
1450 >        if (fFirst) f.complete(v1); else g.complete(v2);
1451 >        if (!createIncomplete)
1452 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1453 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1454 >        if (createIncomplete) {
1455 >            checkIncomplete(h);
1456 >            assertEquals(0, r.invocationCount);
1457 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1458 >        }
1459  
1460 <        r = new AddAction();
1461 <        f = new CompletableFuture<Integer>();
1462 <        f.complete(one);
1463 <        f2 = new CompletableFuture<Integer>();
1464 <        g = f.thenAcceptBoth(f2, r);
769 <        checkIncomplete(g);
770 <        f2.complete(two);
771 <        checkCompletedNormally(g, null);
772 <        assertEquals(r.value, 3);
773 <    }
1460 >        checkCompletedNormally(h, null);
1461 >        assertEquals(subtract(v1, v2), r.value);
1462 >        checkCompletedNormally(f, v1);
1463 >        checkCompletedNormally(g, v2);
1464 >    }}
1465  
1466      /**
1467       * thenAcceptBoth result completes exceptionally after exceptional
1468       * completion of either source
1469       */
1470 <    public void testThenAcceptBoth2() {
1471 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1472 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1473 <        AddAction r = new AddAction();
1474 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1475 <        f.completeExceptionally(new CFException());
1476 <        f2.complete(two);
1477 <        checkCompletedWithWrappedCFException(g);
1470 >    public void testThenAcceptBoth_exceptionalCompletion() {
1471 >        for (ExecutionMode m : ExecutionMode.values())
1472 >        for (boolean createIncomplete : new boolean[] { true, false })
1473 >        for (boolean fFirst : new boolean[] { true, false })
1474 >        for (Integer v1 : new Integer[] { 1, null })
1475 >    {
1476 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1477 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1478 >        final CFException ex = new CFException();
1479 >        final SubtractAction r = new SubtractAction(m);
1480 >
1481 >        (fFirst ? f : g).complete(v1);
1482 >        if (!createIncomplete)
1483 >            (!fFirst ? f : g).completeExceptionally(ex);
1484 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1485 >        if (createIncomplete) {
1486 >            checkIncomplete(h);
1487 >            (!fFirst ? f : g).completeExceptionally(ex);
1488 >        }
1489  
1490 <        r = new AddAction();
1491 <        f = new CompletableFuture<Integer>();
1492 <        f.complete(one);
1493 <        f2 = new CompletableFuture<Integer>();
1494 <        g = f.thenAcceptBoth(f2, r);
793 <        f2.completeExceptionally(new CFException());
794 <        checkCompletedWithWrappedCFException(g);
795 <    }
1490 >        checkCompletedWithWrappedCFException(h, ex);
1491 >        assertEquals(0, r.invocationCount);
1492 >        checkCompletedNormally(fFirst ? f : g, v1);
1493 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1494 >    }}
1495  
1496      /**
1497       * thenAcceptBoth result completes exceptionally if action does
1498       */
1499 <    public void testThenAcceptBoth3() {
1500 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1501 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1502 <        FailingBiConsumer r = new FailingBiConsumer();
1503 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1504 <        f.complete(one);
1505 <        checkIncomplete(g);
1506 <        f2.complete(two);
1507 <        checkCompletedWithWrappedCFException(g);
1508 <    }
1499 >    public void testThenAcceptBoth_actionFailed() {
1500 >        for (ExecutionMode m : ExecutionMode.values())
1501 >        for (boolean fFirst : new boolean[] { true, false })
1502 >        for (Integer v1 : new Integer[] { 1, null })
1503 >        for (Integer v2 : new Integer[] { 2, null })
1504 >    {
1505 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1506 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1507 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1508 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1509 >
1510 >        if (fFirst) {
1511 >            f.complete(v1);
1512 >            g.complete(v2);
1513 >        } else {
1514 >            g.complete(v2);
1515 >            f.complete(v1);
1516 >        }
1517 >
1518 >        checkCompletedWithWrappedCFException(h);
1519 >        checkCompletedNormally(f, v1);
1520 >        checkCompletedNormally(g, v2);
1521 >    }}
1522  
1523      /**
1524       * thenAcceptBoth result completes exceptionally if either source cancelled
1525       */
1526 <    public void testThenAcceptBoth4() {
1527 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1528 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1529 <        AddAction r = new AddAction();
1530 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1531 <        assertTrue(f.cancel(true));
1532 <        f2.complete(two);
1533 <        checkCompletedWithWrappedCancellationException(g);
1534 <        f = new CompletableFuture<Integer>();
1535 <        f2 = new CompletableFuture<Integer>();
1536 <        r = new AddAction();
1537 <        g = f.thenAcceptBoth(f2, r);
1538 <        f.complete(one);
1539 <        assertTrue(f2.cancel(true));
1540 <        checkCompletedWithWrappedCancellationException(g);
1541 <    }
1526 >    public void testThenAcceptBoth_sourceCancelled() {
1527 >        for (ExecutionMode m : ExecutionMode.values())
1528 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1529 >        for (boolean createIncomplete : new boolean[] { true, false })
1530 >        for (boolean fFirst : new boolean[] { true, false })
1531 >        for (Integer v1 : new Integer[] { 1, null })
1532 >    {
1533 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1534 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1535 >        final SubtractAction r = new SubtractAction(m);
1536 >
1537 >        (fFirst ? f : g).complete(v1);
1538 >        if (!createIncomplete)
1539 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1540 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1541 >        if (createIncomplete) {
1542 >            checkIncomplete(h);
1543 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1544 >        }
1545 >
1546 >        checkCompletedWithWrappedCancellationException(h);
1547 >        checkCancelled(!fFirst ? f : g);
1548 >        assertEquals(0, r.invocationCount);
1549 >        checkCompletedNormally(fFirst ? f : g, v1);
1550 >    }}
1551  
1552      /**
1553       * runAfterBoth result completes normally after normal
1554       * completion of sources
1555       */
1556 <    public void testRunAfterBoth() {
1557 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1558 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1559 <        Noop r = new Noop();
1560 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1561 <        f.complete(one);
1562 <        checkIncomplete(g);
1563 <        f2.complete(two);
1564 <        checkCompletedNormally(g, null);
1565 <        assertTrue(r.ran);
1556 >    public void testRunAfterBoth_normalCompletion() {
1557 >        for (ExecutionMode m : ExecutionMode.values())
1558 >        for (boolean createIncomplete : new boolean[] { true, false })
1559 >        for (boolean fFirst : new boolean[] { true, false })
1560 >        for (Integer v1 : new Integer[] { 1, null })
1561 >        for (Integer v2 : new Integer[] { 2, null })
1562 >    {
1563 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1564 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1565 >        final Noop r = new Noop(m);
1566 >
1567 >        if (fFirst) f.complete(v1); else g.complete(v2);
1568 >        if (!createIncomplete)
1569 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1570 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1571 >        if (createIncomplete) {
1572 >            checkIncomplete(h);
1573 >            assertEquals(0, r.invocationCount);
1574 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1575 >        }
1576  
1577 <        r = new Noop();
1578 <        f = new CompletableFuture<Integer>();
1579 <        f.complete(one);
1580 <        f2 = new CompletableFuture<Integer>();
1581 <        g = f.runAfterBoth(f2, r);
851 <        checkIncomplete(g);
852 <        f2.complete(two);
853 <        checkCompletedNormally(g, null);
854 <        assertTrue(r.ran);
855 <    }
1577 >        checkCompletedNormally(h, null);
1578 >        assertEquals(1, r.invocationCount);
1579 >        checkCompletedNormally(f, v1);
1580 >        checkCompletedNormally(g, v2);
1581 >    }}
1582  
1583      /**
1584       * runAfterBoth result completes exceptionally after exceptional
1585       * completion of either source
1586       */
1587 <    public void testRunAfterBoth2() {
1588 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1589 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1590 <        Noop r = new Noop();
1591 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1592 <        f.completeExceptionally(new CFException());
1593 <        f2.complete(two);
1594 <        checkCompletedWithWrappedCFException(g);
1587 >    public void testRunAfterBoth_exceptionalCompletion() {
1588 >        for (ExecutionMode m : ExecutionMode.values())
1589 >        for (boolean createIncomplete : new boolean[] { true, false })
1590 >        for (boolean fFirst : new boolean[] { true, false })
1591 >        for (Integer v1 : new Integer[] { 1, null })
1592 >    {
1593 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1594 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1595 >        final CFException ex = new CFException();
1596 >        final Noop r = new Noop(m);
1597 >
1598 >        (fFirst ? f : g).complete(v1);
1599 >        if (!createIncomplete)
1600 >            (!fFirst ? f : g).completeExceptionally(ex);
1601 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1602 >        if (createIncomplete) {
1603 >            checkIncomplete(h);
1604 >            (!fFirst ? f : g).completeExceptionally(ex);
1605 >        }
1606  
1607 <        r = new Noop();
1608 <        f = new CompletableFuture<Integer>();
1609 <        f.complete(one);
1610 <        f2 = new CompletableFuture<Integer>();
1611 <        g = f.runAfterBoth(f2, r);
875 <        f2.completeExceptionally(new CFException());
876 <        checkCompletedWithWrappedCFException(g);
877 <    }
1607 >        checkCompletedWithWrappedCFException(h, ex);
1608 >        assertEquals(0, r.invocationCount);
1609 >        checkCompletedNormally(fFirst ? f : g, v1);
1610 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1611 >    }}
1612  
1613      /**
1614       * runAfterBoth result completes exceptionally if action does
1615       */
1616 <    public void testRunAfterBoth3() {
1617 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1618 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1619 <        FailingNoop r = new FailingNoop();
1620 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1621 <        f.complete(one);
1622 <        checkIncomplete(g);
1623 <        f2.complete(two);
1624 <        checkCompletedWithWrappedCFException(g);
1625 <    }
1616 >    public void testRunAfterBoth_actionFailed() {
1617 >        for (ExecutionMode m : ExecutionMode.values())
1618 >        for (boolean fFirst : new boolean[] { true, false })
1619 >        for (Integer v1 : new Integer[] { 1, null })
1620 >        for (Integer v2 : new Integer[] { 2, null })
1621 >    {
1622 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1623 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1624 >        final FailingRunnable r = new FailingRunnable(m);
1625 >
1626 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1627 >        if (fFirst) {
1628 >            f.complete(v1);
1629 >            g.complete(v2);
1630 >        } else {
1631 >            g.complete(v2);
1632 >            f.complete(v1);
1633 >        }
1634 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1635 >
1636 >        checkCompletedWithWrappedCFException(h1);
1637 >        checkCompletedWithWrappedCFException(h2);
1638 >        checkCompletedNormally(f, v1);
1639 >        checkCompletedNormally(g, v2);
1640 >    }}
1641  
1642      /**
1643       * runAfterBoth result completes exceptionally if either source cancelled
1644       */
1645 <    public void testRunAfterBoth4() {
1646 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1647 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1648 <        Noop r = new Noop();
1649 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1650 <        assertTrue(f.cancel(true));
1651 <        f2.complete(two);
1652 <        checkCompletedWithWrappedCancellationException(g);
1653 <        f = new CompletableFuture<Integer>();
1654 <        f2 = new CompletableFuture<Integer>();
1655 <        r = new Noop();
1656 <        g = f.runAfterBoth(f2, r);
1657 <        f.complete(one);
1658 <        assertTrue(f2.cancel(true));
1659 <        checkCompletedWithWrappedCancellationException(g);
1660 <    }
1645 >    public void testRunAfterBoth_sourceCancelled() {
1646 >        for (ExecutionMode m : ExecutionMode.values())
1647 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1648 >        for (boolean createIncomplete : new boolean[] { true, false })
1649 >        for (boolean fFirst : new boolean[] { true, false })
1650 >        for (Integer v1 : new Integer[] { 1, null })
1651 >    {
1652 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1653 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1654 >        final Noop r = new Noop(m);
1655 >
1656 >
1657 >        (fFirst ? f : g).complete(v1);
1658 >        if (!createIncomplete)
1659 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1660 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1661 >        if (createIncomplete) {
1662 >            checkIncomplete(h);
1663 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1664 >        }
1665 >
1666 >        checkCompletedWithWrappedCancellationException(h);
1667 >        checkCancelled(!fFirst ? f : g);
1668 >        assertEquals(0, r.invocationCount);
1669 >        checkCompletedNormally(fFirst ? f : g, v1);
1670 >    }}
1671  
1672      /**
1673       * applyToEither result completes normally after normal completion
1674       * of either source
1675       */
1676 <    public void testApplyToEither() {
1677 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1678 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1679 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1680 <        f.complete(one);
1681 <        checkCompletedNormally(g, two);
1682 <        f2.complete(one);
1683 <        checkCompletedNormally(g, two);
1684 <
1685 <        f = new CompletableFuture<Integer>();
1686 <        f.complete(one);
1687 <        f2 = new CompletableFuture<Integer>();
1688 <        g = f.applyToEither(f2, inc);
1689 <        checkCompletedNormally(g, two);
1690 <    }
1676 >    public void testApplyToEither_normalCompletion() {
1677 >        for (ExecutionMode m : ExecutionMode.values())
1678 >        for (boolean createIncomplete : new boolean[] { true, false })
1679 >        for (boolean fFirst : new boolean[] { true, false })
1680 >        for (Integer v1 : new Integer[] { 1, null })
1681 >        for (Integer v2 : new Integer[] { 2, null })
1682 >    {
1683 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1684 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1685 >        final IncFunction r = new IncFunction(m);
1686 >
1687 >        if (!createIncomplete)
1688 >            if (fFirst) f.complete(v1); else g.complete(v2);
1689 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1690 >        if (createIncomplete) {
1691 >            checkIncomplete(h);
1692 >            assertEquals(0, r.invocationCount);
1693 >            if (fFirst) f.complete(v1); else g.complete(v2);
1694 >        }
1695 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1696 >        if (!fFirst) f.complete(v1); else g.complete(v2);
1697  
1698 <    /**
1699 <     * applyToEither result completes exceptionally after exceptional
1700 <     * completion of either source
1701 <     */
1702 <    public void testApplyToEither2() {
1703 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1704 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1705 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1706 <        f.completeExceptionally(new CFException());
1707 <        f2.complete(one);
1708 <        checkCompletedWithWrappedCFException(g);
1698 >        checkCompletedNormally(f, v1);
1699 >        checkCompletedNormally(g, v2);
1700 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1701 >    }}
1702 >
1703 >    public void testApplyToEither_normalCompletionBothAvailable() {
1704 >        for (ExecutionMode m : ExecutionMode.values())
1705 >        for (boolean fFirst : new boolean[] { true, false })
1706 >        for (Integer v1 : new Integer[] { 1, null })
1707 >        for (Integer v2 : new Integer[] { 2, null })
1708 >    {
1709 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1710 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1711 >        final IncFunction r = new IncFunction(m);
1712 >
1713 >        if (fFirst) {
1714 >            f.complete(v1);
1715 >            g.complete(v2);
1716 >        } else {
1717 >            g.complete(v2);
1718 >            f.complete(v1);
1719 >        }
1720  
1721 <        f = new CompletableFuture<Integer>();
946 <        f2 = new CompletableFuture<Integer>();
947 <        f2.completeExceptionally(new CFException());
948 <        g = f.applyToEither(f2, inc);
949 <        checkCompletedWithWrappedCFException(g);
950 <    }
1721 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1722  
1723 <    /**
1724 <     * 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 <    }
1723 >        checkCompletedNormally(f, v1);
1724 >        checkCompletedNormally(g, v2);
1725  
1726 <    /**
1727 <     * applyToEither result completes exceptionally if either source cancelled
1728 <     */
1729 <    public void testApplyToEither4() {
1730 <        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 <    }
1726 >        // unspecified behavior
1727 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1728 >                   Objects.equals(h.join(), inc(v2)));
1729 >        assertEquals(1, r.invocationCount);
1730 >    }}
1731  
1732      /**
1733 <     * 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
1733 >     * applyToEither result completes exceptionally after exceptional
1734       * completion of either source
1735       */
1736 <    public void testAcceptEither2() {
1737 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1738 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1739 <        IncAction r = new IncAction();
1740 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1741 <        f.completeExceptionally(new CFException());
1742 <        f2.complete(one);
1743 <        checkCompletedWithWrappedCFException(g);
1744 <
1745 <        r = new IncAction();
1746 <        f = new CompletableFuture<Integer>();
1747 <        f2 = new CompletableFuture<Integer>();
1748 <        f2.completeExceptionally(new CFException());
1749 <        g = f.acceptEither(f2, r);
1750 <        checkCompletedWithWrappedCFException(g);
1751 <    }
1752 <
1753 <    /**
1025 <     * acceptEither result completes exceptionally if action does
1026 <     */
1027 <    public void testAcceptEither3() {
1028 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1029 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1030 <        FailingConsumer r = new FailingConsumer();
1031 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1032 <        f2.complete(two);
1033 <        checkCompletedWithWrappedCFException(g);
1034 <    }
1035 <
1036 <    /**
1037 <     * acceptEither result completes exceptionally if either source cancelled
1038 <     */
1039 <    public void testAcceptEither4() {
1040 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1041 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1042 <        IncAction r = new IncAction();
1043 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1044 <        assertTrue(f.cancel(true));
1045 <        checkCompletedWithWrappedCancellationException(g);
1046 <        f = new CompletableFuture<Integer>();
1047 <        f2 = new CompletableFuture<Integer>();
1048 <        assertTrue(f2.cancel(true));
1049 <        checkCompletedWithWrappedCancellationException(g);
1050 <    }
1051 <
1052 <
1053 <    /**
1054 <     * runAfterEither result completes normally after normal completion
1055 <     * of either source
1056 <     */
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);
1736 >    public void testApplyToEither_exceptionalCompletion1() {
1737 >        for (ExecutionMode m : ExecutionMode.values())
1738 >        for (boolean createIncomplete : new boolean[] { true, false })
1739 >        for (boolean fFirst : new boolean[] { true, false })
1740 >        for (Integer v1 : new Integer[] { 1, null })
1741 >    {
1742 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1743 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1744 >        final CFException ex = new CFException();
1745 >        final IncFunction r = new IncFunction(m);
1746 >
1747 >        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1748 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1749 >        if (createIncomplete) {
1750 >            checkIncomplete(h);
1751 >            assertEquals(0, r.invocationCount);
1752 >            (fFirst ? f : g).completeExceptionally(ex);
1753 >        }
1754  
1755 <        r = new Noop();
1756 <        f = new CompletableFuture<Integer>();
1070 <        f.complete(one);
1071 <        f2 = new CompletableFuture<Integer>();
1072 <        g = f.runAfterEither(f2, r);
1073 <        checkCompletedNormally(g, null);
1074 <        assertTrue(r.ran);
1075 <    }
1755 >        checkCompletedWithWrappedCFException(h, ex);
1756 >        (!fFirst ? f : g).complete(v1);
1757  
1758 <    /**
1759 <     * runAfterEither result completes exceptionally after exceptional
1760 <     * completion of either source
1761 <     */
1762 <    public void testRunAfterEither2() {
1763 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1764 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1765 <        Noop r = new Noop();
1766 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1767 <        f.completeExceptionally(new CFException());
1768 <        f2.complete(one);
1769 <        checkCompletedWithWrappedCFException(g);
1758 >        assertEquals(0, r.invocationCount);
1759 >        checkCompletedNormally(!fFirst ? f : g, v1);
1760 >        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1761 >        checkCompletedWithWrappedCFException(h, ex);
1762 >    }}
1763 >
1764 >    public void testApplyToEither_exceptionalCompletion2() {
1765 >        for (ExecutionMode m : ExecutionMode.values())
1766 >        for (boolean reverseArgs : new boolean[] { true, false })
1767 >        for (boolean fFirst : new boolean[] { true, false })
1768 >        for (Integer v1 : new Integer[] { 1, null })
1769 >    {
1770 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1771 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1772 >        final IncFunction r1 = new IncFunction(m);
1773 >        final IncFunction r2 = new IncFunction(m);
1774 >        final CFException ex = new CFException();
1775 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1776 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1777 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1778 >        if (fFirst) {
1779 >            f.complete(v1);
1780 >            g.completeExceptionally(ex);
1781 >        } else {
1782 >            g.completeExceptionally(ex);
1783 >            f.complete(v1);
1784 >        }
1785 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1786  
1787 <        r = new Noop();
1788 <        f = new CompletableFuture<Integer>();
1789 <        f2 = new CompletableFuture<Integer>();
1790 <        f2.completeExceptionally(new CFException());
1791 <        g = f.runAfterEither(f2, r);
1792 <        checkCompletedWithWrappedCFException(g);
1793 <    }
1787 >        // unspecified behavior
1788 >        try {
1789 >            assertEquals(inc(v1), h1.join());
1790 >            assertEquals(1, r1.invocationCount);
1791 >        } catch (CompletionException ok) {
1792 >            checkCompletedWithWrappedCFException(h1, ex);
1793 >            assertEquals(0, r1.invocationCount);
1794 >        }
1795  
1796 <    /**
1797 <     * runAfterEither result completes exceptionally if action does
1798 <     */
1799 <    public void testRunAfterEither3() {
1800 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1801 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1802 <        FailingNoop r = new FailingNoop();
1105 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1106 <        f2.complete(two);
1107 <        checkCompletedWithWrappedCFException(g);
1108 <    }
1796 >        try {
1797 >            assertEquals(inc(v1), h2.join());
1798 >            assertEquals(1, r2.invocationCount);
1799 >        } catch (CompletionException ok) {
1800 >            checkCompletedWithWrappedCFException(h2, ex);
1801 >            assertEquals(0, r2.invocationCount);
1802 >        }
1803  
1804 <    /**
1805 <     * runAfterEither result completes exceptionally if either source cancelled
1806 <     */
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 <    }
1804 >        checkCompletedWithWrappedCFException(g, ex);
1805 >        checkCompletedNormally(f, v1);
1806 >    }}
1807  
1808      /**
1809 <     * thenCompose result completes normally after normal completion of source
1809 >     * applyToEither result completes exceptionally if action does
1810       */
1811 <    public void testThenCompose() {
1812 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1813 <        CompletableFutureInc r = new CompletableFutureInc();
1814 <        CompletableFuture<Integer> g = f.thenCompose(r);
1815 <        f.complete(one);
1816 <        checkCompletedNormally(g, two);
1817 <    }
1811 >    public void testApplyToEither_actionFailed1() {
1812 >        for (ExecutionMode m : ExecutionMode.values())
1813 >        for (Integer v1 : new Integer[] { 1, null })
1814 >        for (Integer v2 : new Integer[] { 2, null })
1815 >    {
1816 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1817 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1818 >        final FailingFunction r = new FailingFunction(m);
1819 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1820  
1821 <    /**
1822 <     * thenCompose result completes exceptionally after exceptional
1823 <     * completion of source
1824 <     */
1825 <    public void testThenCompose2() {
1826 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1827 <        CompletableFutureInc r = new CompletableFutureInc();
1828 <        CompletableFuture<Integer> g = f.thenCompose(r);
1829 <        f.completeExceptionally(new CFException());
1830 <        checkCompletedWithWrappedCFException(g);
1831 <    }
1821 >        f.complete(v1);
1822 >        checkCompletedWithWrappedCFException(h);
1823 >        g.complete(v2);
1824 >        checkCompletedNormally(f, v1);
1825 >        checkCompletedNormally(g, v2);
1826 >    }}
1827 >
1828 >    public void testApplyToEither_actionFailed2() {
1829 >        for (ExecutionMode m : ExecutionMode.values())
1830 >        for (Integer v1 : new Integer[] { 1, null })
1831 >        for (Integer v2 : new Integer[] { 2, null })
1832 >    {
1833 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1834 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1835 >        final FailingFunction r = new FailingFunction(m);
1836 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1837  
1838 <    /**
1839 <     * thenCompose result completes exceptionally if action does
1840 <     */
1841 <    public void testThenCompose3() {
1842 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1843 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
1155 <        CompletableFuture<Integer> g = f.thenCompose(r);
1156 <        f.complete(one);
1157 <        checkCompletedWithWrappedCFException(g);
1158 <    }
1838 >        g.complete(v2);
1839 >        checkCompletedWithWrappedCFException(h);
1840 >        f.complete(v1);
1841 >        checkCompletedNormally(f, v1);
1842 >        checkCompletedNormally(g, v2);
1843 >    }}
1844  
1845      /**
1846 <     * thenCompose result completes exceptionally if source cancelled
1846 >     * applyToEither result completes exceptionally if either source cancelled
1847       */
1848 <    public void testThenCompose4() {
1849 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1850 <        CompletableFutureInc r = new CompletableFutureInc();
1851 <        CompletableFuture<Integer> g = f.thenCompose(r);
1852 <        assertTrue(f.cancel(true));
1853 <        checkCompletedWithWrappedCancellationException(g);
1854 <    }
1855 <
1848 >    public void testApplyToEither_sourceCancelled1() {
1849 >        for (ExecutionMode m : ExecutionMode.values())
1850 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1851 >        for (boolean createIncomplete : new boolean[] { true, false })
1852 >        for (boolean fFirst : new boolean[] { true, false })
1853 >        for (Integer v1 : new Integer[] { 1, null })
1854 >    {
1855 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1856 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1857 >        final IncFunction r = new IncFunction(m);
1858 >
1859 >        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1860 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1861 >        if (createIncomplete) {
1862 >            checkIncomplete(h);
1863 >            assertEquals(0, r.invocationCount);
1864 >            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1865 >        }
1866  
1867 <    // asyncs
1867 >        checkCompletedWithWrappedCancellationException(h);
1868 >        (!fFirst ? f : g).complete(v1);
1869  
1870 <    /**
1871 <     * thenRunAsync result completes normally after normal completion of source
1872 <     */
1873 <    public void testThenRunAsync() {
1874 <        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);
1870 >        assertEquals(0, r.invocationCount);
1871 >        checkCompletedNormally(!fFirst ? f : g, v1);
1872 >        checkCancelled(fFirst ? f : g);
1873 >        checkCompletedWithWrappedCancellationException(h);
1874 >    }}
1875  
1876 <        // reordered version
1877 <        f = new CompletableFuture<Integer>();
1878 <        f.complete(null);
1879 <        r = new Noop();
1880 <        g = f.thenRunAsync(r);
1881 <        checkCompletedNormally(g, null);
1882 <    }
1876 >    public void testApplyToEither_sourceCancelled2() {
1877 >        for (ExecutionMode m : ExecutionMode.values())
1878 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1879 >        for (boolean reverseArgs : new boolean[] { true, false })
1880 >        for (boolean fFirst : new boolean[] { true, false })
1881 >        for (Integer v1 : new Integer[] { 1, null })
1882 >    {
1883 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1884 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1885 >        final IncFunction r1 = new IncFunction(m);
1886 >        final IncFunction r2 = new IncFunction(m);
1887 >        final CFException ex = new CFException();
1888 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1889 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1890 >
1891 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1892 >        if (fFirst) {
1893 >            f.complete(v1);
1894 >            assertTrue(g.cancel(mayInterruptIfRunning));
1895 >        } else {
1896 >            assertTrue(g.cancel(mayInterruptIfRunning));
1897 >            f.complete(v1);
1898 >        }
1899 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1900  
1901 <    /**
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());
1901 >        // unspecified behavior
1902          try {
1903 <            g.join();
1904 <            shouldThrow();
1905 <        } catch (Exception ok) {
1903 >            assertEquals(inc(v1), h1.join());
1904 >            assertEquals(1, r1.invocationCount);
1905 >        } catch (CompletionException ok) {
1906 >            checkCompletedWithWrappedCancellationException(h1);
1907 >            assertEquals(0, r1.invocationCount);
1908          }
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    }
1909  
1910 <    /**
1911 <     * thenApplyAsync result completes exceptionally if action does
1912 <     */
1913 <    public void testThenApplyAsync3() {
1914 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1915 <        FailingFunction r = new FailingFunction();
1916 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1259 <        f.complete(null);
1260 <        checkCompletedWithWrappedCFException(g);
1261 <    }
1910 >        try {
1911 >            assertEquals(inc(v1), h2.join());
1912 >            assertEquals(1, r2.invocationCount);
1913 >        } catch (CompletionException ok) {
1914 >            checkCompletedWithWrappedCancellationException(h2);
1915 >            assertEquals(0, r2.invocationCount);
1916 >        }
1917  
1918 <    /**
1919 <     * thenApplyAsync result completes exceptionally if source cancelled
1920 <     */
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 <    }
1918 >        checkCancelled(g);
1919 >        checkCompletedNormally(f, v1);
1920 >    }}
1921  
1922      /**
1923 <     * thenAcceptAsync result completes normally after normal
1924 <     * completion of source
1923 >     * acceptEither result completes normally after normal completion
1924 >     * of either source
1925       */
1926 <    public void testThenAcceptAsync() {
1927 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1928 <        IncAction r = new IncAction();
1929 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1930 <        f.complete(one);
1931 <        checkCompletedNormally(g, null);
1932 <        assertEquals(r.value, 2);
1933 <    }
1926 >    public void testAcceptEither_normalCompletion1() {
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 IncAction r = new IncAction();
1934 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1935 >
1936 >        f.complete(v1);
1937 >        checkCompletedNormally(h, null);
1938 >        assertEquals(inc(v1), r.value);
1939 >        g.complete(v2);
1940 >
1941 >        checkCompletedNormally(f, v1);
1942 >        checkCompletedNormally(g, v2);
1943 >        checkCompletedNormally(h, null);
1944 >    }}
1945 >
1946 >    public void testAcceptEither_normalCompletion2() {
1947 >        for (ExecutionMode m : ExecutionMode.values())
1948 >        for (Integer v1 : new Integer[] { 1, null })
1949 >        for (Integer v2 : new Integer[] { 2, null })
1950 >    {
1951 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1952 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1953 >        final IncAction r = new IncAction();
1954 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1955 >
1956 >        g.complete(v2);
1957 >        checkCompletedNormally(h, null);
1958 >        assertEquals(inc(v2), r.value);
1959 >        f.complete(v1);
1960 >
1961 >        checkCompletedNormally(f, v1);
1962 >        checkCompletedNormally(g, v2);
1963 >        checkCompletedNormally(h, null);
1964 >    }}
1965 >
1966 >    public void testAcceptEither_normalCompletion3() {
1967 >        for (ExecutionMode m : ExecutionMode.values())
1968 >        for (Integer v1 : new Integer[] { 1, null })
1969 >        for (Integer v2 : new Integer[] { 2, null })
1970 >    {
1971 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1972 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1973 >        final IncAction r = new IncAction();
1974 >
1975 >        f.complete(v1);
1976 >        g.complete(v2);
1977 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1978 >
1979 >        checkCompletedNormally(h, null);
1980 >        checkCompletedNormally(f, v1);
1981 >        checkCompletedNormally(g, v2);
1982 >
1983 >        // unspecified behavior
1984 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
1985 >                   Objects.equals(r.value, inc(v2)));
1986 >    }}
1987  
1988      /**
1989 <     * thenAcceptAsync result completes exceptionally after exceptional
1990 <     * completion of source
1989 >     * acceptEither result completes exceptionally after exceptional
1990 >     * completion of either source
1991       */
1992 <    public void testThenAcceptAsync2() {
1993 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1994 <        IncAction r = new IncAction();
1995 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1996 <        f.completeExceptionally(new CFException());
1997 <        checkCompletedWithWrappedCFException(g);
1998 <    }
1992 >    public void testAcceptEither_exceptionalCompletion1() {
1993 >        for (ExecutionMode m : ExecutionMode.values())
1994 >        for (Integer v1 : new Integer[] { 1, null })
1995 >    {
1996 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1997 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1998 >        final IncAction r = new IncAction();
1999 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2000 >        final CFException ex = new CFException();
2001 >
2002 >        f.completeExceptionally(ex);
2003 >        checkCompletedWithWrappedCFException(h, ex);
2004 >        g.complete(v1);
2005 >
2006 >        assertEquals(0, r.invocationCount);
2007 >        checkCompletedNormally(g, v1);
2008 >        checkCompletedWithWrappedCFException(f, ex);
2009 >        checkCompletedWithWrappedCFException(h, ex);
2010 >    }}
2011 >
2012 >    public void testAcceptEither_exceptionalCompletion2() {
2013 >        for (ExecutionMode m : ExecutionMode.values())
2014 >        for (Integer v1 : new Integer[] { 1, null })
2015 >    {
2016 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2017 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2018 >        final IncAction r = new IncAction();
2019 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2020 >        final CFException ex = new CFException();
2021 >
2022 >        g.completeExceptionally(ex);
2023 >        checkCompletedWithWrappedCFException(h, ex);
2024 >        f.complete(v1);
2025 >
2026 >        assertEquals(0, r.invocationCount);
2027 >        checkCompletedNormally(f, v1);
2028 >        checkCompletedWithWrappedCFException(g, ex);
2029 >        checkCompletedWithWrappedCFException(h, ex);
2030 >    }}
2031 >
2032 >    public void testAcceptEither_exceptionalCompletion3() {
2033 >        for (ExecutionMode m : ExecutionMode.values())
2034 >        for (Integer v1 : new Integer[] { 1, null })
2035 >    {
2036 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2037 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2038 >        final IncAction r = new IncAction();
2039 >        final CFException ex = new CFException();
2040 >
2041 >        g.completeExceptionally(ex);
2042 >        f.complete(v1);
2043 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2044  
2045 <    /**
2046 <     * thenAcceptAsync result completes exceptionally if action does
2047 <     */
2048 <    public void testThenAcceptAsync3() {
2049 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2050 <        FailingConsumer r = new FailingConsumer();
2051 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2052 <        f.complete(null);
2053 <        checkCompletedWithWrappedCFException(g);
2054 <    }
2045 >        // unspecified behavior
2046 >        Integer v;
2047 >        try {
2048 >            assertNull(h.join());
2049 >            assertEquals(1, r.invocationCount);
2050 >            assertEquals(inc(v1), r.value);
2051 >        } catch (CompletionException ok) {
2052 >            checkCompletedWithWrappedCFException(h, ex);
2053 >            assertEquals(0, r.invocationCount);
2054 >        }
2055  
2056 <    /**
2057 <     * thenAcceptAsync result completes exceptionally if source cancelled
2058 <     */
2059 <    public void testThenAcceptAsync4() {
2060 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2061 <        IncAction r = new IncAction();
2062 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2063 <        assertTrue(f.cancel(true));
2064 <        checkCompletedWithWrappedCancellationException(g);
2065 <    }
2056 >        checkCompletedWithWrappedCFException(g, ex);
2057 >        checkCompletedNormally(f, v1);
2058 >    }}
2059 >
2060 >    public void testAcceptEither_exceptionalCompletion4() {
2061 >        for (ExecutionMode m : ExecutionMode.values())
2062 >        for (Integer v1 : new Integer[] { 1, null })
2063 >    {
2064 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2065 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2066 >        final IncAction r = new IncAction();
2067 >        final CFException ex = new CFException();
2068 >
2069 >        f.completeExceptionally(ex);
2070 >        g.complete(v1);
2071 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2072  
2073 <    /**
2074 <     * thenCombineAsync result completes normally after normal
2075 <     * completion of sources
2076 <     */
2077 <    public void testThenCombineAsync() {
2078 <        CompletableFuture<Integer> f, g, h;
2073 >        // unspecified behavior
2074 >        Integer v;
2075 >        try {
2076 >            assertNull(h.join());
2077 >            assertEquals(1, r.invocationCount);
2078 >            assertEquals(inc(v1), r.value);
2079 >        } catch (CompletionException ok) {
2080 >            checkCompletedWithWrappedCFException(h, ex);
2081 >            assertEquals(0, r.invocationCount);
2082 >        }
2083  
2084 <        f = new CompletableFuture<Integer>();
2085 <        g = new CompletableFuture<Integer>();
2086 <        h = f.thenCombineAsync(g, subtract);
1330 <        f.complete(3);
1331 <        checkIncomplete(h);
1332 <        g.complete(1);
1333 <        checkCompletedNormally(h, 2);
1334 <
1335 <        f = new CompletableFuture<Integer>();
1336 <        g = new CompletableFuture<Integer>();
1337 <        h = f.thenCombineAsync(g, subtract);
1338 <        g.complete(1);
1339 <        checkIncomplete(h);
1340 <        f.complete(3);
1341 <        checkCompletedNormally(h, 2);
1342 <
1343 <        f = new CompletableFuture<Integer>();
1344 <        g = new CompletableFuture<Integer>();
1345 <        g.complete(1);
1346 <        f.complete(3);
1347 <        h = f.thenCombineAsync(g, subtract);
1348 <        checkCompletedNormally(h, 2);
1349 <    }
2084 >        checkCompletedWithWrappedCFException(f, ex);
2085 >        checkCompletedNormally(g, v1);
2086 >    }}
2087  
2088      /**
2089 <     * thenCombineAsync result completes exceptionally after exceptional
1353 <     * completion of either source
2089 >     * acceptEither result completes exceptionally if action does
2090       */
2091 <    public void testThenCombineAsync2() {
2092 <        CompletableFuture<Integer> f, g, h;
2091 >    public void testAcceptEither_actionFailed1() {
2092 >        for (ExecutionMode m : ExecutionMode.values())
2093 >        for (Integer v1 : new Integer[] { 1, null })
2094 >        for (Integer v2 : new Integer[] { 2, null })
2095 >    {
2096 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2097 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2098 >        final FailingConsumer r = new FailingConsumer(m);
2099 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2100  
2101 <        f = new CompletableFuture<Integer>();
1359 <        g = new CompletableFuture<Integer>();
1360 <        h = f.thenCombineAsync(g, subtract);
1361 <        f.completeExceptionally(new CFException());
1362 <        checkIncomplete(h);
1363 <        g.complete(1);
2101 >        f.complete(v1);
2102          checkCompletedWithWrappedCFException(h);
2103 +        g.complete(v2);
2104 +        checkCompletedNormally(f, v1);
2105 +        checkCompletedNormally(g, v2);
2106 +    }}
2107 +
2108 +    public void testAcceptEither_actionFailed2() {
2109 +        for (ExecutionMode m : ExecutionMode.values())
2110 +        for (Integer v1 : new Integer[] { 1, null })
2111 +        for (Integer v2 : new Integer[] { 2, null })
2112 +    {
2113 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2114 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2115 +        final FailingConsumer r = new FailingConsumer(m);
2116 +        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2117  
2118 <        f = new CompletableFuture<Integer>();
1367 <        g = new CompletableFuture<Integer>();
1368 <        h = f.thenCombineAsync(g, subtract);
1369 <        g.completeExceptionally(new CFException());
1370 <        checkIncomplete(h);
1371 <        f.complete(3);
2118 >        g.complete(v2);
2119          checkCompletedWithWrappedCFException(h);
2120 <
2121 <        f = new CompletableFuture<Integer>();
2122 <        g = new CompletableFuture<Integer>();
2123 <        g.completeExceptionally(new CFException());
1377 <        f.complete(3);
1378 <        h = f.thenCombineAsync(g, subtract);
1379 <        checkCompletedWithWrappedCFException(h);
1380 <    }
1381 <
1382 <    /**
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 <    }
2120 >        f.complete(v1);
2121 >        checkCompletedNormally(f, v1);
2122 >        checkCompletedNormally(g, v2);
2123 >    }}
2124  
2125      /**
2126 <     * thenCombineAsync result completes exceptionally if either source cancelled
2126 >     * acceptEither result completes exceptionally if either source cancelled
2127       */
2128 <    public void testThenCombineAsync4() {
2129 <        CompletableFuture<Integer> f, g, h;
2128 >    public void testAcceptEither_sourceCancelled1() {
2129 >        for (ExecutionMode m : ExecutionMode.values())
2130 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2131 >        for (Integer v1 : new Integer[] { 1, null })
2132 >    {
2133 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2134 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2135 >        final IncAction r = new IncAction();
2136 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2137  
2138 <        f = new CompletableFuture<Integer>();
1405 <        g = new CompletableFuture<Integer>();
1406 <        h = f.thenCombineAsync(g, subtract);
1407 <        assertTrue(f.cancel(true));
1408 <        checkIncomplete(h);
1409 <        g.complete(1);
2138 >        assertTrue(f.cancel(mayInterruptIfRunning));
2139          checkCompletedWithWrappedCancellationException(h);
2140 +        g.complete(v1);
2141  
2142 <        f = new CompletableFuture<Integer>();
2143 <        g = new CompletableFuture<Integer>();
2144 <        h = f.thenCombineAsync(g, subtract);
1415 <        assertTrue(g.cancel(true));
1416 <        checkIncomplete(h);
1417 <        f.complete(3);
2142 >        checkCancelled(f);
2143 >        assertEquals(0, r.invocationCount);
2144 >        checkCompletedNormally(g, v1);
2145          checkCompletedWithWrappedCancellationException(h);
2146 +    }}
2147  
2148 <        f = new CompletableFuture<Integer>();
2149 <        g = new CompletableFuture<Integer>();
2150 <        g.complete(3);
2151 <        assertTrue(f.cancel(true));
2152 <        h = f.thenCombineAsync(g, subtract);
2153 <        checkCompletedWithWrappedCancellationException(h);
2148 >    public void testAcceptEither_sourceCancelled2() {
2149 >        for (ExecutionMode m : ExecutionMode.values())
2150 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2151 >        for (Integer v1 : new Integer[] { 1, null })
2152 >    {
2153 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2154 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2155 >        final IncAction r = new IncAction();
2156 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2157  
2158 <        f = new CompletableFuture<Integer>();
1428 <        g = new CompletableFuture<Integer>();
1429 <        f.complete(3);
1430 <        assertTrue(g.cancel(true));
1431 <        h = f.thenCombineAsync(g, subtract);
2158 >        assertTrue(g.cancel(mayInterruptIfRunning));
2159          checkCompletedWithWrappedCancellationException(h);
2160 <    }
1434 <
1435 <    /**
1436 <     * thenAcceptBothAsync result completes normally after normal
1437 <     * completion of sources
1438 <     */
1439 <    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 <    }
1545 <
1546 <    /**
1547 <     * runAfterBothAsync result completes exceptionally if action does
1548 <     */
1549 <    public void testRunAfterBothAsync3() {
1550 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1551 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1552 <        FailingNoop r = new FailingNoop();
1553 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1554 <        f.complete(one);
1555 <        checkIncomplete(g);
1556 <        f2.complete(two);
1557 <        checkCompletedWithWrappedCFException(g);
1558 <    }
1559 <
1560 <    /**
1561 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1562 <     */
1563 <    public void testRunAfterBothAsync4() {
1564 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1565 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1566 <        Noop r = new Noop();
1567 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1568 <        assertTrue(f.cancel(true));
1569 <        f2.complete(two);
1570 <        checkCompletedWithWrappedCancellationException(g);
1571 <
1572 <        r = new Noop();
1573 <        f = new CompletableFuture<Integer>();
1574 <        f2 = new CompletableFuture<Integer>();
1575 <        g = f.runAfterBothAsync(f2, r);
1576 <        f.complete(one);
1577 <        assertTrue(f2.cancel(true));
1578 <        checkCompletedWithWrappedCancellationException(g);
1579 <    }
1580 <
1581 <    /**
1582 <     * applyToEitherAsync result completes normally after normal
1583 <     * completion of sources
1584 <     */
1585 <    public void testApplyToEitherAsync() {
1586 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1587 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1588 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1589 <        f.complete(one);
1590 <        checkCompletedNormally(g, two);
1591 <
1592 <        f = new CompletableFuture<Integer>();
1593 <        f.complete(one);
1594 <        f2 = new CompletableFuture<Integer>();
1595 <        g = f.applyToEitherAsync(f2, inc);
1596 <        checkCompletedNormally(g, two);
1597 <    }
1598 <
1599 <    /**
1600 <     * applyToEitherAsync result completes exceptionally after exceptional
1601 <     * completion of source
1602 <     */
1603 <    public void testApplyToEitherAsync2() {
1604 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1605 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1606 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1607 <        f.completeExceptionally(new CFException());
1608 <        checkCompletedWithWrappedCFException(g);
1609 <
1610 <        f = new CompletableFuture<Integer>();
1611 <        f2 = new CompletableFuture<Integer>();
1612 <        f2.completeExceptionally(new CFException());
1613 <        g = f.applyToEitherAsync(f2, inc);
1614 <        f.complete(one);
1615 <        checkCompletedWithWrappedCFException(g);
1616 <    }
1617 <
1618 <    /**
1619 <     * applyToEitherAsync result completes exceptionally if action does
1620 <     */
1621 <    public void testApplyToEitherAsync3() {
1622 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1623 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1624 <        FailingFunction r = new FailingFunction();
1625 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1626 <        f.complete(one);
1627 <        checkCompletedWithWrappedCFException(g);
1628 <    }
1629 <
1630 <    /**
1631 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1632 <     */
1633 <    public void testApplyToEitherAsync4() {
1634 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1635 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1636 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1637 <        assertTrue(f.cancel(true));
1638 <        checkCompletedWithWrappedCancellationException(g);
1639 <
1640 <        f = new CompletableFuture<Integer>();
1641 <        f2 = new CompletableFuture<Integer>();
1642 <        assertTrue(f2.cancel(true));
1643 <        g = f.applyToEitherAsync(f2, inc);
1644 <        checkCompletedWithWrappedCancellationException(g);
1645 <    }
1646 <
1647 <    /**
1648 <     * acceptEitherAsync result completes normally after normal
1649 <     * completion of sources
1650 <     */
1651 <    public void testAcceptEitherAsync() {
1652 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1653 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1654 <        IncAction r = new IncAction();
1655 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1656 <        f.complete(one);
1657 <        checkCompletedNormally(g, null);
1658 <        assertEquals(r.value, 2);
1659 <
1660 <        r = new IncAction();
1661 <        f = new CompletableFuture<Integer>();
1662 <        f.complete(one);
1663 <        f2 = new CompletableFuture<Integer>();
1664 <        g = f.acceptEitherAsync(f2, r);
1665 <        checkCompletedNormally(g, null);
1666 <        assertEquals(r.value, 2);
1667 <    }
1668 <
1669 <    /**
1670 <     * acceptEitherAsync result completes exceptionally after exceptional
1671 <     * completion of source
1672 <     */
1673 <    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);
1680 <
1681 <        r = new IncAction();
1682 <        f = new CompletableFuture<Integer>();
1683 <        f2 = new CompletableFuture<Integer>();
1684 <        f2.completeExceptionally(new CFException());
1685 <        g = f.acceptEitherAsync(f2, r);
1686 <        f.complete(one);
1687 <        checkCompletedWithWrappedCFException(g);
1688 <    }
1689 <
1690 <    /**
1691 <     * acceptEitherAsync result completes exceptionally if action does
1692 <     */
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 <    }
1701 <
1702 <    /**
1703 <     * acceptEitherAsync result completes exceptionally if either
1704 <     * source cancelled
1705 <     */
1706 <    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);
2160 >        f.complete(v1);
2161  
2162 <        r = new IncAction();
2163 <        f = new CompletableFuture<Integer>();
2164 <        f2 = new CompletableFuture<Integer>();
2165 <        assertTrue(f2.cancel(true));
2166 <        g = f.acceptEitherAsync(f2, r);
1719 <        checkCompletedWithWrappedCancellationException(g);
1720 <    }
1721 <
1722 <    /**
1723 <     * runAfterEitherAsync result completes normally after normal
1724 <     * completion of sources
1725 <     */
1726 <    public void testRunAfterEitherAsync() {
1727 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1728 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1729 <        Noop r = new Noop();
1730 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1731 <        f.complete(one);
1732 <        checkCompletedNormally(g, null);
1733 <        assertTrue(r.ran);
1734 <
1735 <        r = new Noop();
1736 <        f = new CompletableFuture<Integer>();
1737 <        f.complete(one);
1738 <        f2 = new CompletableFuture<Integer>();
1739 <        g = f.runAfterEitherAsync(f2, r);
1740 <        checkCompletedNormally(g, null);
1741 <        assertTrue(r.ran);
1742 <    }
1743 <
1744 <    /**
1745 <     * runAfterEitherAsync result completes exceptionally after exceptional
1746 <     * completion of source
1747 <     */
1748 <    public void testRunAfterEitherAsync2() {
1749 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1750 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1751 <        Noop r = new Noop();
1752 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1753 <        f.completeExceptionally(new CFException());
1754 <        checkCompletedWithWrappedCFException(g);
1755 <
1756 <        r = new Noop();
1757 <        f = new CompletableFuture<Integer>();
1758 <        f2 = new CompletableFuture<Integer>();
1759 <        f2.completeExceptionally(new CFException());
1760 <        g = f.runAfterEitherAsync(f2, r);
1761 <        f.complete(one);
1762 <        checkCompletedWithWrappedCFException(g);
1763 <    }
1764 <
1765 <    /**
1766 <     * runAfterEitherAsync result completes exceptionally if action does
1767 <     */
1768 <    public void testRunAfterEitherAsync3() {
1769 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1770 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1771 <        FailingNoop r = new FailingNoop();
1772 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1773 <        f.complete(one);
1774 <        checkCompletedWithWrappedCFException(g);
1775 <    }
1776 <
1777 <    /**
1778 <     * runAfterEitherAsync result completes exceptionally if either
1779 <     * source cancelled
1780 <     */
1781 <    public void testRunAfterEitherAsync4() {
1782 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1783 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1784 <        Noop r = new Noop();
1785 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1786 <        assertTrue(f.cancel(true));
1787 <        checkCompletedWithWrappedCancellationException(g);
1788 <
1789 <        r = new Noop();
1790 <        f = new CompletableFuture<Integer>();
1791 <        f2 = new CompletableFuture<Integer>();
1792 <        assertTrue(f2.cancel(true));
1793 <        g = f.runAfterEitherAsync(f2, r);
1794 <        checkCompletedWithWrappedCancellationException(g);
1795 <    }
1796 <
1797 <    /**
1798 <     * thenComposeAsync result completes normally after normal
1799 <     * completion of source
1800 <     */
1801 <    public void testThenComposeAsync() {
1802 <        CompletableFuture<Integer> f, g;
1803 <        CompletableFutureInc r;
1804 <
1805 <        f = new CompletableFuture<Integer>();
1806 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1807 <        f.complete(one);
1808 <        checkCompletedNormally(g, two);
1809 <
1810 <        f = new CompletableFuture<Integer>();
1811 <        f.complete(one);
1812 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1813 <        checkCompletedNormally(g, two);
1814 <    }
1815 <
1816 <    /**
1817 <     * thenComposeAsync result completes exceptionally after
1818 <     * exceptional completion of source
1819 <     */
1820 <    public void testThenComposeAsync2() {
1821 <        CompletableFuture<Integer> f, g;
1822 <        CompletableFutureInc r;
1823 <
1824 <        f = new CompletableFuture<Integer>();
1825 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1826 <        f.completeExceptionally(new CFException());
1827 <        checkCompletedWithWrappedCFException(g);
1828 <        assertFalse(r.ran);
1829 <
1830 <        f = new CompletableFuture<Integer>();
1831 <        f.completeExceptionally(new CFException());
1832 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1833 <        checkCompletedWithWrappedCFException(g);
1834 <        assertFalse(r.ran);
1835 <    }
1836 <
1837 <    /**
1838 <     * thenComposeAsync result completes exceptionally if action does
1839 <     */
1840 <    public void testThenComposeAsync3() {
1841 <        CompletableFuture<Integer> f, g;
1842 <        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 <    }
1854 <
1855 <    /**
1856 <     * thenComposeAsync result completes exceptionally if source cancelled
1857 <     */
1858 <    public void testThenComposeAsync4() {
1859 <        CompletableFuture<Integer> f, g;
1860 <        CompletableFutureInc r;
1861 <
1862 <        f = new CompletableFuture<Integer>();
1863 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1864 <        assertTrue(f.cancel(true));
1865 <        checkCompletedWithWrappedCancellationException(g);
1866 <
1867 <        f = new CompletableFuture<Integer>();
1868 <        assertTrue(f.cancel(true));
1869 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1870 <        checkCompletedWithWrappedCancellationException(g);
1871 <    }
1872 <
1873 <
1874 <    // async with explicit executors
1875 <
1876 <    /**
1877 <     * thenRunAsync result completes normally after normal completion of source
1878 <     */
1879 <    public void testThenRunAsyncE() {
1880 <        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);
2162 >        checkCancelled(g);
2163 >        assertEquals(0, r.invocationCount);
2164 >        checkCompletedNormally(f, v1);
2165 >        checkCompletedWithWrappedCancellationException(h);
2166 >    }}
2167  
2168 <        // reordered version
2169 <        f = new CompletableFuture<Integer>();
2170 <        f.complete(null);
2171 <        r = new Noop();
2172 <        g = f.thenRunAsync(r, new ThreadExecutor());
2173 <        checkCompletedNormally(g, null);
2174 <    }
2168 >    public void testAcceptEither_sourceCancelled3() {
2169 >        for (ExecutionMode m : ExecutionMode.values())
2170 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2171 >        for (Integer v1 : new Integer[] { 1, null })
2172 >    {
2173 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2174 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2175 >        final IncAction r = new IncAction();
2176 >
2177 >        assertTrue(g.cancel(mayInterruptIfRunning));
2178 >        f.complete(v1);
2179 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2180  
2181 <    /**
2182 <     * 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());
2181 >        // unspecified behavior
2182 >        Integer v;
2183          try {
2184 <            g.join();
2185 <            shouldThrow();
2186 <        } catch (Exception ok) {
2184 >            assertNull(h.join());
2185 >            assertEquals(1, r.invocationCount);
2186 >            assertEquals(inc(v1), r.value);
2187 >        } catch (CompletionException ok) {
2188 >            checkCompletedWithWrappedCancellationException(h);
2189 >            assertEquals(0, r.invocationCount);
2190          }
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    }
2191  
2192 <    /**
2193 <     * thenApplyAsync result completes normally after normal completion of source
2194 <     */
2195 <    public void testThenApplyAsyncE() {
2196 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2197 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2198 <        f.complete(one);
2199 <        checkCompletedNormally(g, two);
2200 <    }
2192 >        checkCancelled(g);
2193 >        checkCompletedNormally(f, v1);
2194 >    }}
2195 >
2196 >    public void testAcceptEither_sourceCancelled4() {
2197 >        for (ExecutionMode m : ExecutionMode.values())
2198 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2199 >        for (Integer v1 : new Integer[] { 1, null })
2200 >    {
2201 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2202 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2203 >        final IncAction r = new IncAction();
2204 >
2205 >        assertTrue(f.cancel(mayInterruptIfRunning));
2206 >        g.complete(v1);
2207 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2208  
2209 <    /**
2210 <     * thenApplyAsync result completes exceptionally after exceptional
2211 <     * completion of source
2212 <     */
2213 <    public void testThenApplyAsync2E() {
2214 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2215 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2216 <        f.completeExceptionally(new CFException());
2217 <        checkCompletedWithWrappedCFException(g);
2218 <    }
2209 >        // unspecified behavior
2210 >        Integer v;
2211 >        try {
2212 >            assertNull(h.join());
2213 >            assertEquals(1, r.invocationCount);
2214 >            assertEquals(inc(v1), r.value);
2215 >        } catch (CompletionException ok) {
2216 >            checkCompletedWithWrappedCancellationException(h);
2217 >            assertEquals(0, r.invocationCount);
2218 >        }
2219  
2220 <    /**
2221 <     * thenApplyAsync result completes exceptionally if action does
2222 <     */
1957 <    public void testThenApplyAsync3E() {
1958 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1959 <        FailingFunction r = new FailingFunction();
1960 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
1961 <        f.complete(null);
1962 <        checkCompletedWithWrappedCFException(g);
1963 <    }
2220 >        checkCancelled(f);
2221 >        checkCompletedNormally(g, v1);
2222 >    }}
2223  
2224      /**
2225 <     * thenApplyAsync result completes exceptionally if source cancelled
2225 >     * runAfterEither result completes normally after normal completion
2226 >     * of either source
2227       */
2228 <    public void testThenApplyAsync4E() {
2229 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2230 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2231 <        assertTrue(f.cancel(true));
2232 <        checkCompletedWithWrappedCancellationException(g);
2233 <    }
2228 >    public void testRunAfterEither_normalCompletion1() {
2229 >        for (ExecutionMode m : ExecutionMode.values())
2230 >        for (Integer v1 : new Integer[] { 1, null })
2231 >        for (Integer v2 : new Integer[] { 2, null })
2232 >    {
2233 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2234 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2235 >        final Noop r = new Noop(m);
2236 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2237 >
2238 >        f.complete(v1);
2239 >        checkCompletedNormally(h, null);
2240 >        assertEquals(1, r.invocationCount);
2241 >        g.complete(v2);
2242 >
2243 >        checkCompletedNormally(f, v1);
2244 >        checkCompletedNormally(g, v2);
2245 >        checkCompletedNormally(h, null);
2246 >        assertEquals(1, r.invocationCount);
2247 >    }}
2248 >
2249 >    public void testRunAfterEither_normalCompletion2() {
2250 >        for (ExecutionMode m : ExecutionMode.values())
2251 >        for (Integer v1 : new Integer[] { 1, null })
2252 >        for (Integer v2 : new Integer[] { 2, null })
2253 >    {
2254 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2255 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2256 >        final Noop r = new Noop(m);
2257 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2258 >
2259 >        g.complete(v2);
2260 >        checkCompletedNormally(h, null);
2261 >        assertEquals(1, r.invocationCount);
2262 >        f.complete(v1);
2263 >
2264 >        checkCompletedNormally(f, v1);
2265 >        checkCompletedNormally(g, v2);
2266 >        checkCompletedNormally(h, null);
2267 >        assertEquals(1, r.invocationCount);
2268 >        }}
2269 >
2270 >    public void testRunAfterEither_normalCompletion3() {
2271 >        for (ExecutionMode m : ExecutionMode.values())
2272 >        for (Integer v1 : new Integer[] { 1, null })
2273 >        for (Integer v2 : new Integer[] { 2, null })
2274 >    {
2275 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2276 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2277 >        final Noop r = new Noop(m);
2278 >
2279 >        f.complete(v1);
2280 >        g.complete(v2);
2281 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2282 >
2283 >        checkCompletedNormally(h, null);
2284 >        checkCompletedNormally(f, v1);
2285 >        checkCompletedNormally(g, v2);
2286 >        assertEquals(1, r.invocationCount);
2287 >    }}
2288  
2289      /**
2290 <     * thenAcceptAsync result completes normally after normal
2291 <     * completion of source
2290 >     * runAfterEither result completes exceptionally after exceptional
2291 >     * completion of either source
2292       */
2293 <    public void testThenAcceptAsyncE() {
2294 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2295 <        IncAction r = new IncAction();
2296 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2297 <        f.complete(one);
2298 <        checkCompletedNormally(g, null);
2299 <        assertEquals(r.value, 2);
2300 <    }
2293 >    public void testRunAfterEither_exceptionalCompletion1() {
2294 >        for (ExecutionMode m : ExecutionMode.values())
2295 >        for (Integer v1 : new Integer[] { 1, null })
2296 >    {
2297 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2298 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2299 >        final Noop r = new Noop(m);
2300 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2301 >        final CFException ex = new CFException();
2302 >
2303 >        f.completeExceptionally(ex);
2304 >        checkCompletedWithWrappedCFException(h, ex);
2305 >        g.complete(v1);
2306 >
2307 >        assertEquals(0, r.invocationCount);
2308 >        checkCompletedNormally(g, v1);
2309 >        checkCompletedWithWrappedCFException(f, ex);
2310 >        checkCompletedWithWrappedCFException(h, ex);
2311 >    }}
2312 >
2313 >    public void testRunAfterEither_exceptionalCompletion2() {
2314 >        for (ExecutionMode m : ExecutionMode.values())
2315 >        for (Integer v1 : new Integer[] { 1, null })
2316 >    {
2317 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2318 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2319 >        final Noop r = new Noop(m);
2320 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2321 >        final CFException ex = new CFException();
2322 >
2323 >        g.completeExceptionally(ex);
2324 >        checkCompletedWithWrappedCFException(h, ex);
2325 >        f.complete(v1);
2326 >
2327 >        assertEquals(0, r.invocationCount);
2328 >        checkCompletedNormally(f, v1);
2329 >        checkCompletedWithWrappedCFException(g, ex);
2330 >        checkCompletedWithWrappedCFException(h, ex);
2331 >    }}
2332 >
2333 >    public void testRunAfterEither_exceptionalCompletion3() {
2334 >        for (ExecutionMode m : ExecutionMode.values())
2335 >        for (Integer v1 : new Integer[] { 1, null })
2336 >    {
2337 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2338 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2339 >        final Noop r = new Noop(m);
2340 >        final CFException ex = new CFException();
2341 >
2342 >        g.completeExceptionally(ex);
2343 >        f.complete(v1);
2344 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2345  
2346 <    /**
2347 <     * thenAcceptAsync result completes exceptionally after exceptional
2348 <     * completion of source
2349 <     */
2350 <    public void testThenAcceptAsync2E() {
2351 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2352 <        IncAction r = new IncAction();
2353 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2354 <        f.completeExceptionally(new CFException());
1997 <        checkCompletedWithWrappedCFException(g);
1998 <    }
2346 >        // unspecified behavior
2347 >        Integer v;
2348 >        try {
2349 >            assertNull(h.join());
2350 >            assertEquals(1, r.invocationCount);
2351 >        } catch (CompletionException ok) {
2352 >            checkCompletedWithWrappedCFException(h, ex);
2353 >            assertEquals(0, r.invocationCount);
2354 >        }
2355  
2356 <    /**
2357 <     * thenAcceptAsync result completes exceptionally if action does
2358 <     */
2359 <    public void testThenAcceptAsync3E() {
2360 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2361 <        FailingConsumer r = new FailingConsumer();
2362 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2363 <        f.complete(null);
2364 <        checkCompletedWithWrappedCFException(g);
2365 <    }
2356 >        checkCompletedWithWrappedCFException(g, ex);
2357 >        checkCompletedNormally(f, v1);
2358 >    }}
2359 >
2360 >    public void testRunAfterEither_exceptionalCompletion4() {
2361 >        for (ExecutionMode m : ExecutionMode.values())
2362 >        for (Integer v1 : new Integer[] { 1, null })
2363 >    {
2364 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2365 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2366 >        final Noop r = new Noop(m);
2367 >        final CFException ex = new CFException();
2368 >
2369 >        f.completeExceptionally(ex);
2370 >        g.complete(v1);
2371 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2372  
2373 <    /**
2374 <     * thenAcceptAsync result completes exceptionally if source cancelled
2375 <     */
2376 <    public void testThenAcceptAsync4E() {
2377 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2378 <        IncAction r = new IncAction();
2379 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2380 <        assertTrue(f.cancel(true));
2381 <        checkCompletedWithWrappedCancellationException(g);
2020 <    }
2373 >        // unspecified behavior
2374 >        Integer v;
2375 >        try {
2376 >            assertNull(h.join());
2377 >            assertEquals(1, r.invocationCount);
2378 >        } catch (CompletionException ok) {
2379 >            checkCompletedWithWrappedCFException(h, ex);
2380 >            assertEquals(0, r.invocationCount);
2381 >        }
2382  
2383 <    /**
2384 <     * thenCombineAsync result completes normally after normal
2385 <     * completion of sources
2025 <     */
2026 <    public void testThenCombineAsyncE() {
2027 <        CompletableFuture<Integer> f, g, h;
2028 <        ThreadExecutor e = new ThreadExecutor();
2029 <        int count = 0;
2030 <
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());
2048 <
2049 <        f = new CompletableFuture<Integer>();
2050 <        g = new CompletableFuture<Integer>();
2051 <        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 <    }
2383 >        checkCompletedWithWrappedCFException(f, ex);
2384 >        checkCompletedNormally(g, v1);
2385 >    }}
2386  
2387      /**
2388 <     * thenCombineAsync result completes exceptionally after exceptional
2060 <     * completion of either source
2388 >     * runAfterEither result completes exceptionally if action does
2389       */
2390 <    public void testThenCombineAsync2E() {
2391 <        CompletableFuture<Integer> f, g, h;
2392 <        ThreadExecutor e = new ThreadExecutor();
2393 <        int count = 0;
2394 <
2395 <        f = new CompletableFuture<Integer>();
2396 <        g = new CompletableFuture<Integer>();
2397 <        h = f.thenCombineAsync(g, subtract, e);
2398 <        f.completeExceptionally(new CFException());
2071 <        checkIncomplete(h);
2072 <        g.complete(1);
2073 <        checkCompletedWithWrappedCFException(h);
2390 >    public void testRunAfterEither_actionFailed1() {
2391 >        for (ExecutionMode m : ExecutionMode.values())
2392 >        for (Integer v1 : new Integer[] { 1, null })
2393 >        for (Integer v2 : new Integer[] { 2, null })
2394 >    {
2395 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2396 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2397 >        final FailingRunnable r = new FailingRunnable(m);
2398 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2399  
2400 <        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);
2400 >        f.complete(v1);
2401          checkCompletedWithWrappedCFException(h);
2402 +        g.complete(v2);
2403 +        checkCompletedNormally(f, v1);
2404 +        checkCompletedNormally(g, v2);
2405 +    }}
2406 +
2407 +    public void testRunAfterEither_actionFailed2() {
2408 +        for (ExecutionMode m : ExecutionMode.values())
2409 +        for (Integer v1 : new Integer[] { 1, null })
2410 +        for (Integer v2 : new Integer[] { 2, null })
2411 +    {
2412 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2413 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2414 +        final FailingRunnable r = new FailingRunnable(m);
2415 +        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2416  
2417 <        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);
2417 >        g.complete(v2);
2418          checkCompletedWithWrappedCFException(h);
2419 <
2420 <        assertEquals(0, e.count.get());
2421 <    }
2422 <
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 <    }
2419 >        f.complete(v1);
2420 >        checkCompletedNormally(f, v1);
2421 >        checkCompletedNormally(g, v2);
2422 >    }}
2423  
2424      /**
2425 <     * thenCombineAsync result completes exceptionally if either source cancelled
2425 >     * runAfterEither result completes exceptionally if either source cancelled
2426       */
2427 <    public void testThenCombineAsync4E() {
2428 <        CompletableFuture<Integer> f, g, h;
2429 <        ThreadExecutor e = new ThreadExecutor();
2427 >    public void testRunAfterEither_sourceCancelled1() {
2428 >        for (ExecutionMode m : ExecutionMode.values())
2429 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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(m);
2435 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2436  
2437 <        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);
2437 >        assertTrue(f.cancel(mayInterruptIfRunning));
2438          checkCompletedWithWrappedCancellationException(h);
2439 +        g.complete(v1);
2440  
2441 <        f = new CompletableFuture<Integer>();
2442 <        g = new CompletableFuture<Integer>();
2443 <        h = f.thenCombineAsync(g, subtract, e);
2128 <        assertTrue(g.cancel(true));
2129 <        checkIncomplete(h);
2130 <        f.complete(3);
2441 >        checkCancelled(f);
2442 >        assertEquals(0, r.invocationCount);
2443 >        checkCompletedNormally(g, v1);
2444          checkCompletedWithWrappedCancellationException(h);
2445 +    }}
2446  
2447 <        f = new CompletableFuture<Integer>();
2448 <        g = new CompletableFuture<Integer>();
2449 <        assertTrue(g.cancel(true));
2450 <        h = f.thenCombineAsync(g, subtract, e);
2451 <        checkIncomplete(h);
2452 <        f.complete(3);
2453 <        checkCompletedWithWrappedCancellationException(h);
2447 >    public void testRunAfterEither_sourceCancelled2() {
2448 >        for (ExecutionMode m : ExecutionMode.values())
2449 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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(m);
2455 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456  
2457 <        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);
2457 >        assertTrue(g.cancel(mayInterruptIfRunning));
2458          checkCompletedWithWrappedCancellationException(h);
2459 +        f.complete(v1);
2460  
2461 <        assertEquals(0, e.count.get());
2462 <    }
2463 <
2464 <    /**
2465 <     * 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 <    }
2461 >        checkCancelled(g);
2462 >        assertEquals(0, r.invocationCount);
2463 >        checkCompletedNormally(f, v1);
2464 >        checkCompletedWithWrappedCancellationException(h);
2465 >    }}
2466  
2467 <    /**
2468 <     * acceptEitherAsync result completes exceptionally after exceptional
2469 <     * completion of source
2470 <     */
2471 <    public void testAcceptEitherAsync2E() {
2472 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2473 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2474 <        IncAction r = new IncAction();
2475 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2476 <        f.completeExceptionally(new CFException());
2477 <        checkCompletedWithWrappedCFException(g);
2467 >    public void testRunAfterEither_sourceCancelled3() {
2468 >        for (ExecutionMode m : ExecutionMode.values())
2469 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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(m);
2475 >
2476 >        assertTrue(g.cancel(mayInterruptIfRunning));
2477 >        f.complete(v1);
2478 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2479  
2480 <        r = new IncAction();
2481 <        f = new CompletableFuture<Integer>();
2482 <        f2 = new CompletableFuture<Integer>();
2483 <        f2.completeExceptionally(new CFException());
2484 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2485 <        f.complete(one);
2486 <        checkCompletedWithWrappedCFException(g);
2487 <    }
2480 >        // unspecified behavior
2481 >        Integer v;
2482 >        try {
2483 >            assertNull(h.join());
2484 >            assertEquals(1, r.invocationCount);
2485 >        } catch (CompletionException ok) {
2486 >            checkCompletedWithWrappedCancellationException(h);
2487 >            assertEquals(0, r.invocationCount);
2488 >        }
2489  
2490 <    /**
2491 <     * acceptEitherAsync result completes exceptionally if action does
2492 <     */
2493 <    public void testAcceptEitherAsync3E() {
2494 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2495 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2496 <        FailingConsumer r = new FailingConsumer();
2497 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2498 <        f.complete(one);
2499 <        checkCompletedWithWrappedCFException(g);
2500 <    }
2490 >        checkCancelled(g);
2491 >        checkCompletedNormally(f, v1);
2492 >    }}
2493 >
2494 >    public void testRunAfterEither_sourceCancelled4() {
2495 >        for (ExecutionMode m : ExecutionMode.values())
2496 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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(m);
2502 >
2503 >        assertTrue(f.cancel(mayInterruptIfRunning));
2504 >        g.complete(v1);
2505 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2506  
2507 <    /**
2508 <     * acceptEitherAsync result completes exceptionally if either
2509 <     * source cancelled
2510 <     */
2511 <    public void testAcceptEitherAsync4E() {
2512 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2513 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2514 <        IncAction r = new IncAction();
2515 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2427 <        assertTrue(f.cancel(true));
2428 <        checkCompletedWithWrappedCancellationException(g);
2507 >        // unspecified behavior
2508 >        Integer v;
2509 >        try {
2510 >            assertNull(h.join());
2511 >            assertEquals(1, r.invocationCount);
2512 >        } catch (CompletionException ok) {
2513 >            checkCompletedWithWrappedCancellationException(h);
2514 >            assertEquals(0, r.invocationCount);
2515 >        }
2516  
2517 <        r = new IncAction();
2518 <        f = new CompletableFuture<Integer>();
2519 <        f2 = new CompletableFuture<Integer>();
2433 <        assertTrue(f2.cancel(true));
2434 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2435 <        checkCompletedWithWrappedCancellationException(g);
2436 <    }
2517 >        checkCancelled(f);
2518 >        checkCompletedNormally(g, v1);
2519 >    }}
2520  
2521      /**
2522 <     * runAfterEitherAsync result completes normally after normal
2440 <     * completion of sources
2522 >     * thenCompose result completes normally after normal completion of source
2523       */
2524 <    public void testRunAfterEitherAsyncE() {
2525 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2526 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2527 <        Noop r = new Noop();
2528 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2529 <        f.complete(one);
2530 <        checkCompletedNormally(g, null);
2531 <        assertTrue(r.ran);
2532 <
2533 <        r = new Noop();
2534 <        f = new CompletableFuture<Integer>();
2535 <        f.complete(one);
2536 <        f2 = new CompletableFuture<Integer>();
2537 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2538 <        checkCompletedNormally(g, null);
2457 <        assertTrue(r.ran);
2458 <    }
2524 >    public void testThenCompose_normalCompletion() {
2525 >        for (ExecutionMode m : ExecutionMode.values())
2526 >        for (boolean createIncomplete : new boolean[] { true, false })
2527 >        for (Integer v1 : new Integer[] { 1, null })
2528 >    {
2529 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2530 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2531 >        if (!createIncomplete) f.complete(v1);
2532 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2533 >        if (createIncomplete) f.complete(v1);
2534 >
2535 >        checkCompletedNormally(g, inc(v1));
2536 >        checkCompletedNormally(f, v1);
2537 >        assertEquals(1, r.invocationCount);
2538 >    }}
2539  
2540      /**
2541 <     * runAfterEitherAsync result completes exceptionally after exceptional
2541 >     * thenCompose result completes exceptionally after exceptional
2542       * completion of source
2543       */
2544 <    public void testRunAfterEitherAsync2E() {
2545 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2546 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2547 <        Noop r = new Noop();
2548 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2549 <        f.completeExceptionally(new CFException());
2550 <        checkCompletedWithWrappedCFException(g);
2551 <
2552 <        r = new Noop();
2553 <        f = new CompletableFuture<Integer>();
2554 <        f2 = new CompletableFuture<Integer>();
2555 <        f2.completeExceptionally(new CFException());
2556 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2557 <        f.complete(one);
2558 <        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 <    }
2544 >    public void testThenCompose_exceptionalCompletion() {
2545 >        for (ExecutionMode m : ExecutionMode.values())
2546 >        for (boolean createIncomplete : new boolean[] { true, false })
2547 >    {
2548 >        final CFException ex = new CFException();
2549 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2550 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2551 >        if (!createIncomplete) f.completeExceptionally(ex);
2552 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2553 >        if (createIncomplete) f.completeExceptionally(ex);
2554 >
2555 >        checkCompletedWithWrappedCFException(g, ex);
2556 >        checkCompletedWithWrappedCFException(f, ex);
2557 >        assertEquals(0, r.invocationCount);
2558 >    }}
2559  
2560      /**
2561 <     * 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 <    }
2512 <
2513 <    /**
2514 <     * thenComposeAsync result completes normally after normal
2515 <     * completion of source
2561 >     * thenCompose result completes exceptionally if action does
2562       */
2563 <    public void testThenComposeAsyncE() {
2564 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2565 <        CompletableFutureInc r = new CompletableFutureInc();
2566 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2567 <        f.complete(one);
2568 <        checkCompletedNormally(g, two);
2569 <    }
2563 >    public void testThenCompose_actionFailed() {
2564 >        for (ExecutionMode m : ExecutionMode.values())
2565 >        for (boolean createIncomplete : new boolean[] { true, false })
2566 >        for (Integer v1 : new Integer[] { 1, null })
2567 >    {
2568 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2569 >        final FailingCompletableFutureFunction r
2570 >            = new FailingCompletableFutureFunction(m);
2571 >        if (!createIncomplete) f.complete(v1);
2572 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2573 >        if (createIncomplete) f.complete(v1);
2574  
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());
2575          checkCompletedWithWrappedCFException(g);
2576 <    }
2576 >        checkCompletedNormally(f, v1);
2577 >    }}
2578  
2579      /**
2580 <     * thenComposeAsync result completes exceptionally if action does
2580 >     * thenCompose result completes exceptionally if source cancelled
2581       */
2582 <    public void testThenComposeAsync3E() {
2583 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2584 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2585 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2586 <        f.complete(one);
2587 <        checkCompletedWithWrappedCFException(g);
2588 <    }
2582 >    public void testThenCompose_sourceCancelled() {
2583 >        for (ExecutionMode m : ExecutionMode.values())
2584 >        for (boolean createIncomplete : new boolean[] { true, false })
2585 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2586 >    {
2587 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2588 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2589 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2590 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2591 >        if (createIncomplete) {
2592 >            checkIncomplete(g);
2593 >            assertTrue(f.cancel(mayInterruptIfRunning));
2594 >        }
2595  
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));
2596          checkCompletedWithWrappedCancellationException(g);
2597 <    }
2597 >        checkCancelled(f);
2598 >    }}
2599  
2600      // other static methods
2601  
# Line 2563 | Line 2604 | public class CompletableFutureTest exten
2604       * with the value null
2605       */
2606      public void testAllOf_empty() throws Exception {
2607 <        CompletableFuture<?> f = CompletableFuture.allOf();
2607 >        CompletableFuture<Void> f = CompletableFuture.allOf();
2608          checkCompletedNormally(f, null);
2609      }
2610  
2611      /**
2612 <     * allOf returns a future completed when all components complete
2612 >     * allOf returns a future completed normally with the value null
2613 >     * when all components complete normally
2614       */
2615 <    public void testAllOf() throws Exception {
2615 >    public void testAllOf_normal() throws Exception {
2616          for (int k = 1; k < 20; ++k) {
2617 <            CompletableFuture[] fs = new CompletableFuture[k];
2617 >            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2618              for (int i = 0; i < k; ++i)
2619 <                fs[i] = new CompletableFuture<Integer>();
2619 >                fs[i] = new CompletableFuture<>();
2620              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2621              for (int i = 0; i < k; ++i) {
2622                  checkIncomplete(f);
2623 +                checkIncomplete(CompletableFuture.allOf(fs));
2624                  fs[i].complete(one);
2625              }
2626              checkCompletedNormally(f, null);
2627 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2628          }
2629      }
2630  
# Line 2588 | Line 2632 | public class CompletableFutureTest exten
2632       * anyOf(no component futures) returns an incomplete future
2633       */
2634      public void testAnyOf_empty() throws Exception {
2635 <        CompletableFuture<?> f = CompletableFuture.anyOf();
2635 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
2636          checkIncomplete(f);
2637      }
2638  
2639      /**
2640 <     * anyOf returns a future completed when any components complete
2640 >     * anyOf returns a future completed normally with a value when
2641 >     * a component future does
2642       */
2643 <    public void testAnyOf() throws Exception {
2644 <        for (int k = 1; k < 20; ++k) {
2643 >    public void testAnyOf_normal() throws Exception {
2644 >        for (int k = 0; k < 10; ++k) {
2645              CompletableFuture[] fs = new CompletableFuture[k];
2646              for (int i = 0; i < k; ++i)
2647 <                fs[i] = new CompletableFuture<Integer>();
2647 >                fs[i] = new CompletableFuture<>();
2648              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2649              checkIncomplete(f);
2650              for (int i = 0; i < k; ++i) {
2651                  fs[i].complete(one);
2652                  checkCompletedNormally(f, one);
2653 +                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
2654 +            }
2655 +        }
2656 +    }
2657 +
2658 +    /**
2659 +     * anyOf result completes exceptionally when any component does.
2660 +     */
2661 +    public void testAnyOf_exceptional() throws Exception {
2662 +        for (int k = 0; k < 10; ++k) {
2663 +            CompletableFuture[] fs = new CompletableFuture[k];
2664 +            for (int i = 0; i < k; ++i)
2665 +                fs[i] = new CompletableFuture<>();
2666 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2667 +            checkIncomplete(f);
2668 +            for (int i = 0; i < k; ++i) {
2669 +                fs[i].completeExceptionally(new CFException());
2670 +                checkCompletedWithWrappedCFException(f);
2671 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
2672              }
2673          }
2674      }
# Line 2613 | Line 2677 | public class CompletableFutureTest exten
2677       * Completion methods throw NullPointerException with null arguments
2678       */
2679      public void testNPE() {
2680 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2681 <        CompletableFuture<Integer> g = new CompletableFuture<Integer>();
2680 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2681 >        CompletableFuture<Integer> g = new CompletableFuture<>();
2682          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2683          CompletableFuture<?> h;
2684          ThreadExecutor exec = new ThreadExecutor();
2685  
2686          Runnable[] throwingActions = {
2687 <            () -> { CompletableFuture.supplyAsync(null); },
2688 <            () -> { CompletableFuture.supplyAsync(null, exec); },
2689 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
2690 <
2691 <            () -> { CompletableFuture.runAsync(null); },
2692 <            () -> { CompletableFuture.runAsync(null, exec); },
2693 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
2694 <
2695 <            () -> { f.completeExceptionally(null); },
2696 <
2697 <            () -> { f.thenApply(null); },
2698 <            () -> { f.thenApplyAsync(null); },
2699 <            () -> { f.thenApplyAsync((x) -> x, null); },
2700 <            () -> { f.thenApplyAsync(null, exec); },
2701 <
2702 <            () -> { f.thenAccept(null); },
2703 <            () -> { f.thenAcceptAsync(null); },
2704 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
2705 <            () -> { f.thenAcceptAsync(null, exec); },
2706 <
2707 <            () -> { f.thenRun(null); },
2708 <            () -> { f.thenRunAsync(null); },
2709 <            () -> { f.thenRunAsync(() -> { ; }, null); },
2710 <            () -> { f.thenRunAsync(null, exec); },
2711 <
2712 <            () -> { f.thenCombine(g, null); },
2713 <            () -> { f.thenCombineAsync(g, null); },
2714 <            () -> { f.thenCombineAsync(g, null, exec); },
2715 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
2716 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
2717 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
2718 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
2719 <
2720 <            () -> { f.thenAcceptBoth(g, null); },
2721 <            () -> { f.thenAcceptBothAsync(g, null); },
2722 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
2723 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
2724 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
2725 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
2726 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
2727 <
2728 <            () -> { f.runAfterBoth(g, null); },
2729 <            () -> { f.runAfterBothAsync(g, null); },
2730 <            () -> { f.runAfterBothAsync(g, null, exec); },
2731 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
2732 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
2733 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
2734 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
2735 <
2736 <            () -> { f.applyToEither(g, null); },
2737 <            () -> { f.applyToEitherAsync(g, null); },
2738 <            () -> { f.applyToEitherAsync(g, null, exec); },
2739 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
2740 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
2741 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
2742 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
2743 <
2744 <            () -> { f.acceptEither(g, null); },
2745 <            () -> { f.acceptEitherAsync(g, null); },
2746 <            () -> { f.acceptEitherAsync(g, null, exec); },
2747 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
2748 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
2749 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
2750 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
2751 <
2752 <            () -> { f.runAfterEither(g, null); },
2753 <            () -> { f.runAfterEitherAsync(g, null); },
2754 <            () -> { f.runAfterEitherAsync(g, null, exec); },
2755 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
2756 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
2757 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
2758 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
2759 <
2760 <            () -> { f.thenCompose(null); },
2761 <            () -> { f.thenComposeAsync(null); },
2762 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
2763 <            () -> { f.thenComposeAsync(null, exec); },
2764 <
2765 <            () -> { f.exceptionally(null); },
2766 <
2767 <            () -> { f.handle(null); },
2768 <
2769 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
2770 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
2771 <            () -> { CompletableFuture.allOf(f, null); },
2772 <            () -> { CompletableFuture.allOf(null, f); },
2773 <
2774 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
2775 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
2776 <            () -> { CompletableFuture.anyOf(f, null); },
2777 <            () -> { CompletableFuture.anyOf(null, f); },
2687 >            () -> CompletableFuture.supplyAsync(null),
2688 >            () -> CompletableFuture.supplyAsync(null, exec),
2689 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2690 >
2691 >            () -> CompletableFuture.runAsync(null),
2692 >            () -> CompletableFuture.runAsync(null, exec),
2693 >            () -> CompletableFuture.runAsync(() -> {}, null),
2694 >
2695 >            () -> f.completeExceptionally(null),
2696 >
2697 >            () -> f.thenApply(null),
2698 >            () -> f.thenApplyAsync(null),
2699 >            () -> f.thenApplyAsync((x) -> x, null),
2700 >            () -> f.thenApplyAsync(null, exec),
2701 >
2702 >            () -> f.thenAccept(null),
2703 >            () -> f.thenAcceptAsync(null),
2704 >            () -> f.thenAcceptAsync((x) -> {} , null),
2705 >            () -> f.thenAcceptAsync(null, exec),
2706 >
2707 >            () -> f.thenRun(null),
2708 >            () -> f.thenRunAsync(null),
2709 >            () -> f.thenRunAsync(() -> {} , null),
2710 >            () -> f.thenRunAsync(null, exec),
2711 >
2712 >            () -> f.thenCombine(g, null),
2713 >            () -> f.thenCombineAsync(g, null),
2714 >            () -> f.thenCombineAsync(g, null, exec),
2715 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
2716 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
2717 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
2718 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
2719 >
2720 >            () -> f.thenAcceptBoth(g, null),
2721 >            () -> f.thenAcceptBothAsync(g, null),
2722 >            () -> f.thenAcceptBothAsync(g, null, exec),
2723 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
2724 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
2725 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
2726 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
2727 >
2728 >            () -> f.runAfterBoth(g, null),
2729 >            () -> f.runAfterBothAsync(g, null),
2730 >            () -> f.runAfterBothAsync(g, null, exec),
2731 >            () -> f.runAfterBoth(nullFuture, () -> {}),
2732 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
2733 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
2734 >            () -> f.runAfterBothAsync(g, () -> {}, null),
2735 >
2736 >            () -> f.applyToEither(g, null),
2737 >            () -> f.applyToEitherAsync(g, null),
2738 >            () -> f.applyToEitherAsync(g, null, exec),
2739 >            () -> f.applyToEither(nullFuture, (x) -> x),
2740 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
2741 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
2742 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
2743 >
2744 >            () -> f.acceptEither(g, null),
2745 >            () -> f.acceptEitherAsync(g, null),
2746 >            () -> f.acceptEitherAsync(g, null, exec),
2747 >            () -> f.acceptEither(nullFuture, (x) -> {}),
2748 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
2749 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
2750 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
2751 >
2752 >            () -> f.runAfterEither(g, null),
2753 >            () -> f.runAfterEitherAsync(g, null),
2754 >            () -> f.runAfterEitherAsync(g, null, exec),
2755 >            () -> f.runAfterEither(nullFuture, () -> {}),
2756 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
2757 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
2758 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
2759 >
2760 >            () -> f.thenCompose(null),
2761 >            () -> f.thenComposeAsync(null),
2762 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2763 >            () -> f.thenComposeAsync(null, exec),
2764 >
2765 >            () -> f.exceptionally(null),
2766 >
2767 >            () -> f.handle(null),
2768 >
2769 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
2770 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
2771 >            () -> CompletableFuture.allOf(f, null),
2772 >            () -> CompletableFuture.allOf(null, f),
2773 >
2774 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
2775 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
2776 >            () -> CompletableFuture.anyOf(f, null),
2777 >            () -> CompletableFuture.anyOf(null, f),
2778 >
2779 >            () -> f.obtrudeException(null),
2780          };
2781  
2782          assertThrows(NullPointerException.class, throwingActions);
2783          assertEquals(0, exec.count.get());
2784      }
2785  
2786 +    /**
2787 +     * toCompletableFuture returns this CompletableFuture.
2788 +     */
2789 +    public void testToCompletableFuture() {
2790 +        CompletableFuture<Integer> f = new CompletableFuture<>();
2791 +        assertSame(f, f.toCompletableFuture());
2792 +    }
2793 +
2794 +    /**
2795 +     * whenComplete action executes on normal completion, propagating
2796 +     * source result.
2797 +     */
2798 +    public void testWhenComplete_normalCompletion1() {
2799 +        for (ExecutionMode m : ExecutionMode.values())
2800 +        for (boolean createIncomplete : new boolean[] { true, false })
2801 +        for (Integer v1 : new Integer[] { 1, null })
2802 +    {
2803 +        final AtomicInteger a = new AtomicInteger(0);
2804 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2805 +        if (!createIncomplete) f.complete(v1);
2806 +        final CompletableFuture<Integer> g = m.whenComplete
2807 +            (f,
2808 +             (Integer x, Throwable t) -> {
2809 +                threadAssertSame(x, v1);
2810 +                threadAssertNull(t);
2811 +                a.getAndIncrement();
2812 +            });
2813 +        if (createIncomplete) f.complete(v1);
2814 +
2815 +        checkCompletedNormally(g, v1);
2816 +        checkCompletedNormally(f, v1);
2817 +        assertEquals(1, a.get());
2818 +    }}
2819 +
2820 +    /**
2821 +     * whenComplete action executes on exceptional completion, propagating
2822 +     * source result.
2823 +     */
2824 +    public void testWhenComplete_exceptionalCompletion() {
2825 +        for (ExecutionMode m : ExecutionMode.values())
2826 +        for (boolean createIncomplete : new boolean[] { true, false })
2827 +        for (Integer v1 : new Integer[] { 1, null })
2828 +    {
2829 +        final AtomicInteger a = new AtomicInteger(0);
2830 +        final CFException ex = new CFException();
2831 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2832 +        if (!createIncomplete) f.completeExceptionally(ex);
2833 +        final CompletableFuture<Integer> g = m.whenComplete
2834 +            (f,
2835 +             (Integer x, Throwable t) -> {
2836 +                threadAssertNull(x);
2837 +                threadAssertSame(t, ex);
2838 +                a.getAndIncrement();
2839 +            });
2840 +        if (createIncomplete) f.completeExceptionally(ex);
2841 +        checkCompletedWithWrappedCFException(f, ex);
2842 +        checkCompletedWithWrappedCFException(g, ex);
2843 +        assertEquals(1, a.get());
2844 +    }}
2845 +
2846 +    /**
2847 +     * whenComplete action executes on cancelled source, propagating
2848 +     * CancellationException.
2849 +     */
2850 +    public void testWhenComplete_sourceCancelled() {
2851 +        for (ExecutionMode m : ExecutionMode.values())
2852 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2853 +        for (boolean createIncomplete : new boolean[] { true, false })
2854 +    {
2855 +        final AtomicInteger a = new AtomicInteger(0);
2856 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2858 +        final CompletableFuture<Integer> g = m.whenComplete
2859 +            (f,
2860 +             (Integer x, Throwable t) -> {
2861 +                threadAssertNull(x);
2862 +                threadAssertTrue(t instanceof CancellationException);
2863 +                a.getAndIncrement();
2864 +            });
2865 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2866 +
2867 +        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2868 +        checkCompletedWithWrappedCancellationException(g);
2869 +        checkCancelled(f);
2870 +        assertEquals(1, a.get());
2871 +    }}
2872 +
2873 +    /**
2874 +     * If a whenComplete action throws an exception when triggered by
2875 +     * a normal completion, it completes exceptionally
2876 +     */
2877 +    public void testWhenComplete_actionFailed() {
2878 +        for (boolean createIncomplete : new boolean[] { true, false })
2879 +        for (ExecutionMode m : ExecutionMode.values())
2880 +        for (Integer v1 : new Integer[] { 1, null })
2881 +    {
2882 +        final AtomicInteger a = new AtomicInteger(0);
2883 +        final CFException ex = new CFException();
2884 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2885 +        if (!createIncomplete) f.complete(v1);
2886 +        final CompletableFuture<Integer> g = m.whenComplete
2887 +            (f,
2888 +             (Integer x, Throwable t) -> {
2889 +                threadAssertSame(x, v1);
2890 +                threadAssertNull(t);
2891 +                a.getAndIncrement();
2892 +                throw ex;
2893 +            });
2894 +        if (createIncomplete) f.complete(v1);
2895 +        checkCompletedNormally(f, v1);
2896 +        checkCompletedWithWrappedCFException(g, ex);
2897 +        assertEquals(1, a.get());
2898 +    }}
2899 +
2900 +    /**
2901 +     * If a whenComplete action throws an exception when triggered by
2902 +     * a source completion that also throws an exception, the source
2903 +     * exception takes precedence.
2904 +     */
2905 +    public void testWhenComplete_actionFailedSourceFailed() {
2906 +        for (boolean createIncomplete : new boolean[] { true, false })
2907 +        for (ExecutionMode m : ExecutionMode.values())
2908 +        for (Integer v1 : new Integer[] { 1, null })
2909 +    {
2910 +        final AtomicInteger a = new AtomicInteger(0);
2911 +        final CFException ex1 = new CFException();
2912 +        final CFException ex2 = new CFException();
2913 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2914 +
2915 +        if (!createIncomplete) f.completeExceptionally(ex1);
2916 +        final CompletableFuture<Integer> g = m.whenComplete
2917 +            (f,
2918 +             (Integer x, Throwable t) -> {
2919 +                threadAssertSame(t, ex1);
2920 +                threadAssertNull(x);
2921 +                a.getAndIncrement();
2922 +                throw ex2;
2923 +            });
2924 +        if (createIncomplete) f.completeExceptionally(ex1);
2925 +
2926 +        checkCompletedWithWrappedCFException(f, ex1);
2927 +        checkCompletedWithWrappedCFException(g, ex1);
2928 +        assertEquals(1, a.get());
2929 +    }}
2930 +
2931   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines