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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines