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.48 by jsr166, Mon Jun 2 19:07:14 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 AddAction implements BiConsumer<Integer, Integer> {
352 <        int value;
351 >    static final class IncFunction implements Function<Integer,Integer> {
352 >        int invocationCount = 0;
353 >        Integer value;
354 >        public Integer apply(Integer x) {
355 >            invocationCount++;
356 >            return value = inc(x);
357 >        }
358 >    }
359 >    static final class SubtractAction implements BiConsumer<Integer, Integer> {
360 >        int invocationCount = 0;
361 >        Integer value;
362 >        // Check this action was invoked exactly once when result is computed.
363          public void accept(Integer x, Integer y) {
364 <            value = x.intValue() + y.intValue();
364 >            invocationCount++;
365 >            value = subtract(x, y);
366 >        }
367 >    }
368 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
369 >        int invocationCount = 0;
370 >        Integer value;
371 >        // Check this action was invoked exactly once when result is computed.
372 >        public Integer apply(Integer x, Integer y) {
373 >            invocationCount++;
374 >            return value = subtract(x, y);
375          }
376      }
377      static final class Noop implements Runnable {
378 <        boolean ran;
379 <        public void run() { ran = true; }
378 >        int invocationCount = 0;
379 >        public void run() {
380 >            invocationCount++;
381 >        }
382      }
383  
384      static final class FailingSupplier implements Supplier<Integer> {
385 <        boolean ran;
386 <        public Integer get() { ran = true; throw new CFException(); }
385 >        int invocationCount = 0;
386 >        public Integer get() {
387 >            invocationCount++;
388 >            throw new CFException();
389 >        }
390      }
391      static final class FailingConsumer implements Consumer<Integer> {
392 <        boolean ran;
393 <        public void accept(Integer x) { ran = true; throw new CFException(); }
392 >        int invocationCount = 0;
393 >        public void accept(Integer x) {
394 >            invocationCount++;
395 >            throw new CFException();
396 >        }
397      }
398      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
399 <        boolean ran;
400 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
399 >        int invocationCount = 0;
400 >        public void accept(Integer x, Integer y) {
401 >            invocationCount++;
402 >            throw new CFException();
403 >        }
404      }
405      static final class FailingFunction implements Function<Integer, Integer> {
406 <        boolean ran;
407 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
406 >        int invocationCount = 0;
407 >        public Integer apply(Integer x) {
408 >            invocationCount++;
409 >            throw new CFException();
410 >        }
411      }
412      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
413 <        boolean ran;
414 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
413 >        int invocationCount = 0;
414 >        public Integer apply(Integer x, Integer y) {
415 >            invocationCount++;
416 >            throw new CFException();
417 >        }
418      }
419      static final class FailingNoop implements Runnable {
420 <        boolean ran;
421 <        public void run() { ran = true; throw new CFException(); }
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;
808 <
809 <        f = new CompletableFuture<Integer>();
810 <        f.completeExceptionally(new CFException());
811 <        g = f.handle(r = new IntegerHandler());
812 <        assertTrue(r.ran);
813 <        checkCompletedNormally(g, three);
814 <
815 <        f = new CompletableFuture<Integer>();
816 <        g = f.handle(r = new IntegerHandler());
817 <        assertFalse(r.ran);
818 <        f.completeExceptionally(new CFException());
819 <        checkCompletedNormally(g, three);
820 <        assertTrue(r.ran);
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.complete(one);
854 <        g = f.handle(r = new IntegerHandler());
855 <        assertTrue(r.ran);
416 <        checkCompletedNormally(g, two);
852 >        checkCompletedNormally(g, v1);
853 >        checkCancelled(f);
854 >        assertEquals(1, a.get());
855 >    }}
856  
857 <        f = new CompletableFuture<Integer>();
858 <        g = f.handle(r = new IntegerHandler());
859 <        assertFalse(r.ran);
860 <        f.complete(one);
861 <        assertTrue(r.ran);
862 <        checkCompletedNormally(g, two);
863 <    }
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 454 | Line 936 | public class CompletableFutureTest exten
936          FailingNoop r = new FailingNoop();
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) f.complete(v1);
987 >
988          checkCompletedNormally(g, null);
989 <    }
989 >        checkCompletedNormally(f, v1);
990 >        assertEquals(1, r.invocationCount);
991 >    }}
992  
993      /**
994       * thenRun result completes exceptionally after exceptional
995       * completion of source
996       */
997 <    public void testThenRun2() {
998 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
999 <        Noop r = new Noop();
1000 <        CompletableFuture<Void> g = f.thenRun(r);
1001 <        f.completeExceptionally(new CFException());
1002 <        checkCompletedWithWrappedCFException(g);
1003 <    }
997 >    public void testThenRun_exceptionalCompletion() {
998 >        for (ExecutionMode m : ExecutionMode.values())
999 >        for (boolean createIncomplete : new boolean[] { true, false })
1000 >    {
1001 >        final CFException ex = new CFException();
1002 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1003 >        final Noop r = new Noop();
1004 >        if (!createIncomplete) f.completeExceptionally(ex);
1005 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1006 >        if (createIncomplete) f.completeExceptionally(ex);
1007 >
1008 >        checkCompletedWithWrappedCFException(g, ex);
1009 >        checkCompletedWithWrappedCFException(f, ex);
1010 >        assertEquals(0, r.invocationCount);
1011 >    }}
1012  
1013      /**
1014 <     * thenRun result completes exceptionally if action does
1014 >     * thenRun result completes exceptionally if source cancelled
1015       */
1016 <    public void testThenRun3() {
1017 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1018 <        FailingNoop r = new FailingNoop();
1019 <        CompletableFuture<Void> g = f.thenRun(r);
1020 <        f.complete(null);
1021 <        checkCompletedWithWrappedCFException(g);
1022 <    }
1016 >    public void testThenRun_sourceCancelled() {
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1020 >    {
1021 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1022 >        final Noop r = new Noop();
1023 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1024 >        final CompletableFuture<Void> g = f.thenRun(r);
1025 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1026 >
1027 >        checkCompletedWithWrappedCancellationException(g);
1028 >        checkCancelled(f);
1029 >        assertEquals(0, r.invocationCount);
1030 >    }}
1031  
1032      /**
1033 <     * thenRun result completes exceptionally if source cancelled
1033 >     * thenRun result completes exceptionally if action does
1034       */
1035 <    public void testThenRun4() {
1036 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1037 <        Noop r = new Noop();
1038 <        CompletableFuture<Void> g = f.thenRun(r);
1039 <        assertTrue(f.cancel(true));
1040 <        checkCompletedWithWrappedCancellationException(g);
1041 <    }
1035 >    public void testThenRun_actionFailed() {
1036 >        for (ExecutionMode m : ExecutionMode.values())
1037 >        for (boolean createIncomplete : new boolean[] { true, false })
1038 >        for (Integer v1 : new Integer[] { 1, null })
1039 >    {
1040 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1041 >        final FailingNoop r = new FailingNoop();
1042 >        if (!createIncomplete) f.complete(v1);
1043 >        final CompletableFuture<Void> g = f.thenRun(r);
1044 >        if (createIncomplete) f.complete(v1);
1045 >
1046 >        checkCompletedWithWrappedCFException(g);
1047 >        checkCompletedNormally(f, v1);
1048 >    }}
1049  
1050      /**
1051       * thenApply result completes normally after normal completion of source
1052       */
1053      public void testThenApply() {
1054 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1054 >        CompletableFuture<Integer> f = new CompletableFuture<>();
1055          CompletableFuture<Integer> g = f.thenApply(inc);
1056          f.complete(one);
1057          checkCompletedNormally(g, two);
# Line 555 | Line 1062 | public class CompletableFutureTest exten
1062       * completion of source
1063       */
1064      public void testThenApply2() {
1065 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1065 >        CompletableFuture<Integer> f = new CompletableFuture<>();
1066          CompletableFuture<Integer> g = f.thenApply(inc);
1067          f.completeExceptionally(new CFException());
1068          checkCompletedWithWrappedCFException(g);
# Line 565 | Line 1072 | public class CompletableFutureTest exten
1072       * thenApply result completes exceptionally if action does
1073       */
1074      public void testThenApply3() {
1075 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1075 >        CompletableFuture<Integer> f = new CompletableFuture<>();
1076          CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1077          f.complete(one);
1078          checkCompletedWithWrappedCFException(g);
# Line 575 | Line 1082 | public class CompletableFutureTest exten
1082       * thenApply result completes exceptionally if source cancelled
1083       */
1084      public void testThenApply4() {
1085 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1085 >        CompletableFuture<Integer> f = new CompletableFuture<>();
1086          CompletableFuture<Integer> g = f.thenApply(inc);
1087          assertTrue(f.cancel(true));
1088          checkCompletedWithWrappedCancellationException(g);
# Line 585 | Line 1092 | public class CompletableFutureTest exten
1092       * thenAccept result completes normally after normal completion of source
1093       */
1094      public void testThenAccept() {
1095 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1095 >        CompletableFuture<Integer> f = new CompletableFuture<>();
1096          IncAction r = new IncAction();
1097          CompletableFuture<Void> g = f.thenAccept(r);
1098          f.complete(one);
1099          checkCompletedNormally(g, null);
1100 <        assertEquals(r.value, 2);
1100 >        assertEquals(r.value, (Integer) 2);
1101      }
1102  
1103      /**
# Line 598 | Line 1105 | public class CompletableFutureTest exten
1105       * completion of source
1106       */
1107      public void testThenAccept2() {
1108 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1108 >        CompletableFuture<Integer> f = new CompletableFuture<>();
1109          IncAction r = new IncAction();
1110          CompletableFuture<Void> g = f.thenAccept(r);
1111          f.completeExceptionally(new CFException());
# Line 609 | Line 1116 | public class CompletableFutureTest exten
1116       * thenAccept result completes exceptionally if action does
1117       */
1118      public void testThenAccept3() {
1119 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1119 >        CompletableFuture<Integer> f = new CompletableFuture<>();
1120          FailingConsumer r = new FailingConsumer();
1121          CompletableFuture<Void> g = f.thenAccept(r);
1122          f.complete(one);
1123          checkCompletedWithWrappedCFException(g);
1124 <        assertTrue(r.ran);
1124 >        assertEquals(1, r.invocationCount);
1125      }
1126  
1127      /**
1128       * thenAccept result completes exceptionally if source cancelled
1129       */
1130      public void testThenAccept4() {
1131 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1131 >        CompletableFuture<Integer> f = new CompletableFuture<>();
1132          IncAction r = new IncAction();
1133          CompletableFuture<Void> g = f.thenAccept(r);
1134          assertTrue(f.cancel(true));
1135          checkCompletedWithWrappedCancellationException(g);
1136      }
1137  
631
1138      /**
1139       * thenCombine result completes normally after normal completion
1140       * of sources
1141       */
1142 <    public void testThenCombine() {
1143 <        CompletableFuture<Integer> f, g, h;
1144 <
1145 <        f = new CompletableFuture<Integer>();
1146 <        g = new CompletableFuture<Integer>();
1147 <        h = f.thenCombine(g, subtract);
1148 <        f.complete(3);
1149 <        checkIncomplete(h);
1150 <        g.complete(1);
1151 <        checkCompletedNormally(h, 2);
1152 <
1153 <        f = new CompletableFuture<Integer>();
1154 <        g = new CompletableFuture<Integer>();
1155 <        h = f.thenCombine(g, subtract);
1156 <        g.complete(1);
1157 <        checkIncomplete(h);
1158 <        f.complete(3);
1159 <        checkCompletedNormally(h, 2);
1160 <
1161 <        f = new CompletableFuture<Integer>();
1162 <        g = new CompletableFuture<Integer>();
1163 <        g.complete(1);
1164 <        f.complete(3);
1165 <        h = f.thenCombine(g, subtract);
1166 <        checkCompletedNormally(h, 2);
1167 <    }
1142 >    public void testThenCombine_normalCompletion1() {
1143 >        for (boolean createIncomplete : new boolean[] { true, false })
1144 >        for (boolean fFirst : new boolean[] { true, false })
1145 >        for (ExecutionMode m : ExecutionMode.values())
1146 >        for (Integer v1 : new Integer[] { 1, null })
1147 >        for (Integer v2 : new Integer[] { 2, null })
1148 >    {
1149 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1150 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1151 >        final SubtractFunction r = new SubtractFunction();
1152 >        CompletableFuture<Integer> h = null;
1153 >        if (createIncomplete) h = m.thenCombine(f, g, r);
1154 >
1155 >        if (fFirst)
1156 >            f.complete(v1);
1157 >        else
1158 >            g.complete(v2);
1159 >        if (createIncomplete) checkIncomplete(h);
1160 >        assertEquals(0, r.invocationCount);
1161 >        if (!fFirst)
1162 >            f.complete(v1);
1163 >        else
1164 >            g.complete(v2);
1165 >        if (!createIncomplete) h = m.thenCombine(f, g, r);
1166 >
1167 >        checkCompletedNormally(h, subtract(v1, v2));
1168 >        checkCompletedNormally(f, v1);
1169 >        checkCompletedNormally(g, v2);
1170 >        assertEquals(1, r.invocationCount);
1171 >    }}
1172  
1173      /**
1174       * thenCombine result completes exceptionally after exceptional
1175       * completion of either source
1176       */
1177 <    public void testThenCombine2() {
1178 <        CompletableFuture<Integer> f, g, h;
1177 >    public void testThenCombine_exceptionalCompletion1() {
1178 >        for (ExecutionMode m : ExecutionMode.values())
1179 >        for (Integer v1 : new Integer[] { 1, null })
1180 >    {
1181 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1182 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1183 >        final SubtractFunction r = new SubtractFunction();
1184 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1185 >        final CFException ex = new CFException();
1186  
1187 <        f = new CompletableFuture<Integer>();
671 <        g = new CompletableFuture<Integer>();
672 <        h = f.thenCombine(g, subtract);
673 <        f.completeExceptionally(new CFException());
1187 >        f.completeExceptionally(ex);
1188          checkIncomplete(h);
1189 <        g.complete(1);
1190 <        checkCompletedWithWrappedCFException(h);
1189 >        g.complete(v1);
1190 >
1191 >        checkCompletedWithWrappedCFException(h, ex);
1192 >        checkCompletedWithWrappedCFException(f, ex);
1193 >        assertEquals(0, r.invocationCount);
1194 >        checkCompletedNormally(g, v1);
1195 >    }}
1196 >
1197 >    public void testThenCombine_exceptionalCompletion2() {
1198 >        for (ExecutionMode m : ExecutionMode.values())
1199 >        for (Integer v1 : new Integer[] { 1, null })
1200 >    {
1201 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1202 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1203 >        final SubtractFunction r = new SubtractFunction();
1204 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1205 >        final CFException ex = new CFException();
1206  
1207 <        f = new CompletableFuture<Integer>();
679 <        g = new CompletableFuture<Integer>();
680 <        h = f.thenCombine(g, subtract);
681 <        g.completeExceptionally(new CFException());
1207 >        g.completeExceptionally(ex);
1208          checkIncomplete(h);
1209 <        f.complete(3);
684 <        checkCompletedWithWrappedCFException(h);
1209 >        f.complete(v1);
1210  
1211 <        f = new CompletableFuture<Integer>();
1212 <        g = new CompletableFuture<Integer>();
1213 <        f.complete(3);
1214 <        g.completeExceptionally(new CFException());
1215 <        h = f.thenCombine(g, subtract);
1216 <        checkCompletedWithWrappedCFException(h);
1217 <
1218 <        f = new CompletableFuture<Integer>();
1219 <        g = new CompletableFuture<Integer>();
1220 <        f.completeExceptionally(new CFException());
1221 <        g.complete(3);
1222 <        h = f.thenCombine(g, subtract);
1223 <        checkCompletedWithWrappedCFException(h);
1224 <    }
1211 >        checkCompletedWithWrappedCFException(h, ex);
1212 >        checkCompletedWithWrappedCFException(g, ex);
1213 >        assertEquals(0, r.invocationCount);
1214 >        checkCompletedNormally(f, v1);
1215 >    }}
1216 >
1217 >    public void testThenCombine_exceptionalCompletion3() {
1218 >        for (ExecutionMode m : ExecutionMode.values())
1219 >        for (Integer v1 : new Integer[] { 1, null })
1220 >    {
1221 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1222 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1223 >        final SubtractFunction r = new SubtractFunction();
1224 >        final CFException ex = new CFException();
1225 >
1226 >        g.completeExceptionally(ex);
1227 >        f.complete(v1);
1228 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1229 >
1230 >        checkCompletedWithWrappedCFException(h, ex);
1231 >        checkCompletedWithWrappedCFException(g, ex);
1232 >        assertEquals(0, r.invocationCount);
1233 >        checkCompletedNormally(f, v1);
1234 >    }}
1235 >
1236 >    public void testThenCombine_exceptionalCompletion4() {
1237 >        for (ExecutionMode m : ExecutionMode.values())
1238 >        for (Integer v1 : new Integer[] { 1, null })
1239 >    {
1240 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1241 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1242 >        final SubtractFunction r = new SubtractFunction();
1243 >        final CFException ex = new CFException();
1244 >
1245 >        f.completeExceptionally(ex);
1246 >        g.complete(v1);
1247 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1248 >
1249 >        checkCompletedWithWrappedCFException(h, ex);
1250 >        checkCompletedWithWrappedCFException(f, ex);
1251 >        assertEquals(0, r.invocationCount);
1252 >        checkCompletedNormally(g, v1);
1253 >    }}
1254  
1255      /**
1256       * thenCombine result completes exceptionally if action does
1257       */
1258 <    public void testThenCombine3() {
1259 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1260 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1261 <        FailingBiFunction r = new FailingBiFunction();
1262 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1263 <        f.complete(one);
1264 <        checkIncomplete(g);
1265 <        assertFalse(r.ran);
1266 <        f2.complete(two);
1267 <        checkCompletedWithWrappedCFException(g);
1268 <        assertTrue(r.ran);
1269 <    }
1258 >    public void testThenCombine_actionFailed1() {
1259 >        for (ExecutionMode m : ExecutionMode.values())
1260 >        for (Integer v1 : new Integer[] { 1, null })
1261 >        for (Integer v2 : new Integer[] { 2, null })
1262 >    {
1263 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1264 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1265 >        final FailingBiFunction r = new FailingBiFunction();
1266 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1267 >
1268 >        f.complete(v1);
1269 >        checkIncomplete(h);
1270 >        g.complete(v2);
1271 >
1272 >        checkCompletedWithWrappedCFException(h);
1273 >        checkCompletedNormally(f, v1);
1274 >        checkCompletedNormally(g, v2);
1275 >    }}
1276 >
1277 >    public void testThenCombine_actionFailed2() {
1278 >        for (ExecutionMode m : ExecutionMode.values())
1279 >        for (Integer v1 : new Integer[] { 1, null })
1280 >        for (Integer v2 : new Integer[] { 2, null })
1281 >    {
1282 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1283 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1284 >        final FailingBiFunction r = new FailingBiFunction();
1285 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1286 >
1287 >        g.complete(v2);
1288 >        checkIncomplete(h);
1289 >        f.complete(v1);
1290 >
1291 >        checkCompletedWithWrappedCFException(h);
1292 >        checkCompletedNormally(f, v1);
1293 >        checkCompletedNormally(g, v2);
1294 >    }}
1295  
1296      /**
1297       * thenCombine result completes exceptionally if either source cancelled
1298       */
1299 <    public void testThenCombine4() {
1300 <        CompletableFuture<Integer> f, g, h;
1299 >    public void testThenCombine_sourceCancelled1() {
1300 >        for (ExecutionMode m : ExecutionMode.values())
1301 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1302 >        for (Integer v1 : new Integer[] { 1, null })
1303 >    {
1304 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1305 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1306 >        final SubtractFunction r = new SubtractFunction();
1307 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1308  
1309 <        f = new CompletableFuture<Integer>();
724 <        g = new CompletableFuture<Integer>();
725 <        h = f.thenCombine(g, subtract);
726 <        assertTrue(f.cancel(true));
1309 >        assertTrue(f.cancel(mayInterruptIfRunning));
1310          checkIncomplete(h);
1311 <        g.complete(1);
1311 >        g.complete(v1);
1312 >
1313          checkCompletedWithWrappedCancellationException(h);
1314 +        checkCancelled(f);
1315 +        assertEquals(0, r.invocationCount);
1316 +        checkCompletedNormally(g, v1);
1317 +    }}
1318 +
1319 +    public void testThenCombine_sourceCancelled2() {
1320 +        for (ExecutionMode m : ExecutionMode.values())
1321 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1322 +        for (Integer v1 : new Integer[] { 1, null })
1323 +    {
1324 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1325 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1326 +        final SubtractFunction r = new SubtractFunction();
1327 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1328  
1329 <        f = new CompletableFuture<Integer>();
732 <        g = new CompletableFuture<Integer>();
733 <        h = f.thenCombine(g, subtract);
734 <        assertTrue(g.cancel(true));
1329 >        assertTrue(g.cancel(mayInterruptIfRunning));
1330          checkIncomplete(h);
1331 <        f.complete(3);
1331 >        f.complete(v1);
1332 >
1333          checkCompletedWithWrappedCancellationException(h);
1334 +        checkCancelled(g);
1335 +        assertEquals(0, r.invocationCount);
1336 +        checkCompletedNormally(f, v1);
1337 +    }}
1338 +
1339 +    public void testThenCombine_sourceCancelled3() {
1340 +        for (ExecutionMode m : ExecutionMode.values())
1341 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1342 +        for (Integer v1 : new Integer[] { 1, null })
1343 +    {
1344 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1345 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1346 +        final SubtractFunction r = new SubtractFunction();
1347 +
1348 +        assertTrue(g.cancel(mayInterruptIfRunning));
1349 +        f.complete(v1);
1350 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1351  
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);
1352          checkCompletedWithWrappedCancellationException(h);
1353 <    }
1353 >        checkCancelled(g);
1354 >        assertEquals(0, r.invocationCount);
1355 >        checkCompletedNormally(f, v1);
1356 >    }}
1357 >
1358 >    public void testThenCombine_sourceCancelled4() {
1359 >        for (ExecutionMode m : ExecutionMode.values())
1360 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1361 >        for (Integer v1 : new Integer[] { 1, null })
1362 >    {
1363 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1364 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1365 >        final SubtractFunction r = new SubtractFunction();
1366 >
1367 >        assertTrue(f.cancel(mayInterruptIfRunning));
1368 >        g.complete(v1);
1369 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1370 >
1371 >        checkCompletedWithWrappedCancellationException(h);
1372 >        checkCancelled(f);
1373 >        assertEquals(0, r.invocationCount);
1374 >        checkCompletedNormally(g, v1);
1375 >    }}
1376  
1377      /**
1378       * thenAcceptBoth result completes normally after normal
1379       * completion of sources
1380       */
1381 <    public void testThenAcceptBoth() {
1382 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1383 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1384 <        AddAction r = new AddAction();
1385 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1386 <        f.complete(one);
1387 <        checkIncomplete(g);
1388 <        f2.complete(two);
1389 <        checkCompletedNormally(g, null);
760 <        assertEquals(r.value, 3);
1381 >    public void testThenAcceptBoth_normalCompletion1() {
1382 >        for (ExecutionMode m : ExecutionMode.values())
1383 >        for (Integer v1 : new Integer[] { 1, null })
1384 >        for (Integer v2 : new Integer[] { 2, null })
1385 >    {
1386 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1387 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1388 >        final SubtractAction r = new SubtractAction();
1389 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1390  
1391 <        r = new AddAction();
1392 <        f = new CompletableFuture<Integer>();
1393 <        f.complete(one);
1394 <        f2 = new CompletableFuture<Integer>();
1395 <        g = f.thenAcceptBoth(f2, r);
1396 <        checkIncomplete(g);
1397 <        f2.complete(two);
1398 <        checkCompletedNormally(g, null);
1399 <        assertEquals(r.value, 3);
1400 <    }
1391 >        f.complete(v1);
1392 >        checkIncomplete(h);
1393 >        assertEquals(0, r.invocationCount);
1394 >        g.complete(v2);
1395 >
1396 >        checkCompletedNormally(h, null);
1397 >        assertEquals(subtract(v1, v2), r.value);
1398 >        checkCompletedNormally(f, v1);
1399 >        checkCompletedNormally(g, v2);
1400 >    }}
1401 >
1402 >    public void testThenAcceptBoth_normalCompletion2() {
1403 >        for (ExecutionMode m : ExecutionMode.values())
1404 >        for (Integer v1 : new Integer[] { 1, null })
1405 >        for (Integer v2 : new Integer[] { 2, null })
1406 >    {
1407 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1408 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1409 >        final SubtractAction r = new SubtractAction();
1410 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1411 >
1412 >        g.complete(v2);
1413 >        checkIncomplete(h);
1414 >        assertEquals(0, r.invocationCount);
1415 >        f.complete(v1);
1416 >
1417 >        checkCompletedNormally(h, null);
1418 >        assertEquals(subtract(v1, v2), r.value);
1419 >        checkCompletedNormally(f, v1);
1420 >        checkCompletedNormally(g, v2);
1421 >    }}
1422 >
1423 >    public void testThenAcceptBoth_normalCompletion3() {
1424 >        for (ExecutionMode m : ExecutionMode.values())
1425 >        for (Integer v1 : new Integer[] { 1, null })
1426 >        for (Integer v2 : new Integer[] { 2, null })
1427 >    {
1428 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1429 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1430 >        final SubtractAction r = new SubtractAction();
1431 >
1432 >        g.complete(v2);
1433 >        f.complete(v1);
1434 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1435 >
1436 >        checkCompletedNormally(h, null);
1437 >        assertEquals(subtract(v1, v2), r.value);
1438 >        checkCompletedNormally(f, v1);
1439 >        checkCompletedNormally(g, v2);
1440 >    }}
1441 >
1442 >    public void testThenAcceptBoth_normalCompletion4() {
1443 >        for (ExecutionMode m : ExecutionMode.values())
1444 >        for (Integer v1 : new Integer[] { 1, null })
1445 >        for (Integer v2 : new Integer[] { 2, null })
1446 >    {
1447 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1448 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1449 >        final SubtractAction r = new SubtractAction();
1450 >
1451 >        f.complete(v1);
1452 >        g.complete(v2);
1453 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1454 >
1455 >        checkCompletedNormally(h, null);
1456 >        assertEquals(subtract(v1, v2), r.value);
1457 >        checkCompletedNormally(f, v1);
1458 >        checkCompletedNormally(g, v2);
1459 >    }}
1460  
1461      /**
1462       * thenAcceptBoth result completes exceptionally after exceptional
1463       * completion of either source
1464       */
1465 <    public void testThenAcceptBoth2() {
1466 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1467 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1468 <        AddAction r = new AddAction();
1469 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1470 <        f.completeExceptionally(new CFException());
1471 <        f2.complete(two);
1472 <        checkCompletedWithWrappedCFException(g);
1465 >    public void testThenAcceptBoth_exceptionalCompletion1() {
1466 >        for (ExecutionMode m : ExecutionMode.values())
1467 >        for (Integer v1 : new Integer[] { 1, null })
1468 >    {
1469 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1471 >        final SubtractAction r = new SubtractAction();
1472 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1473 >        final CFException ex = new CFException();
1474  
1475 <        r = new AddAction();
1476 <        f = new CompletableFuture<Integer>();
1477 <        f.complete(one);
1478 <        f2 = new CompletableFuture<Integer>();
1479 <        g = f.thenAcceptBoth(f2, r);
1480 <        f2.completeExceptionally(new CFException());
1481 <        checkCompletedWithWrappedCFException(g);
1482 <    }
1475 >        f.completeExceptionally(ex);
1476 >        checkIncomplete(h);
1477 >        g.complete(v1);
1478 >
1479 >        checkCompletedWithWrappedCFException(h, ex);
1480 >        checkCompletedWithWrappedCFException(f, ex);
1481 >        assertEquals(0, r.invocationCount);
1482 >        checkCompletedNormally(g, v1);
1483 >    }}
1484 >
1485 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1486 >        for (ExecutionMode m : ExecutionMode.values())
1487 >        for (Integer v1 : new Integer[] { 1, null })
1488 >    {
1489 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1490 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1491 >        final SubtractAction r = new SubtractAction();
1492 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1493 >        final CFException ex = new CFException();
1494 >
1495 >        g.completeExceptionally(ex);
1496 >        checkIncomplete(h);
1497 >        f.complete(v1);
1498 >
1499 >        checkCompletedWithWrappedCFException(h, ex);
1500 >        checkCompletedWithWrappedCFException(g, ex);
1501 >        assertEquals(0, r.invocationCount);
1502 >        checkCompletedNormally(f, v1);
1503 >    }}
1504 >
1505 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1506 >        for (ExecutionMode m : ExecutionMode.values())
1507 >        for (Integer v1 : new Integer[] { 1, null })
1508 >    {
1509 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1510 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1511 >        final SubtractAction r = new SubtractAction();
1512 >        final CFException ex = new CFException();
1513 >
1514 >        g.completeExceptionally(ex);
1515 >        f.complete(v1);
1516 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1517 >
1518 >        checkCompletedWithWrappedCFException(h, ex);
1519 >        checkCompletedWithWrappedCFException(g, ex);
1520 >        assertEquals(0, r.invocationCount);
1521 >        checkCompletedNormally(f, v1);
1522 >    }}
1523 >
1524 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1525 >        for (ExecutionMode m : ExecutionMode.values())
1526 >        for (Integer v1 : new Integer[] { 1, null })
1527 >    {
1528 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1529 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1530 >        final SubtractAction r = new SubtractAction();
1531 >        final CFException ex = new CFException();
1532 >
1533 >        f.completeExceptionally(ex);
1534 >        g.complete(v1);
1535 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1536 >
1537 >        checkCompletedWithWrappedCFException(h, ex);
1538 >        checkCompletedWithWrappedCFException(f, ex);
1539 >        assertEquals(0, r.invocationCount);
1540 >        checkCompletedNormally(g, v1);
1541 >    }}
1542  
1543      /**
1544       * thenAcceptBoth result completes exceptionally if action does
1545       */
1546 <    public void testThenAcceptBoth3() {
1547 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1548 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1549 <        FailingBiConsumer r = new FailingBiConsumer();
1550 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1551 <        f.complete(one);
1552 <        checkIncomplete(g);
1553 <        f2.complete(two);
1554 <        checkCompletedWithWrappedCFException(g);
1555 <    }
1546 >    public void testThenAcceptBoth_actionFailed1() {
1547 >        for (ExecutionMode m : ExecutionMode.values())
1548 >        for (Integer v1 : new Integer[] { 1, null })
1549 >        for (Integer v2 : new Integer[] { 2, null })
1550 >    {
1551 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1552 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1553 >        final FailingBiConsumer r = new FailingBiConsumer();
1554 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1555 >
1556 >        f.complete(v1);
1557 >        checkIncomplete(h);
1558 >        g.complete(v2);
1559 >
1560 >        checkCompletedWithWrappedCFException(h);
1561 >        checkCompletedNormally(f, v1);
1562 >        checkCompletedNormally(g, v2);
1563 >    }}
1564 >
1565 >    public void testThenAcceptBoth_actionFailed2() {
1566 >        for (ExecutionMode m : ExecutionMode.values())
1567 >        for (Integer v1 : new Integer[] { 1, null })
1568 >        for (Integer v2 : new Integer[] { 2, null })
1569 >    {
1570 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1571 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1572 >        final FailingBiConsumer r = new FailingBiConsumer();
1573 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1574 >
1575 >        g.complete(v2);
1576 >        checkIncomplete(h);
1577 >        f.complete(v1);
1578 >
1579 >        checkCompletedWithWrappedCFException(h);
1580 >        checkCompletedNormally(f, v1);
1581 >        checkCompletedNormally(g, v2);
1582 >    }}
1583  
1584      /**
1585       * thenAcceptBoth result completes exceptionally if either source cancelled
1586       */
1587 <    public void testThenAcceptBoth4() {
1588 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1589 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1590 <        AddAction r = new AddAction();
1591 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1592 <        assertTrue(f.cancel(true));
1593 <        f2.complete(two);
1594 <        checkCompletedWithWrappedCancellationException(g);
1595 <        f = new CompletableFuture<Integer>();
1596 <        f2 = new CompletableFuture<Integer>();
1597 <        r = new AddAction();
1598 <        g = f.thenAcceptBoth(f2, r);
1599 <        f.complete(one);
1600 <        assertTrue(f2.cancel(true));
1601 <        checkCompletedWithWrappedCancellationException(g);
1602 <    }
1587 >    public void testThenAcceptBoth_sourceCancelled1() {
1588 >        for (ExecutionMode m : ExecutionMode.values())
1589 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1590 >        for (Integer v1 : new Integer[] { 1, null })
1591 >    {
1592 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1593 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1594 >        final SubtractAction r = new SubtractAction();
1595 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1596 >
1597 >        assertTrue(f.cancel(mayInterruptIfRunning));
1598 >        checkIncomplete(h);
1599 >        g.complete(v1);
1600 >
1601 >        checkCompletedWithWrappedCancellationException(h);
1602 >        checkCancelled(f);
1603 >        assertEquals(0, r.invocationCount);
1604 >        checkCompletedNormally(g, v1);
1605 >    }}
1606 >
1607 >    public void testThenAcceptBoth_sourceCancelled2() {
1608 >        for (ExecutionMode m : ExecutionMode.values())
1609 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1610 >        for (Integer v1 : new Integer[] { 1, null })
1611 >    {
1612 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1613 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1614 >        final SubtractAction r = new SubtractAction();
1615 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1616 >
1617 >        assertTrue(g.cancel(mayInterruptIfRunning));
1618 >        checkIncomplete(h);
1619 >        f.complete(v1);
1620 >
1621 >        checkCompletedWithWrappedCancellationException(h);
1622 >        checkCancelled(g);
1623 >        assertEquals(0, r.invocationCount);
1624 >        checkCompletedNormally(f, v1);
1625 >    }}
1626 >
1627 >    public void testThenAcceptBoth_sourceCancelled3() {
1628 >        for (ExecutionMode m : ExecutionMode.values())
1629 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1630 >        for (Integer v1 : new Integer[] { 1, null })
1631 >    {
1632 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1633 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1634 >        final SubtractAction r = new SubtractAction();
1635 >
1636 >        assertTrue(g.cancel(mayInterruptIfRunning));
1637 >        f.complete(v1);
1638 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1639 >
1640 >        checkCompletedWithWrappedCancellationException(h);
1641 >        checkCancelled(g);
1642 >        assertEquals(0, r.invocationCount);
1643 >        checkCompletedNormally(f, v1);
1644 >    }}
1645 >
1646 >    public void testThenAcceptBoth_sourceCancelled4() {
1647 >        for (ExecutionMode m : ExecutionMode.values())
1648 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1649 >        for (Integer v1 : new Integer[] { 1, null })
1650 >    {
1651 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1652 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1653 >        final SubtractAction r = new SubtractAction();
1654 >
1655 >        assertTrue(f.cancel(mayInterruptIfRunning));
1656 >        g.complete(v1);
1657 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1658 >
1659 >        checkCompletedWithWrappedCancellationException(h);
1660 >        checkCancelled(f);
1661 >        assertEquals(0, r.invocationCount);
1662 >        checkCompletedNormally(g, v1);
1663 >    }}
1664  
1665      /**
1666       * runAfterBoth result completes normally after normal
1667       * completion of sources
1668       */
1669 <    public void testRunAfterBoth() {
1670 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1671 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1672 <        Noop r = new Noop();
1673 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1674 <        f.complete(one);
1675 <        checkIncomplete(g);
1676 <        f2.complete(two);
1677 <        checkCompletedNormally(g, null);
842 <        assertTrue(r.ran);
1669 >    public void testRunAfterBoth_normalCompletion1() {
1670 >        for (ExecutionMode m : ExecutionMode.values())
1671 >        for (Integer v1 : new Integer[] { 1, null })
1672 >        for (Integer v2 : new Integer[] { 2, null })
1673 >    {
1674 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1675 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1676 >        final Noop r = new Noop();
1677 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1678  
1679 <        r = new Noop();
1680 <        f = new CompletableFuture<Integer>();
1681 <        f.complete(one);
1682 <        f2 = new CompletableFuture<Integer>();
1683 <        g = f.runAfterBoth(f2, r);
1684 <        checkIncomplete(g);
1685 <        f2.complete(two);
1686 <        checkCompletedNormally(g, null);
1687 <        assertTrue(r.ran);
1688 <    }
1679 >        f.complete(v1);
1680 >        checkIncomplete(h);
1681 >        assertEquals(0, r.invocationCount);
1682 >        g.complete(v2);
1683 >
1684 >        checkCompletedNormally(h, null);
1685 >        assertEquals(1, r.invocationCount);
1686 >        checkCompletedNormally(f, v1);
1687 >        checkCompletedNormally(g, v2);
1688 >    }}
1689 >
1690 >    public void testRunAfterBoth_normalCompletion2() {
1691 >        for (ExecutionMode m : ExecutionMode.values())
1692 >        for (Integer v1 : new Integer[] { 1, null })
1693 >        for (Integer v2 : new Integer[] { 2, null })
1694 >    {
1695 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1696 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 >        final Noop r = new Noop();
1698 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1699 >
1700 >        g.complete(v2);
1701 >        checkIncomplete(h);
1702 >        assertEquals(0, r.invocationCount);
1703 >        f.complete(v1);
1704 >
1705 >        checkCompletedNormally(h, null);
1706 >        assertEquals(1, r.invocationCount);
1707 >        checkCompletedNormally(f, v1);
1708 >        checkCompletedNormally(g, v2);
1709 >    }}
1710 >
1711 >    public void testRunAfterBoth_normalCompletion3() {
1712 >        for (ExecutionMode m : ExecutionMode.values())
1713 >        for (Integer v1 : new Integer[] { 1, null })
1714 >        for (Integer v2 : new Integer[] { 2, null })
1715 >    {
1716 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1717 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1718 >        final Noop r = new Noop();
1719 >
1720 >        g.complete(v2);
1721 >        f.complete(v1);
1722 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1723 >
1724 >        checkCompletedNormally(h, null);
1725 >        assertEquals(1, r.invocationCount);
1726 >        checkCompletedNormally(f, v1);
1727 >        checkCompletedNormally(g, v2);
1728 >    }}
1729 >
1730 >    public void testRunAfterBoth_normalCompletion4() {
1731 >        for (ExecutionMode m : ExecutionMode.values())
1732 >        for (Integer v1 : new Integer[] { 1, null })
1733 >        for (Integer v2 : new Integer[] { 2, null })
1734 >    {
1735 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1736 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1737 >        final Noop r = new Noop();
1738 >
1739 >        f.complete(v1);
1740 >        g.complete(v2);
1741 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1742 >
1743 >        checkCompletedNormally(h, null);
1744 >        assertEquals(1, r.invocationCount);
1745 >        checkCompletedNormally(f, v1);
1746 >        checkCompletedNormally(g, v2);
1747 >    }}
1748  
1749      /**
1750       * runAfterBoth result completes exceptionally after exceptional
1751       * completion of either source
1752       */
1753 <    public void testRunAfterBoth2() {
1754 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1755 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1756 <        Noop r = new Noop();
1757 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1758 <        f.completeExceptionally(new CFException());
1759 <        f2.complete(two);
1760 <        checkCompletedWithWrappedCFException(g);
1761 <
868 <        r = new Noop();
869 <        f = new CompletableFuture<Integer>();
870 <        f.complete(one);
871 <        f2 = new CompletableFuture<Integer>();
872 <        g = f.runAfterBoth(f2, r);
873 <        f2.completeExceptionally(new CFException());
874 <        checkCompletedWithWrappedCFException(g);
875 <    }
1753 >    public void testRunAfterBoth_exceptionalCompletion1() {
1754 >        for (ExecutionMode m : ExecutionMode.values())
1755 >        for (Integer v1 : new Integer[] { 1, null })
1756 >    {
1757 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1758 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1759 >        final Noop r = new Noop();
1760 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1761 >        final CFException ex = new CFException();
1762  
1763 <    /**
1764 <     * runAfterBoth result completes exceptionally if action does
1765 <     */
880 <    public void testRunAfterBoth3() {
881 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
882 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
883 <        FailingNoop r = new FailingNoop();
884 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
885 <        f.complete(one);
886 <        checkIncomplete(g);
887 <        f2.complete(two);
888 <        checkCompletedWithWrappedCFException(g);
889 <    }
1763 >        f.completeExceptionally(ex);
1764 >        checkIncomplete(h);
1765 >        g.complete(v1);
1766  
1767 <    /**
1768 <     * runAfterBoth result completes exceptionally if either source cancelled
1769 <     */
1770 <    public void testRunAfterBoth4() {
1771 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1772 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1773 <        Noop r = new Noop();
1774 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1775 <        assertTrue(f.cancel(true));
1776 <        f2.complete(two);
1777 <        checkCompletedWithWrappedCancellationException(g);
1778 <        f = new CompletableFuture<Integer>();
1779 <        f2 = new CompletableFuture<Integer>();
1780 <        r = new Noop();
1781 <        g = f.runAfterBoth(f2, r);
906 <        f.complete(one);
907 <        assertTrue(f2.cancel(true));
908 <        checkCompletedWithWrappedCancellationException(g);
909 <    }
1767 >        checkCompletedWithWrappedCFException(h, ex);
1768 >        checkCompletedWithWrappedCFException(f, ex);
1769 >        assertEquals(0, r.invocationCount);
1770 >        checkCompletedNormally(g, v1);
1771 >    }}
1772 >
1773 >    public void testRunAfterBoth_exceptionalCompletion2() {
1774 >        for (ExecutionMode m : ExecutionMode.values())
1775 >        for (Integer v1 : new Integer[] { 1, null })
1776 >    {
1777 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1778 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1779 >        final Noop r = new Noop();
1780 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1781 >        final CFException ex = new CFException();
1782  
1783 <    /**
1784 <     * applyToEither result completes normally after normal completion
1785 <     * of either source
914 <     */
915 <    public void testApplyToEither() {
916 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
917 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
918 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
919 <        f.complete(one);
920 <        checkCompletedNormally(g, two);
921 <        f2.complete(one);
922 <        checkCompletedNormally(g, two);
1783 >        g.completeExceptionally(ex);
1784 >        checkIncomplete(h);
1785 >        f.complete(v1);
1786  
1787 <        f = new CompletableFuture<Integer>();
1788 <        f.complete(one);
1789 <        f2 = new CompletableFuture<Integer>();
1790 <        g = f.applyToEither(f2, inc);
1791 <        checkCompletedNormally(g, two);
1792 <    }
1787 >        checkCompletedWithWrappedCFException(h, ex);
1788 >        checkCompletedWithWrappedCFException(g, ex);
1789 >        assertEquals(0, r.invocationCount);
1790 >        checkCompletedNormally(f, v1);
1791 >    }}
1792 >
1793 >    public void testRunAfterBoth_exceptionalCompletion3() {
1794 >        for (ExecutionMode m : ExecutionMode.values())
1795 >        for (Integer v1 : new Integer[] { 1, null })
1796 >    {
1797 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1798 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1799 >        final Noop r = new Noop();
1800 >        final CFException ex = new CFException();
1801 >
1802 >        g.completeExceptionally(ex);
1803 >        f.complete(v1);
1804 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1805 >
1806 >        checkCompletedWithWrappedCFException(h, ex);
1807 >        checkCompletedWithWrappedCFException(g, ex);
1808 >        assertEquals(0, r.invocationCount);
1809 >        checkCompletedNormally(f, v1);
1810 >    }}
1811 >
1812 >    public void testRunAfterBoth_exceptionalCompletion4() {
1813 >        for (ExecutionMode m : ExecutionMode.values())
1814 >        for (Integer v1 : new Integer[] { 1, null })
1815 >    {
1816 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1817 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1818 >        final Noop r = new Noop();
1819 >        final CFException ex = new CFException();
1820 >
1821 >        f.completeExceptionally(ex);
1822 >        g.complete(v1);
1823 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1824 >
1825 >        checkCompletedWithWrappedCFException(h, ex);
1826 >        checkCompletedWithWrappedCFException(f, ex);
1827 >        assertEquals(0, r.invocationCount);
1828 >        checkCompletedNormally(g, v1);
1829 >    }}
1830  
1831      /**
1832 <     * applyToEither result completes exceptionally after exceptional
933 <     * completion of either source
1832 >     * runAfterBoth result completes exceptionally if action does
1833       */
1834 <    public void testApplyToEither2() {
1835 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1836 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1837 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1838 <        f.completeExceptionally(new CFException());
1839 <        f2.complete(one);
1840 <        checkCompletedWithWrappedCFException(g);
1834 >    public void testRunAfterBoth_actionFailed1() {
1835 >        for (ExecutionMode m : ExecutionMode.values())
1836 >        for (Integer v1 : new Integer[] { 1, null })
1837 >        for (Integer v2 : new Integer[] { 2, null })
1838 >    {
1839 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1840 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1841 >        final FailingNoop r = new FailingNoop();
1842 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1843  
1844 <        f = new CompletableFuture<Integer>();
1845 <        f2 = new CompletableFuture<Integer>();
1846 <        f2.completeExceptionally(new CFException());
946 <        g = f.applyToEither(f2, inc);
947 <        checkCompletedWithWrappedCFException(g);
948 <    }
1844 >        f.complete(v1);
1845 >        checkIncomplete(h);
1846 >        g.complete(v2);
1847  
1848 <    /**
1849 <     * applyToEither result completes exceptionally if action does
1850 <     */
1851 <    public void testApplyToEither3() {
1852 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1853 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1854 <        FailingFunction r = new FailingFunction();
1855 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1856 <        f2.complete(two);
1857 <        checkCompletedWithWrappedCFException(g);
1858 <    }
1848 >        checkCompletedWithWrappedCFException(h);
1849 >        checkCompletedNormally(f, v1);
1850 >        checkCompletedNormally(g, v2);
1851 >    }}
1852 >
1853 >    public void testRunAfterBoth_actionFailed2() {
1854 >        for (ExecutionMode m : ExecutionMode.values())
1855 >        for (Integer v1 : new Integer[] { 1, null })
1856 >        for (Integer v2 : new Integer[] { 2, null })
1857 >    {
1858 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1859 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1860 >        final FailingNoop r = new FailingNoop();
1861 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1862  
1863 <    /**
1864 <     * applyToEither result completes exceptionally if either source cancelled
1865 <     */
1866 <    public void testApplyToEither4() {
1867 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1868 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1869 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1870 <        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 <    }
1863 >        g.complete(v2);
1864 >        checkIncomplete(h);
1865 >        f.complete(v1);
1866 >
1867 >        checkCompletedWithWrappedCFException(h);
1868 >        checkCompletedNormally(f, v1);
1869 >        checkCompletedNormally(g, v2);
1870 >    }}
1871  
1872      /**
1873 <     * acceptEither result completes normally after normal completion
979 <     * of either source
1873 >     * runAfterBoth result completes exceptionally if either source cancelled
1874       */
1875 <    public void testAcceptEither() {
1876 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1877 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1878 <        IncAction r = new IncAction();
1879 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1880 <        f.complete(one);
1881 <        checkCompletedNormally(g, null);
1882 <        f2.complete(one);
1883 <        checkCompletedNormally(g, null);
990 <        assertEquals(r.value, 2);
1875 >    public void testRunAfterBoth_sourceCancelled1() {
1876 >        for (ExecutionMode m : ExecutionMode.values())
1877 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1878 >        for (Integer v1 : new Integer[] { 1, null })
1879 >    {
1880 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1881 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1882 >        final Noop r = new Noop();
1883 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1884  
1885 <        r = new IncAction();
1886 <        f = new CompletableFuture<Integer>();
1887 <        f.complete(one);
995 <        f2 = new CompletableFuture<Integer>();
996 <        g = f.acceptEither(f2, r);
997 <        checkCompletedNormally(g, null);
998 <        assertEquals(r.value, 2);
999 <    }
1885 >        assertTrue(f.cancel(mayInterruptIfRunning));
1886 >        checkIncomplete(h);
1887 >        g.complete(v1);
1888  
1889 <    /**
1890 <     * acceptEither result completes exceptionally after exceptional
1891 <     * completion of either source
1892 <     */
1893 <    public void testAcceptEither2() {
1894 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1895 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1896 <        IncAction r = new IncAction();
1897 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1898 <        f.completeExceptionally(new CFException());
1899 <        f2.complete(one);
1900 <        checkCompletedWithWrappedCFException(g);
1889 >        checkCompletedWithWrappedCancellationException(h);
1890 >        checkCancelled(f);
1891 >        assertEquals(0, r.invocationCount);
1892 >        checkCompletedNormally(g, v1);
1893 >    }}
1894 >
1895 >    public void testRunAfterBoth_sourceCancelled2() {
1896 >        for (ExecutionMode m : ExecutionMode.values())
1897 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1898 >        for (Integer v1 : new Integer[] { 1, null })
1899 >    {
1900 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1901 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1902 >        final Noop r = new Noop();
1903 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1904  
1905 <        r = new IncAction();
1906 <        f = new CompletableFuture<Integer>();
1907 <        f2 = new CompletableFuture<Integer>();
1017 <        f2.completeExceptionally(new CFException());
1018 <        g = f.acceptEither(f2, r);
1019 <        checkCompletedWithWrappedCFException(g);
1020 <    }
1905 >        assertTrue(g.cancel(mayInterruptIfRunning));
1906 >        checkIncomplete(h);
1907 >        f.complete(v1);
1908  
1909 <    /**
1910 <     * acceptEither result completes exceptionally if action does
1911 <     */
1912 <    public void testAcceptEither3() {
1913 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1914 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1915 <        FailingConsumer r = new FailingConsumer();
1916 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1917 <        f2.complete(two);
1918 <        checkCompletedWithWrappedCFException(g);
1919 <    }
1909 >        checkCompletedWithWrappedCancellationException(h);
1910 >        checkCancelled(g);
1911 >        assertEquals(0, r.invocationCount);
1912 >        checkCompletedNormally(f, v1);
1913 >    }}
1914 >
1915 >    public void testRunAfterBoth_sourceCancelled3() {
1916 >        for (ExecutionMode m : ExecutionMode.values())
1917 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1918 >        for (Integer v1 : new Integer[] { 1, null })
1919 >    {
1920 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1921 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1922 >        final Noop r = new Noop();
1923 >
1924 >        assertTrue(g.cancel(mayInterruptIfRunning));
1925 >        f.complete(v1);
1926 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1927  
1928 <    /**
1929 <     * acceptEither result completes exceptionally if either source cancelled
1930 <     */
1931 <    public void testAcceptEither4() {
1932 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1933 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1934 <        IncAction r = new IncAction();
1935 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1936 <        assertTrue(f.cancel(true));
1937 <        checkCompletedWithWrappedCancellationException(g);
1938 <        f = new CompletableFuture<Integer>();
1939 <        f2 = new CompletableFuture<Integer>();
1940 <        assertTrue(f2.cancel(true));
1941 <        checkCompletedWithWrappedCancellationException(g);
1942 <    }
1928 >        checkCompletedWithWrappedCancellationException(h);
1929 >        checkCancelled(g);
1930 >        assertEquals(0, r.invocationCount);
1931 >        checkCompletedNormally(f, v1);
1932 >    }}
1933 >
1934 >    public void testRunAfterBoth_sourceCancelled4() {
1935 >        for (ExecutionMode m : ExecutionMode.values())
1936 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1937 >        for (Integer v1 : new Integer[] { 1, null })
1938 >    {
1939 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1940 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1941 >        final Noop r = new Noop();
1942 >
1943 >        assertTrue(f.cancel(mayInterruptIfRunning));
1944 >        g.complete(v1);
1945 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1946  
1947 +        checkCompletedWithWrappedCancellationException(h);
1948 +        checkCancelled(f);
1949 +        assertEquals(0, r.invocationCount);
1950 +        checkCompletedNormally(g, v1);
1951 +    }}
1952  
1953      /**
1954 <     * runAfterEither result completes normally after normal completion
1954 >     * applyToEither result completes normally after normal completion
1955       * of either source
1956       */
1957 <    public void testRunAfterEither() {
1958 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1959 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1960 <        Noop r = new Noop();
1961 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1962 <        f.complete(one);
1963 <        checkCompletedNormally(g, null);
1964 <        f2.complete(one);
1965 <        checkCompletedNormally(g, null);
1966 <        assertTrue(r.ran);
1967 <
1968 <        r = new Noop();
1969 <        f = new CompletableFuture<Integer>();
1970 <        f.complete(one);
1971 <        f2 = new CompletableFuture<Integer>();
1972 <        g = f.runAfterEither(f2, r);
1973 <        checkCompletedNormally(g, null);
1974 <        assertTrue(r.ran);
1975 <    }
1957 >    public void testApplyToEither_normalCompletion1() {
1958 >        for (ExecutionMode m : ExecutionMode.values())
1959 >        for (Integer v1 : new Integer[] { 1, null })
1960 >        for (Integer v2 : new Integer[] { 2, null })
1961 >    {
1962 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1963 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1964 >        final IncFunction r = new IncFunction();
1965 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1966 >
1967 >        f.complete(v1);
1968 >        checkCompletedNormally(h, inc(v1));
1969 >        g.complete(v2);
1970 >
1971 >        checkCompletedNormally(f, v1);
1972 >        checkCompletedNormally(g, v2);
1973 >        checkCompletedNormally(h, inc(v1));
1974 >    }}
1975 >
1976 >    public void testApplyToEither_normalCompletion2() {
1977 >        for (ExecutionMode m : ExecutionMode.values())
1978 >        for (Integer v1 : new Integer[] { 1, null })
1979 >        for (Integer v2 : new Integer[] { 2, null })
1980 >    {
1981 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1982 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1983 >        final IncFunction r = new IncFunction();
1984 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1985 >
1986 >        g.complete(v2);
1987 >        checkCompletedNormally(h, inc(v2));
1988 >        f.complete(v1);
1989 >
1990 >        checkCompletedNormally(f, v1);
1991 >        checkCompletedNormally(g, v2);
1992 >        checkCompletedNormally(h, inc(v2));
1993 >        }}
1994 >
1995 >    public void testApplyToEither_normalCompletion3() {
1996 >        for (ExecutionMode m : ExecutionMode.values())
1997 >        for (Integer v1 : new Integer[] { 1, null })
1998 >        for (Integer v2 : new Integer[] { 2, null })
1999 >    {
2000 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2001 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 >        final IncFunction r = new IncFunction();
2003 >
2004 >        f.complete(v1);
2005 >        g.complete(v2);
2006 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2007 >
2008 >        checkCompletedNormally(f, v1);
2009 >        checkCompletedNormally(g, v2);
2010 >
2011 >        // unspecified behavior
2012 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2013 >                   Objects.equals(h.join(), inc(v2)));
2014 >        assertEquals(1, r.invocationCount);
2015 >    }}
2016  
2017      /**
2018 <     * runAfterEither result completes exceptionally after exceptional
2018 >     * applyToEither result completes exceptionally after exceptional
2019       * completion of either source
2020       */
2021 <    public void testRunAfterEither2() {
2022 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2023 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2024 <        Noop r = new Noop();
2025 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2026 <        f.completeExceptionally(new CFException());
2027 <        f2.complete(one);
2028 <        checkCompletedWithWrappedCFException(g);
2029 <
2030 <        r = new Noop();
2031 <        f = new CompletableFuture<Integer>();
2032 <        f2 = new CompletableFuture<Integer>();
2033 <        f2.completeExceptionally(new CFException());
2034 <        g = f.runAfterEither(f2, r);
2035 <        checkCompletedWithWrappedCFException(g);
2036 <    }
2037 <
2038 <    /**
2039 <     * runAfterEither result completes exceptionally if action does
2040 <     */
2041 <    public void testRunAfterEither3() {
2042 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2043 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2044 <        FailingNoop r = new FailingNoop();
2045 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2046 <        f2.complete(two);
2047 <        checkCompletedWithWrappedCFException(g);
2048 <    }
2021 >    public void testApplyToEither_exceptionalCompletion1() {
2022 >        for (ExecutionMode m : ExecutionMode.values())
2023 >        for (Integer v1 : new Integer[] { 1, null })
2024 >    {
2025 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2026 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2027 >        final IncFunction r = new IncFunction();
2028 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2029 >        final CFException ex = new CFException();
2030 >
2031 >        f.completeExceptionally(ex);
2032 >        checkCompletedWithWrappedCFException(h, ex);
2033 >        g.complete(v1);
2034 >
2035 >        assertEquals(0, r.invocationCount);
2036 >        checkCompletedNormally(g, v1);
2037 >        checkCompletedWithWrappedCFException(f, ex);
2038 >        checkCompletedWithWrappedCFException(h, ex);
2039 >    }}
2040 >
2041 >    public void testApplyToEither_exceptionalCompletion2() {
2042 >        for (ExecutionMode m : ExecutionMode.values())
2043 >        for (Integer v1 : new Integer[] { 1, null })
2044 >    {
2045 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2046 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2047 >        final IncFunction r = new IncFunction();
2048 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2049 >        final CFException ex = new CFException();
2050 >
2051 >        g.completeExceptionally(ex);
2052 >        checkCompletedWithWrappedCFException(h, ex);
2053 >        f.complete(v1);
2054 >
2055 >        assertEquals(0, r.invocationCount);
2056 >        checkCompletedNormally(f, v1);
2057 >        checkCompletedWithWrappedCFException(g, ex);
2058 >        checkCompletedWithWrappedCFException(h, ex);
2059 >    }}
2060 >
2061 >    public void testApplyToEither_exceptionalCompletion3() {
2062 >        for (ExecutionMode m : ExecutionMode.values())
2063 >        for (Integer v1 : new Integer[] { 1, null })
2064 >    {
2065 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2066 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2067 >        final IncFunction r = new IncFunction();
2068 >        final CFException ex = new CFException();
2069 >
2070 >        g.completeExceptionally(ex);
2071 >        f.complete(v1);
2072 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2073  
2074 <    /**
2075 <     * runAfterEither result completes exceptionally if either source cancelled
2076 <     */
2077 <    public void testRunAfterEither4() {
2078 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2079 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2080 <        Noop r = new Noop();
2081 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2082 <        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 <    }
2074 >        // unspecified behavior
2075 >        Integer v;
2076 >        try {
2077 >            assertEquals(inc(v1), h.join());
2078 >            assertEquals(1, r.invocationCount);
2079 >        } catch (CompletionException ok) {
2080 >            checkCompletedWithWrappedCFException(h, ex);
2081 >            assertEquals(0, r.invocationCount);
2082 >        }
2083  
2084 <    /**
2085 <     * thenCompose result completes normally after normal completion of source
2086 <     */
2087 <    public void testThenCompose() {
2088 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2089 <        CompletableFutureInc r = new CompletableFutureInc();
2090 <        CompletableFuture<Integer> g = f.thenCompose(r);
2091 <        f.complete(one);
2092 <        checkCompletedNormally(g, two);
2093 <    }
2084 >        checkCompletedWithWrappedCFException(g, ex);
2085 >        checkCompletedNormally(f, v1);
2086 >    }}
2087 >
2088 >    public void testApplyToEither_exceptionalCompletion4() {
2089 >        for (ExecutionMode m : ExecutionMode.values())
2090 >        for (Integer v1 : new Integer[] { 1, null })
2091 >    {
2092 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2093 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2094 >        final IncFunction r = new IncFunction();
2095 >        final CFException ex = new CFException();
2096 >
2097 >        f.completeExceptionally(ex);
2098 >        g.complete(v1);
2099 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2100  
2101 <    /**
2102 <     * thenCompose result completes exceptionally after exceptional
2103 <     * completion of source
2104 <     */
2105 <    public void testThenCompose2() {
2106 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2107 <        CompletableFutureInc r = new CompletableFutureInc();
2108 <        CompletableFuture<Integer> g = f.thenCompose(r);
2109 <        f.completeExceptionally(new CFException());
1144 <        checkCompletedWithWrappedCFException(g);
1145 <    }
2101 >        // unspecified behavior
2102 >        Integer v;
2103 >        try {
2104 >            assertEquals(inc(v1), h.join());
2105 >            assertEquals(1, r.invocationCount);
2106 >        } catch (CompletionException ok) {
2107 >            checkCompletedWithWrappedCFException(h, ex);
2108 >            assertEquals(0, r.invocationCount);
2109 >        }
2110  
2111 <    /**
2112 <     * thenCompose result completes exceptionally if action does
2113 <     */
1150 <    public void testThenCompose3() {
1151 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1152 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
1153 <        CompletableFuture<Integer> g = f.thenCompose(r);
1154 <        f.complete(one);
1155 <        checkCompletedWithWrappedCFException(g);
1156 <    }
2111 >        checkCompletedWithWrappedCFException(f, ex);
2112 >        checkCompletedNormally(g, v1);
2113 >    }}
2114  
2115      /**
2116 <     * thenCompose result completes exceptionally if source cancelled
2116 >     * applyToEither result completes exceptionally if action does
2117       */
2118 <    public void testThenCompose4() {
2119 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2120 <        CompletableFutureInc r = new CompletableFutureInc();
2121 <        CompletableFuture<Integer> g = f.thenCompose(r);
2122 <        assertTrue(f.cancel(true));
2123 <        checkCompletedWithWrappedCancellationException(g);
2124 <    }
2118 >    public void testApplyToEither_actionFailed1() {
2119 >        for (ExecutionMode m : ExecutionMode.values())
2120 >        for (Integer v1 : new Integer[] { 1, null })
2121 >        for (Integer v2 : new Integer[] { 2, null })
2122 >    {
2123 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2124 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2125 >        final FailingFunction r = new FailingFunction();
2126 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2127  
2128 +        f.complete(v1);
2129 +        checkCompletedWithWrappedCFException(h);
2130 +        g.complete(v2);
2131 +        checkCompletedNormally(f, v1);
2132 +        checkCompletedNormally(g, v2);
2133 +    }}
2134 +
2135 +    public void testApplyToEither_actionFailed2() {
2136 +        for (ExecutionMode m : ExecutionMode.values())
2137 +        for (Integer v1 : new Integer[] { 1, null })
2138 +        for (Integer v2 : new Integer[] { 2, null })
2139 +    {
2140 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2141 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2142 +        final FailingFunction r = new FailingFunction();
2143 +        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2144  
2145 <    // asyncs
2145 >        g.complete(v2);
2146 >        checkCompletedWithWrappedCFException(h);
2147 >        f.complete(v1);
2148 >        checkCompletedNormally(f, v1);
2149 >        checkCompletedNormally(g, v2);
2150 >    }}
2151  
2152      /**
2153 <     * thenRunAsync result completes normally after normal completion of source
2153 >     * applyToEither result completes exceptionally if either source cancelled
2154       */
2155 <    public void testThenRunAsync() {
2156 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2157 <        Noop r = new Noop();
2158 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2159 <        f.complete(null);
2160 <        checkCompletedNormally(g, null);
2155 >    public void testApplyToEither_sourceCancelled1() {
2156 >        for (ExecutionMode m : ExecutionMode.values())
2157 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2158 >        for (Integer v1 : new Integer[] { 1, null })
2159 >    {
2160 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2161 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2162 >        final IncFunction r = new IncFunction();
2163 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2164  
2165 <        // reordered version
2166 <        f = new CompletableFuture<Integer>();
2167 <        f.complete(null);
1185 <        r = new Noop();
1186 <        g = f.thenRunAsync(r);
1187 <        checkCompletedNormally(g, null);
1188 <    }
2165 >        assertTrue(f.cancel(mayInterruptIfRunning));
2166 >        checkCompletedWithWrappedCancellationException(h);
2167 >        g.complete(v1);
2168  
2169 <    /**
2170 <     * thenRunAsync result completes exceptionally after exceptional
2171 <     * completion of source
2172 <     */
2173 <    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());
1199 <        try {
1200 <            g.join();
1201 <            shouldThrow();
1202 <        } catch (Exception ok) {
1203 <        }
1204 <        checkCompletedWithWrappedCFException(g);
1205 <    }
2169 >        checkCancelled(f);
2170 >        assertEquals(0, r.invocationCount);
2171 >        checkCompletedNormally(g, v1);
2172 >        checkCompletedWithWrappedCancellationException(h);
2173 >    }}
2174  
2175 <    /**
2176 <     * thenRunAsync result completes exceptionally if action does
2177 <     */
2178 <    public void testThenRunAsync3() {
2179 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2180 <        FailingNoop r = new FailingNoop();
2181 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2182 <        f.complete(null);
2183 <        checkCompletedWithWrappedCFException(g);
1216 <    }
2175 >    public void testApplyToEither_sourceCancelled2() {
2176 >        for (ExecutionMode m : ExecutionMode.values())
2177 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2178 >        for (Integer v1 : new Integer[] { 1, null })
2179 >    {
2180 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2181 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2182 >        final IncFunction r = new IncFunction();
2183 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2184  
2185 <    /**
2186 <     * thenRunAsync result completes exceptionally if source cancelled
2187 <     */
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 <    }
2185 >        assertTrue(g.cancel(mayInterruptIfRunning));
2186 >        checkCompletedWithWrappedCancellationException(h);
2187 >        f.complete(v1);
2188  
2189 <    /**
2190 <     * thenApplyAsync result completes normally after normal completion of source
2191 <     */
2192 <    public void testThenApplyAsync() {
2193 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1234 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1235 <        f.complete(one);
1236 <        checkCompletedNormally(g, two);
1237 <    }
2189 >        checkCancelled(g);
2190 >        assertEquals(0, r.invocationCount);
2191 >        checkCompletedNormally(f, v1);
2192 >        checkCompletedWithWrappedCancellationException(h);
2193 >    }}
2194  
2195 <    /**
2196 <     * thenApplyAsync result completes exceptionally after exceptional
2197 <     * completion of source
2198 <     */
2199 <    public void testThenApplyAsync2() {
2200 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2201 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2202 <        f.completeExceptionally(new CFException());
2203 <        checkCompletedWithWrappedCFException(g);
2204 <    }
2195 >    public void testApplyToEither_sourceCancelled3() {
2196 >        for (ExecutionMode m : ExecutionMode.values())
2197 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2198 >        for (Integer v1 : new Integer[] { 1, null })
2199 >    {
2200 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2201 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2202 >        final IncFunction r = new IncFunction();
2203 >
2204 >        assertTrue(g.cancel(mayInterruptIfRunning));
2205 >        f.complete(v1);
2206 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2207  
2208 <    /**
2209 <     * thenApplyAsync result completes exceptionally if action does
2210 <     */
2211 <    public void testThenApplyAsync3() {
2212 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2213 <        FailingFunction r = new FailingFunction();
2214 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2215 <        f.complete(null);
2216 <        checkCompletedWithWrappedCFException(g);
1259 <    }
2208 >        // unspecified behavior
2209 >        Integer v;
2210 >        try {
2211 >            assertEquals(inc(v1), h.join());
2212 >            assertEquals(1, r.invocationCount);
2213 >        } catch (CompletionException ok) {
2214 >            checkCompletedWithWrappedCancellationException(h);
2215 >            assertEquals(0, r.invocationCount);
2216 >        }
2217  
2218 <    /**
2219 <     * thenApplyAsync result completes exceptionally if source cancelled
2220 <     */
2221 <    public void testThenApplyAsync4() {
2222 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2223 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2224 <        assertTrue(f.cancel(true));
2225 <        checkCompletedWithWrappedCancellationException(g);
2226 <    }
2218 >        checkCancelled(g);
2219 >        checkCompletedNormally(f, v1);
2220 >    }}
2221 >
2222 >    public void testApplyToEither_sourceCancelled4() {
2223 >        for (ExecutionMode m : ExecutionMode.values())
2224 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2225 >        for (Integer v1 : new Integer[] { 1, null })
2226 >    {
2227 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2228 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2229 >        final IncFunction r = new IncFunction();
2230 >
2231 >        assertTrue(f.cancel(mayInterruptIfRunning));
2232 >        g.complete(v1);
2233 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2234  
2235 <    /**
2236 <     * thenAcceptAsync result completes normally after normal
2237 <     * completion of source
2238 <     */
2239 <    public void testThenAcceptAsync() {
2240 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2241 <        IncAction r = new IncAction();
2242 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2243 <        f.complete(one);
1280 <        checkCompletedNormally(g, null);
1281 <        assertEquals(r.value, 2);
1282 <    }
2235 >        // unspecified behavior
2236 >        Integer v;
2237 >        try {
2238 >            assertEquals(inc(v1), h.join());
2239 >            assertEquals(1, r.invocationCount);
2240 >        } catch (CompletionException ok) {
2241 >            checkCompletedWithWrappedCancellationException(h);
2242 >            assertEquals(0, r.invocationCount);
2243 >        }
2244  
2245 <    /**
2246 <     * thenAcceptAsync result completes exceptionally after exceptional
2247 <     * completion of source
1287 <     */
1288 <    public void testThenAcceptAsync2() {
1289 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1290 <        IncAction r = new IncAction();
1291 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1292 <        f.completeExceptionally(new CFException());
1293 <        checkCompletedWithWrappedCFException(g);
1294 <    }
2245 >        checkCancelled(f);
2246 >        checkCompletedNormally(g, v1);
2247 >    }}
2248  
2249      /**
2250 <     * thenAcceptAsync result completes exceptionally if action does
2250 >     * acceptEither result completes normally after normal completion
2251 >     * of either source
2252       */
2253 <    public void testThenAcceptAsync3() {
2254 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2255 <        FailingConsumer r = new FailingConsumer();
2256 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2257 <        f.complete(null);
2258 <        checkCompletedWithWrappedCFException(g);
2259 <    }
2253 >    public void testAcceptEither_normalCompletion1() {
2254 >        for (ExecutionMode m : ExecutionMode.values())
2255 >        for (Integer v1 : new Integer[] { 1, null })
2256 >        for (Integer v2 : new Integer[] { 2, null })
2257 >    {
2258 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2259 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2260 >        final IncAction r = new IncAction();
2261 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2262 >
2263 >        f.complete(v1);
2264 >        checkCompletedNormally(h, null);
2265 >        assertEquals(inc(v1), r.value);
2266 >        g.complete(v2);
2267 >
2268 >        checkCompletedNormally(f, v1);
2269 >        checkCompletedNormally(g, v2);
2270 >        checkCompletedNormally(h, null);
2271 >    }}
2272 >
2273 >    public void testAcceptEither_normalCompletion2() {
2274 >        for (ExecutionMode m : ExecutionMode.values())
2275 >        for (Integer v1 : new Integer[] { 1, null })
2276 >        for (Integer v2 : new Integer[] { 2, null })
2277 >    {
2278 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2279 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2280 >        final IncAction r = new IncAction();
2281 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2282 >
2283 >        g.complete(v2);
2284 >        checkCompletedNormally(h, null);
2285 >        assertEquals(inc(v2), r.value);
2286 >        f.complete(v1);
2287 >
2288 >        checkCompletedNormally(f, v1);
2289 >        checkCompletedNormally(g, v2);
2290 >        checkCompletedNormally(h, null);
2291 >    }}
2292 >
2293 >    public void testAcceptEither_normalCompletion3() {
2294 >        for (ExecutionMode m : ExecutionMode.values())
2295 >        for (Integer v1 : new Integer[] { 1, null })
2296 >        for (Integer v2 : new Integer[] { 2, null })
2297 >    {
2298 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2299 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2300 >        final IncAction r = new IncAction();
2301 >
2302 >        f.complete(v1);
2303 >        g.complete(v2);
2304 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2305 >
2306 >        checkCompletedNormally(h, null);
2307 >        checkCompletedNormally(f, v1);
2308 >        checkCompletedNormally(g, v2);
2309 >
2310 >        // unspecified behavior
2311 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2312 >                   Objects.equals(r.value, inc(v2)));
2313 >    }}
2314  
2315      /**
2316 <     * thenAcceptAsync result completes exceptionally if source cancelled
2316 >     * acceptEither result completes exceptionally after exceptional
2317 >     * completion of either source
2318       */
2319 <    public void testThenAcceptAsync4() {
2320 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2321 <        IncAction r = new IncAction();
2322 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2323 <        assertTrue(f.cancel(true));
2324 <        checkCompletedWithWrappedCancellationException(g);
2325 <    }
2319 >    public void testAcceptEither_exceptionalCompletion1() {
2320 >        for (ExecutionMode m : ExecutionMode.values())
2321 >        for (Integer v1 : new Integer[] { 1, null })
2322 >    {
2323 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2324 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2325 >        final IncAction r = new IncAction();
2326 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2327 >        final CFException ex = new CFException();
2328 >
2329 >        f.completeExceptionally(ex);
2330 >        checkCompletedWithWrappedCFException(h, ex);
2331 >        g.complete(v1);
2332 >
2333 >        assertEquals(0, r.invocationCount);
2334 >        checkCompletedNormally(g, v1);
2335 >        checkCompletedWithWrappedCFException(f, ex);
2336 >        checkCompletedWithWrappedCFException(h, ex);
2337 >    }}
2338 >
2339 >    public void testAcceptEither_exceptionalCompletion2() {
2340 >        for (ExecutionMode m : ExecutionMode.values())
2341 >        for (Integer v1 : new Integer[] { 1, null })
2342 >    {
2343 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2344 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2345 >        final IncAction r = new IncAction();
2346 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2347 >        final CFException ex = new CFException();
2348 >
2349 >        g.completeExceptionally(ex);
2350 >        checkCompletedWithWrappedCFException(h, ex);
2351 >        f.complete(v1);
2352 >
2353 >        assertEquals(0, r.invocationCount);
2354 >        checkCompletedNormally(f, v1);
2355 >        checkCompletedWithWrappedCFException(g, ex);
2356 >        checkCompletedWithWrappedCFException(h, ex);
2357 >    }}
2358 >
2359 >    public void testAcceptEither_exceptionalCompletion3() {
2360 >        for (ExecutionMode m : ExecutionMode.values())
2361 >        for (Integer v1 : new Integer[] { 1, null })
2362 >    {
2363 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2364 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2365 >        final IncAction r = new IncAction();
2366 >        final CFException ex = new CFException();
2367 >
2368 >        g.completeExceptionally(ex);
2369 >        f.complete(v1);
2370 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2371  
2372 <    /**
2373 <     * thenCombineAsync result completes normally after normal
2374 <     * completion of sources
2375 <     */
2376 <    public void testThenCombineAsync() {
2377 <        CompletableFuture<Integer> f, g, h;
2372 >        // unspecified behavior
2373 >        Integer v;
2374 >        try {
2375 >            assertNull(h.join());
2376 >            assertEquals(1, r.invocationCount);
2377 >            assertEquals(inc(v1), r.value);
2378 >        } catch (CompletionException ok) {
2379 >            checkCompletedWithWrappedCFException(h, ex);
2380 >            assertEquals(0, r.invocationCount);
2381 >        }
2382  
2383 <        f = new CompletableFuture<Integer>();
2384 <        g = new CompletableFuture<Integer>();
2385 <        h = f.thenCombineAsync(g, subtract);
2386 <        f.complete(3);
2387 <        checkIncomplete(h);
2388 <        g.complete(1);
2389 <        checkCompletedNormally(h, 2);
2383 >        checkCompletedWithWrappedCFException(g, ex);
2384 >        checkCompletedNormally(f, v1);
2385 >    }}
2386 >
2387 >    public void testAcceptEither_exceptionalCompletion4() {
2388 >        for (ExecutionMode m : ExecutionMode.values())
2389 >        for (Integer v1 : new Integer[] { 1, null })
2390 >    {
2391 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2392 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2393 >        final IncAction r = new IncAction();
2394 >        final CFException ex = new CFException();
2395 >
2396 >        f.completeExceptionally(ex);
2397 >        g.complete(v1);
2398 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2399  
2400 <        f = new CompletableFuture<Integer>();
2401 <        g = new CompletableFuture<Integer>();
2402 <        h = f.thenCombineAsync(g, subtract);
2403 <        g.complete(1);
2404 <        checkIncomplete(h);
2405 <        f.complete(3);
2406 <        checkCompletedNormally(h, 2);
2400 >        // unspecified behavior
2401 >        Integer v;
2402 >        try {
2403 >            assertNull(h.join());
2404 >            assertEquals(1, r.invocationCount);
2405 >            assertEquals(inc(v1), r.value);
2406 >        } catch (CompletionException ok) {
2407 >            checkCompletedWithWrappedCFException(h, ex);
2408 >            assertEquals(0, r.invocationCount);
2409 >        }
2410  
2411 <        f = new CompletableFuture<Integer>();
2412 <        g = new CompletableFuture<Integer>();
2413 <        g.complete(1);
1344 <        f.complete(3);
1345 <        h = f.thenCombineAsync(g, subtract);
1346 <        checkCompletedNormally(h, 2);
1347 <    }
2411 >        checkCompletedWithWrappedCFException(f, ex);
2412 >        checkCompletedNormally(g, v1);
2413 >    }}
2414  
2415      /**
2416 <     * thenCombineAsync result completes exceptionally after exceptional
1351 <     * completion of either source
2416 >     * acceptEither result completes exceptionally if action does
2417       */
2418 <    public void testThenCombineAsync2() {
2419 <        CompletableFuture<Integer> f, g, h;
2418 >    public void testAcceptEither_actionFailed1() {
2419 >        for (ExecutionMode m : ExecutionMode.values())
2420 >        for (Integer v1 : new Integer[] { 1, null })
2421 >        for (Integer v2 : new Integer[] { 2, null })
2422 >    {
2423 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2424 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2425 >        final FailingConsumer r = new FailingConsumer();
2426 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2427  
2428 <        f = new CompletableFuture<Integer>();
1357 <        g = new CompletableFuture<Integer>();
1358 <        h = f.thenCombineAsync(g, subtract);
1359 <        f.completeExceptionally(new CFException());
1360 <        checkIncomplete(h);
1361 <        g.complete(1);
2428 >        f.complete(v1);
2429          checkCompletedWithWrappedCFException(h);
2430 +        g.complete(v2);
2431 +        checkCompletedNormally(f, v1);
2432 +        checkCompletedNormally(g, v2);
2433 +    }}
2434 +
2435 +    public void testAcceptEither_actionFailed2() {
2436 +        for (ExecutionMode m : ExecutionMode.values())
2437 +        for (Integer v1 : new Integer[] { 1, null })
2438 +        for (Integer v2 : new Integer[] { 2, null })
2439 +    {
2440 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2441 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2442 +        final FailingConsumer r = new FailingConsumer();
2443 +        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2444  
2445 <        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);
1370 <        checkCompletedWithWrappedCFException(h);
1371 <
1372 <        f = new CompletableFuture<Integer>();
1373 <        g = new CompletableFuture<Integer>();
1374 <        g.completeExceptionally(new CFException());
1375 <        f.complete(3);
1376 <        h = f.thenCombineAsync(g, subtract);
2445 >        g.complete(v2);
2446          checkCompletedWithWrappedCFException(h);
2447 <    }
2448 <
2449 <    /**
2450 <     * 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 <    }
2447 >        f.complete(v1);
2448 >        checkCompletedNormally(f, v1);
2449 >        checkCompletedNormally(g, v2);
2450 >    }}
2451  
2452      /**
2453 <     * thenCombineAsync result completes exceptionally if either source cancelled
2453 >     * acceptEither result completes exceptionally if either source cancelled
2454       */
2455 <    public void testThenCombineAsync4() {
2456 <        CompletableFuture<Integer> f, g, h;
2455 >    public void testAcceptEither_sourceCancelled1() {
2456 >        for (ExecutionMode m : ExecutionMode.values())
2457 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2458 >        for (Integer v1 : new Integer[] { 1, null })
2459 >    {
2460 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2461 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2462 >        final IncAction r = new IncAction();
2463 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2464  
2465 <        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);
2465 >        assertTrue(f.cancel(mayInterruptIfRunning));
2466          checkCompletedWithWrappedCancellationException(h);
2467 +        g.complete(v1);
2468  
2469 <        f = new CompletableFuture<Integer>();
2470 <        g = new CompletableFuture<Integer>();
2471 <        h = f.thenCombineAsync(g, subtract);
1413 <        assertTrue(g.cancel(true));
1414 <        checkIncomplete(h);
1415 <        f.complete(3);
2469 >        checkCancelled(f);
2470 >        assertEquals(0, r.invocationCount);
2471 >        checkCompletedNormally(g, v1);
2472          checkCompletedWithWrappedCancellationException(h);
2473 +    }}
2474  
2475 <        f = new CompletableFuture<Integer>();
2476 <        g = new CompletableFuture<Integer>();
2477 <        g.complete(3);
2478 <        assertTrue(f.cancel(true));
2479 <        h = f.thenCombineAsync(g, subtract);
2475 >    public void testAcceptEither_sourceCancelled2() {
2476 >        for (ExecutionMode m : ExecutionMode.values())
2477 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2478 >        for (Integer v1 : new Integer[] { 1, null })
2479 >    {
2480 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2481 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2482 >        final IncAction r = new IncAction();
2483 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2484 >
2485 >        assertTrue(g.cancel(mayInterruptIfRunning));
2486          checkCompletedWithWrappedCancellationException(h);
2487 +        f.complete(v1);
2488  
2489 <        f = new CompletableFuture<Integer>();
2490 <        g = new CompletableFuture<Integer>();
2491 <        f.complete(3);
1428 <        assertTrue(g.cancel(true));
1429 <        h = f.thenCombineAsync(g, subtract);
2489 >        checkCancelled(g);
2490 >        assertEquals(0, r.invocationCount);
2491 >        checkCompletedNormally(f, v1);
2492          checkCompletedWithWrappedCancellationException(h);
2493 <    }
2493 >    }}
2494  
2495 <    /**
2496 <     * thenAcceptBothAsync result completes normally after normal
2497 <     * completion of sources
2498 <     */
2499 <    public void testThenAcceptBothAsync() {
2500 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2501 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2502 <        AddAction r = new AddAction();
2503 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
2504 <        f.complete(one);
2505 <        checkIncomplete(g);
2506 <        f2.complete(two);
1445 <        checkCompletedNormally(g, null);
1446 <        assertEquals(r.value, 3);
1447 <    }
2495 >    public void testAcceptEither_sourceCancelled3() {
2496 >        for (ExecutionMode m : ExecutionMode.values())
2497 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2498 >        for (Integer v1 : new Integer[] { 1, null })
2499 >    {
2500 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2501 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2502 >        final IncAction r = new IncAction();
2503 >
2504 >        assertTrue(g.cancel(mayInterruptIfRunning));
2505 >        f.complete(v1);
2506 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2507  
2508 <    /**
2509 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2510 <     * completion of source
2511 <     */
2512 <    public void testThenAcceptBothAsync2() {
2513 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2514 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2515 <        AddAction r = new AddAction();
2516 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
2517 <        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 <    }
2508 >        // unspecified behavior
2509 >        Integer v;
2510 >        try {
2511 >            assertNull(h.join());
2512 >            assertEquals(1, r.invocationCount);
2513 >            assertEquals(inc(v1), r.value);
2514 >        } catch (CompletionException ok) {
2515 >            checkCompletedWithWrappedCancellationException(h);
2516 >            assertEquals(0, r.invocationCount);
2517 >        }
2518  
2519 <    /**
2520 <     * thenAcceptBothAsync result completes exceptionally if action does
2521 <     */
2522 <    public void testThenAcceptBothAsync3() {
2523 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2524 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2525 <        FailingBiConsumer r = new FailingBiConsumer();
2526 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
2527 <        f.complete(one);
2528 <        checkIncomplete(g);
2529 <        f2.complete(two);
2530 <        checkCompletedWithWrappedCFException(g);
2531 <    }
2519 >        checkCancelled(g);
2520 >        checkCompletedNormally(f, v1);
2521 >    }}
2522 >
2523 >    public void testAcceptEither_sourceCancelled4() {
2524 >        for (ExecutionMode m : ExecutionMode.values())
2525 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2526 >        for (Integer v1 : new Integer[] { 1, null })
2527 >    {
2528 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2529 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2530 >        final IncAction r = new IncAction();
2531 >
2532 >        assertTrue(f.cancel(mayInterruptIfRunning));
2533 >        g.complete(v1);
2534 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2535  
2536 <    /**
2537 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2538 <     */
2539 <    public void testThenAcceptBothAsync4() {
2540 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2541 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2542 <        AddAction r = new AddAction();
2543 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
2544 <        assertTrue(f.cancel(true));
2545 <        f2.complete(two);
1495 <        checkCompletedWithWrappedCancellationException(g);
2536 >        // unspecified behavior
2537 >        Integer v;
2538 >        try {
2539 >            assertNull(h.join());
2540 >            assertEquals(1, r.invocationCount);
2541 >            assertEquals(inc(v1), r.value);
2542 >        } catch (CompletionException ok) {
2543 >            checkCompletedWithWrappedCancellationException(h);
2544 >            assertEquals(0, r.invocationCount);
2545 >        }
2546  
2547 <        r = new AddAction();
2548 <        f = new CompletableFuture<Integer>();
2549 <        f2 = new CompletableFuture<Integer>();
1500 <        g = f.thenAcceptBothAsync(f2, r);
1501 <        f.complete(one);
1502 <        assertTrue(f2.cancel(true));
1503 <        checkCompletedWithWrappedCancellationException(g);
1504 <    }
2547 >        checkCancelled(f);
2548 >        checkCompletedNormally(g, v1);
2549 >    }}
2550  
2551      /**
2552 <     * runAfterBothAsync result completes normally after normal
2553 <     * completion of sources
2552 >     * runAfterEither result completes normally after normal completion
2553 >     * of either source
2554       */
2555 <    public void testRunAfterBothAsync() {
2556 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2557 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2558 <        Noop r = new Noop();
2559 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
2560 <        f.complete(one);
2561 <        checkIncomplete(g);
2562 <        f2.complete(two);
2563 <        checkCompletedNormally(g, null);
2564 <        assertTrue(r.ran);
2565 <    }
2555 >    public void testRunAfterEither_normalCompletion1() {
2556 >        for (ExecutionMode m : ExecutionMode.values())
2557 >        for (Integer v1 : new Integer[] { 1, null })
2558 >        for (Integer v2 : new Integer[] { 2, null })
2559 >    {
2560 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2561 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2562 >        final Noop r = new Noop();
2563 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2564 >
2565 >        f.complete(v1);
2566 >        checkCompletedNormally(h, null);
2567 >        assertEquals(1, r.invocationCount);
2568 >        g.complete(v2);
2569 >
2570 >        checkCompletedNormally(f, v1);
2571 >        checkCompletedNormally(g, v2);
2572 >        checkCompletedNormally(h, null);
2573 >        assertEquals(1, r.invocationCount);
2574 >    }}
2575 >
2576 >    public void testRunAfterEither_normalCompletion2() {
2577 >        for (ExecutionMode m : ExecutionMode.values())
2578 >        for (Integer v1 : new Integer[] { 1, null })
2579 >        for (Integer v2 : new Integer[] { 2, null })
2580 >    {
2581 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2582 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2583 >        final Noop r = new Noop();
2584 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2585 >
2586 >        g.complete(v2);
2587 >        checkCompletedNormally(h, null);
2588 >        assertEquals(1, r.invocationCount);
2589 >        f.complete(v1);
2590 >
2591 >        checkCompletedNormally(f, v1);
2592 >        checkCompletedNormally(g, v2);
2593 >        checkCompletedNormally(h, null);
2594 >        assertEquals(1, r.invocationCount);
2595 >        }}
2596 >
2597 >    public void testRunAfterEither_normalCompletion3() {
2598 >        for (ExecutionMode m : ExecutionMode.values())
2599 >        for (Integer v1 : new Integer[] { 1, null })
2600 >        for (Integer v2 : new Integer[] { 2, null })
2601 >    {
2602 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2603 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2604 >        final Noop r = new Noop();
2605 >
2606 >        f.complete(v1);
2607 >        g.complete(v2);
2608 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2609 >
2610 >        checkCompletedNormally(h, null);
2611 >        checkCompletedNormally(f, v1);
2612 >        checkCompletedNormally(g, v2);
2613 >        assertEquals(1, r.invocationCount);
2614 >    }}
2615  
2616      /**
2617 <     * runAfterBothAsync result completes exceptionally after exceptional
2618 <     * completion of source
2617 >     * runAfterEither result completes exceptionally after exceptional
2618 >     * completion of either source
2619       */
2620 <    public void testRunAfterBothAsync2() {
2621 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2622 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2623 <        Noop r = new Noop();
2624 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
2625 <        f.completeExceptionally(new CFException());
2626 <        f2.complete(two);
2627 <        checkCompletedWithWrappedCFException(g);
2620 >    public void testRunAfterEither_exceptionalCompletion1() {
2621 >        for (ExecutionMode m : ExecutionMode.values())
2622 >        for (Integer v1 : new Integer[] { 1, null })
2623 >    {
2624 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2625 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2626 >        final Noop r = new Noop();
2627 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2628 >        final CFException ex = new CFException();
2629 >
2630 >        f.completeExceptionally(ex);
2631 >        checkCompletedWithWrappedCFException(h, ex);
2632 >        g.complete(v1);
2633 >
2634 >        assertEquals(0, r.invocationCount);
2635 >        checkCompletedNormally(g, v1);
2636 >        checkCompletedWithWrappedCFException(f, ex);
2637 >        checkCompletedWithWrappedCFException(h, ex);
2638 >    }}
2639 >
2640 >    public void testRunAfterEither_exceptionalCompletion2() {
2641 >        for (ExecutionMode m : ExecutionMode.values())
2642 >        for (Integer v1 : new Integer[] { 1, null })
2643 >    {
2644 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2645 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2646 >        final Noop r = new Noop();
2647 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2648 >        final CFException ex = new CFException();
2649 >
2650 >        g.completeExceptionally(ex);
2651 >        checkCompletedWithWrappedCFException(h, ex);
2652 >        f.complete(v1);
2653 >
2654 >        assertEquals(0, r.invocationCount);
2655 >        checkCompletedNormally(f, v1);
2656 >        checkCompletedWithWrappedCFException(g, ex);
2657 >        checkCompletedWithWrappedCFException(h, ex);
2658 >    }}
2659 >
2660 >    public void testRunAfterEither_exceptionalCompletion3() {
2661 >        for (ExecutionMode m : ExecutionMode.values())
2662 >        for (Integer v1 : new Integer[] { 1, null })
2663 >    {
2664 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2665 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2666 >        final Noop r = new Noop();
2667 >        final CFException ex = new CFException();
2668 >
2669 >        g.completeExceptionally(ex);
2670 >        f.complete(v1);
2671 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2672  
2673 <        r = new Noop();
2674 <        f = new CompletableFuture<Integer>();
2675 <        f2 = new CompletableFuture<Integer>();
2676 <        g = f.runAfterBothAsync(f2, r);
2677 <        f.complete(one);
2678 <        f2.completeExceptionally(new CFException());
2679 <        checkCompletedWithWrappedCFException(g);
2680 <    }
2673 >        // unspecified behavior
2674 >        Integer v;
2675 >        try {
2676 >            assertNull(h.join());
2677 >            assertEquals(1, r.invocationCount);
2678 >        } catch (CompletionException ok) {
2679 >            checkCompletedWithWrappedCFException(h, ex);
2680 >            assertEquals(0, r.invocationCount);
2681 >        }
2682  
2683 <    /**
2684 <     * runAfterBothAsync result completes exceptionally if action does
2685 <     */
2686 <    public void testRunAfterBothAsync3() {
2687 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2688 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2689 <        FailingNoop r = new FailingNoop();
2690 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
2691 <        f.complete(one);
2692 <        checkIncomplete(g);
2693 <        f2.complete(two);
2694 <        checkCompletedWithWrappedCFException(g);
2695 <    }
2683 >        checkCompletedWithWrappedCFException(g, ex);
2684 >        checkCompletedNormally(f, v1);
2685 >    }}
2686 >
2687 >    public void testRunAfterEither_exceptionalCompletion4() {
2688 >        for (ExecutionMode m : ExecutionMode.values())
2689 >        for (Integer v1 : new Integer[] { 1, null })
2690 >    {
2691 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2692 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2693 >        final Noop r = new Noop();
2694 >        final CFException ex = new CFException();
2695 >
2696 >        f.completeExceptionally(ex);
2697 >        g.complete(v1);
2698 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2699  
2700 <    /**
2701 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2702 <     */
2703 <    public void testRunAfterBothAsync4() {
2704 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2705 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2706 <        Noop r = new Noop();
2707 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
2708 <        assertTrue(f.cancel(true));
1567 <        f2.complete(two);
1568 <        checkCompletedWithWrappedCancellationException(g);
2700 >        // unspecified behavior
2701 >        Integer v;
2702 >        try {
2703 >            assertNull(h.join());
2704 >            assertEquals(1, r.invocationCount);
2705 >        } catch (CompletionException ok) {
2706 >            checkCompletedWithWrappedCFException(h, ex);
2707 >            assertEquals(0, r.invocationCount);
2708 >        }
2709  
2710 <        r = new Noop();
2711 <        f = new CompletableFuture<Integer>();
2712 <        f2 = new CompletableFuture<Integer>();
1573 <        g = f.runAfterBothAsync(f2, r);
1574 <        f.complete(one);
1575 <        assertTrue(f2.cancel(true));
1576 <        checkCompletedWithWrappedCancellationException(g);
1577 <    }
2710 >        checkCompletedWithWrappedCFException(f, ex);
2711 >        checkCompletedNormally(g, v1);
2712 >    }}
2713  
2714      /**
2715 <     * applyToEitherAsync result completes normally after normal
1581 <     * completion of sources
2715 >     * runAfterEither result completes exceptionally if action does
2716       */
2717 <    public void testApplyToEitherAsync() {
2718 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2719 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2720 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2721 <        f.complete(one);
2722 <        checkCompletedNormally(g, two);
2717 >    public void testRunAfterEither_actionFailed1() {
2718 >        for (ExecutionMode m : ExecutionMode.values())
2719 >        for (Integer v1 : new Integer[] { 1, null })
2720 >        for (Integer v2 : new Integer[] { 2, null })
2721 >    {
2722 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2723 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2724 >        final FailingNoop r = new FailingNoop();
2725 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2726  
2727 <        f = new CompletableFuture<Integer>();
2728 <        f.complete(one);
2729 <        f2 = new CompletableFuture<Integer>();
2730 <        g = f.applyToEitherAsync(f2, inc);
2731 <        checkCompletedNormally(g, two);
2732 <    }
2733 <
2734 <    /**
2735 <     * applyToEitherAsync result completes exceptionally after exceptional
2736 <     * completion of source
2737 <     */
2738 <    public void testApplyToEitherAsync2() {
2739 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2740 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2741 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2742 <        f.completeExceptionally(new CFException());
1606 <        checkCompletedWithWrappedCFException(g);
2727 >        f.complete(v1);
2728 >        checkCompletedWithWrappedCFException(h);
2729 >        g.complete(v2);
2730 >        checkCompletedNormally(f, v1);
2731 >        checkCompletedNormally(g, v2);
2732 >    }}
2733 >
2734 >    public void testRunAfterEither_actionFailed2() {
2735 >        for (ExecutionMode m : ExecutionMode.values())
2736 >        for (Integer v1 : new Integer[] { 1, null })
2737 >        for (Integer v2 : new Integer[] { 2, null })
2738 >    {
2739 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2740 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2741 >        final FailingNoop r = new FailingNoop();
2742 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2743  
2744 <        f = new CompletableFuture<Integer>();
2745 <        f2 = new CompletableFuture<Integer>();
2746 <        f2.completeExceptionally(new CFException());
2747 <        g = f.applyToEitherAsync(f2, inc);
2748 <        f.complete(one);
2749 <        checkCompletedWithWrappedCFException(g);
1614 <    }
2744 >        g.complete(v2);
2745 >        checkCompletedWithWrappedCFException(h);
2746 >        f.complete(v1);
2747 >        checkCompletedNormally(f, v1);
2748 >        checkCompletedNormally(g, v2);
2749 >    }}
2750  
2751      /**
2752 <     * applyToEitherAsync result completes exceptionally if action does
2752 >     * runAfterEither result completes exceptionally if either source cancelled
2753       */
2754 <    public void testApplyToEitherAsync3() {
2755 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2756 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2757 <        FailingFunction r = new FailingFunction();
2758 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2759 <        f.complete(one);
2760 <        checkCompletedWithWrappedCFException(g);
2761 <    }
2754 >    public void testRunAfterEither_sourceCancelled1() {
2755 >        for (ExecutionMode m : ExecutionMode.values())
2756 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2757 >        for (Integer v1 : new Integer[] { 1, null })
2758 >    {
2759 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2760 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2761 >        final Noop r = new Noop();
2762 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2763  
2764 <    /**
2765 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2766 <     */
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);
2764 >        assertTrue(f.cancel(mayInterruptIfRunning));
2765 >        checkCompletedWithWrappedCancellationException(h);
2766 >        g.complete(v1);
2767  
2768 <        f = new CompletableFuture<Integer>();
2769 <        f2 = new CompletableFuture<Integer>();
2770 <        assertTrue(f2.cancel(true));
2771 <        g = f.applyToEitherAsync(f2, inc);
2772 <        checkCompletedWithWrappedCancellationException(g);
1643 <    }
2768 >        checkCancelled(f);
2769 >        assertEquals(0, r.invocationCount);
2770 >        checkCompletedNormally(g, v1);
2771 >        checkCompletedWithWrappedCancellationException(h);
2772 >    }}
2773  
2774 <    /**
2775 <     * acceptEitherAsync result completes normally after normal
2776 <     * completion of sources
2777 <     */
2778 <    public void testAcceptEitherAsync() {
2779 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2780 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2781 <        IncAction r = new IncAction();
2782 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1654 <        f.complete(one);
1655 <        checkCompletedNormally(g, null);
1656 <        assertEquals(r.value, 2);
2774 >    public void testRunAfterEither_sourceCancelled2() {
2775 >        for (ExecutionMode m : ExecutionMode.values())
2776 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2777 >        for (Integer v1 : new Integer[] { 1, null })
2778 >    {
2779 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2780 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2781 >        final Noop r = new Noop();
2782 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2783  
2784 <        r = new IncAction();
2785 <        f = new CompletableFuture<Integer>();
2786 <        f.complete(one);
1661 <        f2 = new CompletableFuture<Integer>();
1662 <        g = f.acceptEitherAsync(f2, r);
1663 <        checkCompletedNormally(g, null);
1664 <        assertEquals(r.value, 2);
1665 <    }
2784 >        assertTrue(g.cancel(mayInterruptIfRunning));
2785 >        checkCompletedWithWrappedCancellationException(h);
2786 >        f.complete(v1);
2787  
2788 <    /**
2789 <     * acceptEitherAsync result completes exceptionally after exceptional
2790 <     * completion of source
2791 <     */
2792 <    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);
2788 >        checkCancelled(g);
2789 >        assertEquals(0, r.invocationCount);
2790 >        checkCompletedNormally(f, v1);
2791 >        checkCompletedWithWrappedCancellationException(h);
2792 >    }}
2793  
2794 <        r = new IncAction();
2795 <        f = new CompletableFuture<Integer>();
2796 <        f2 = new CompletableFuture<Integer>();
2797 <        f2.completeExceptionally(new CFException());
2798 <        g = f.acceptEitherAsync(f2, r);
2799 <        f.complete(one);
2800 <        checkCompletedWithWrappedCFException(g);
2801 <    }
2794 >    public void testRunAfterEither_sourceCancelled3() {
2795 >        for (ExecutionMode m : ExecutionMode.values())
2796 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2797 >        for (Integer v1 : new Integer[] { 1, null })
2798 >    {
2799 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2801 >        final Noop r = new Noop();
2802 >
2803 >        assertTrue(g.cancel(mayInterruptIfRunning));
2804 >        f.complete(v1);
2805 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2806  
2807 <    /**
2808 <     * acceptEitherAsync result completes exceptionally if action does
2809 <     */
2810 <    public void testAcceptEitherAsync3() {
2811 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2812 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2813 <        FailingConsumer r = new FailingConsumer();
2814 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2815 <        f.complete(one);
1697 <        checkCompletedWithWrappedCFException(g);
1698 <    }
2807 >        // unspecified behavior
2808 >        Integer v;
2809 >        try {
2810 >            assertNull(h.join());
2811 >            assertEquals(1, r.invocationCount);
2812 >        } catch (CompletionException ok) {
2813 >            checkCompletedWithWrappedCancellationException(h);
2814 >            assertEquals(0, r.invocationCount);
2815 >        }
2816  
2817 <    /**
2818 <     * acceptEitherAsync result completes exceptionally if either
2819 <     * source cancelled
2820 <     */
2821 <    public void testAcceptEitherAsync4() {
2822 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2823 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2824 <        IncAction r = new IncAction();
2825 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2826 <        assertTrue(f.cancel(true));
2827 <        checkCompletedWithWrappedCancellationException(g);
2817 >        checkCancelled(g);
2818 >        checkCompletedNormally(f, v1);
2819 >    }}
2820 >
2821 >    public void testRunAfterEither_sourceCancelled4() {
2822 >        for (ExecutionMode m : ExecutionMode.values())
2823 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2824 >        for (Integer v1 : new Integer[] { 1, null })
2825 >    {
2826 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2827 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2828 >        final Noop r = new Noop();
2829 >
2830 >        assertTrue(f.cancel(mayInterruptIfRunning));
2831 >        g.complete(v1);
2832 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2833  
2834 <        r = new IncAction();
2835 <        f = new CompletableFuture<Integer>();
2836 <        f2 = new CompletableFuture<Integer>();
2837 <        assertTrue(f2.cancel(true));
2838 <        g = f.acceptEitherAsync(f2, r);
2839 <        checkCompletedWithWrappedCancellationException(g);
2840 <    }
2834 >        // unspecified behavior
2835 >        Integer v;
2836 >        try {
2837 >            assertNull(h.join());
2838 >            assertEquals(1, r.invocationCount);
2839 >        } catch (CompletionException ok) {
2840 >            checkCompletedWithWrappedCancellationException(h);
2841 >            assertEquals(0, r.invocationCount);
2842 >        }
2843 >
2844 >        checkCancelled(f);
2845 >        checkCompletedNormally(g, v1);
2846 >    }}
2847  
2848      /**
2849 <     * runAfterEitherAsync result completes normally after normal
1722 <     * completion of sources
2849 >     * thenCompose result completes normally after normal completion of source
2850       */
2851 <    public void testRunAfterEitherAsync() {
2852 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2853 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2854 <        Noop r = new Noop();
2855 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2856 <        f.complete(one);
2857 <        checkCompletedNormally(g, null);
2858 <        assertTrue(r.ran);
2859 <
2860 <        r = new Noop();
2861 <        f = new CompletableFuture<Integer>();
2862 <        f.complete(one);
2863 <        f2 = new CompletableFuture<Integer>();
2864 <        g = f.runAfterEitherAsync(f2, r);
2865 <        checkCompletedNormally(g, null);
1739 <        assertTrue(r.ran);
1740 <    }
2851 >    public void testThenCompose_normalCompletion() {
2852 >        for (ExecutionMode m : ExecutionMode.values())
2853 >        for (boolean createIncomplete : new boolean[] { true, false })
2854 >        for (Integer v1 : new Integer[] { 1, null })
2855 >    {
2856 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 >        final CompletableFutureInc r = new CompletableFutureInc();
2858 >        if (!createIncomplete) f.complete(v1);
2859 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2860 >        if (createIncomplete) f.complete(v1);
2861 >
2862 >        checkCompletedNormally(g, inc(v1));
2863 >        checkCompletedNormally(f, v1);
2864 >        assertEquals(1, r.invocationCount);
2865 >    }}
2866  
2867      /**
2868 <     * runAfterEitherAsync result completes exceptionally after exceptional
2868 >     * thenCompose result completes exceptionally after exceptional
2869       * completion of source
2870       */
2871 <    public void testRunAfterEitherAsync2() {
2872 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2873 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2874 <        Noop r = new Noop();
2875 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2876 <        f.completeExceptionally(new CFException());
2877 <        checkCompletedWithWrappedCFException(g);
2878 <
2879 <        r = new Noop();
2880 <        f = new CompletableFuture<Integer>();
2881 <        f2 = new CompletableFuture<Integer>();
2882 <        f2.completeExceptionally(new CFException());
2883 <        g = f.runAfterEitherAsync(f2, r);
2884 <        f.complete(one);
2885 <        checkCompletedWithWrappedCFException(g);
1761 <    }
2871 >    public void testThenCompose_exceptionalCompletion() {
2872 >        for (ExecutionMode m : ExecutionMode.values())
2873 >        for (boolean createIncomplete : new boolean[] { true, false })
2874 >    {
2875 >        final CFException ex = new CFException();
2876 >        final CompletableFutureInc r = new CompletableFutureInc();
2877 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2878 >        if (!createIncomplete) f.completeExceptionally(ex);
2879 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2880 >        if (createIncomplete) f.completeExceptionally(ex);
2881 >
2882 >        checkCompletedWithWrappedCFException(g, ex);
2883 >        checkCompletedWithWrappedCFException(f, ex);
2884 >        assertEquals(0, r.invocationCount);
2885 >    }}
2886  
2887      /**
2888 <     * runAfterEitherAsync result completes exceptionally if action does
2888 >     * thenCompose result completes exceptionally if action does
2889       */
2890 <    public void testRunAfterEitherAsync3() {
2891 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2892 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2893 <        FailingNoop r = new FailingNoop();
2894 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2895 <        f.complete(one);
2890 >    public void testThenCompose_actionFailed() {
2891 >        for (ExecutionMode m : ExecutionMode.values())
2892 >        for (boolean createIncomplete : new boolean[] { true, false })
2893 >        for (Integer v1 : new Integer[] { 1, null })
2894 >    {
2895 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2896 >        final FailingCompletableFutureFunction r
2897 >            = new FailingCompletableFutureFunction();
2898 >        if (!createIncomplete) f.complete(v1);
2899 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2900 >        if (createIncomplete) f.complete(v1);
2901 >
2902          checkCompletedWithWrappedCFException(g);
2903 <    }
2903 >        checkCompletedNormally(f, v1);
2904 >    }}
2905  
2906      /**
2907 <     * runAfterEitherAsync result completes exceptionally if either
1777 <     * source cancelled
2907 >     * thenCompose result completes exceptionally if source cancelled
2908       */
2909 <    public void testRunAfterEitherAsync4() {
2910 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2911 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2912 <        Noop r = new Noop();
2913 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2914 <        assertTrue(f.cancel(true));
2915 <        checkCompletedWithWrappedCancellationException(g);
2909 >    public void testThenCompose_sourceCancelled() {
2910 >        for (ExecutionMode m : ExecutionMode.values())
2911 >        for (boolean createIncomplete : new boolean[] { true, false })
2912 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2913 >    {
2914 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2915 >        final CompletableFutureInc r = new CompletableFutureInc();
2916 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2917 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2918 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2919  
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);
2920          checkCompletedWithWrappedCancellationException(g);
2921 <    }
2921 >        checkCancelled(f);
2922 >    }}
2923 >
2924 >    // asyncs
2925  
2926      /**
2927 <     * thenComposeAsync result completes normally after normal
1797 <     * completion of source
2927 >     * thenApplyAsync result completes normally after normal completion of source
2928       */
2929 <    public void testThenComposeAsync() {
2930 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2931 <        CompletableFutureInc r = new CompletableFutureInc();
1802 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
2929 >    public void testThenApplyAsync() {
2930 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2931 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2932          f.complete(one);
2933          checkCompletedNormally(g, two);
2934      }
2935  
2936      /**
2937 <     * thenComposeAsync result completes exceptionally after
2938 <     * exceptional completion of source
2937 >     * thenApplyAsync result completes exceptionally after exceptional
2938 >     * completion of source
2939       */
2940 <    public void testThenComposeAsync2() {
2941 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2942 <        CompletableFutureInc r = new CompletableFutureInc();
1814 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
2940 >    public void testThenApplyAsync2() {
2941 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2942 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2943          f.completeExceptionally(new CFException());
2944          checkCompletedWithWrappedCFException(g);
2945      }
2946  
2947      /**
2948 <     * thenComposeAsync result completes exceptionally if action does
2948 >     * thenApplyAsync result completes exceptionally if action does
2949       */
2950 <    public void testThenComposeAsync3() {
2951 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2952 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2953 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
2954 <        f.complete(one);
2950 >    public void testThenApplyAsync3() {
2951 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2952 >        FailingFunction r = new FailingFunction();
2953 >        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2954 >        f.complete(null);
2955          checkCompletedWithWrappedCFException(g);
2956      }
2957  
2958      /**
2959 <     * thenComposeAsync result completes exceptionally if source cancelled
2959 >     * thenApplyAsync result completes exceptionally if source cancelled
2960       */
2961 <    public void testThenComposeAsync4() {
2962 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2963 <        CompletableFutureInc r = new CompletableFutureInc();
1836 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
2961 >    public void testThenApplyAsync4() {
2962 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2963 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2964          assertTrue(f.cancel(true));
2965          checkCompletedWithWrappedCancellationException(g);
2966      }
2967  
1841
1842    // async with explicit executors
1843
2968      /**
2969 <     * thenRunAsync result completes normally after normal completion of source
2969 >     * thenAcceptAsync result completes normally after normal
2970 >     * completion of source
2971       */
2972 <    public void testThenRunAsyncE() {
2973 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2974 <        Noop r = new Noop();
2975 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2976 <        f.complete(null);
1852 <        checkCompletedNormally(g, null);
1853 <
1854 <        // reordered version
1855 <        f = new CompletableFuture<Integer>();
1856 <        f.complete(null);
1857 <        r = new Noop();
1858 <        g = f.thenRunAsync(r, new ThreadExecutor());
2972 >    public void testThenAcceptAsync() {
2973 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2974 >        IncAction r = new IncAction();
2975 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2976 >        f.complete(one);
2977          checkCompletedNormally(g, null);
2978 +        assertEquals(r.value, (Integer) 2);
2979      }
2980  
2981      /**
2982 <     * thenRunAsync result completes exceptionally after exceptional
2982 >     * thenAcceptAsync result completes exceptionally after exceptional
2983       * completion of source
2984       */
2985 <    public void testThenRunAsync2E() {
2986 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2987 <        Noop r = new Noop();
2988 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2985 >    public void testThenAcceptAsync2() {
2986 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2987 >        IncAction r = new IncAction();
2988 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2989          f.completeExceptionally(new CFException());
1871        try {
1872            g.join();
1873            shouldThrow();
1874        } catch (Exception ok) {
1875        }
2990          checkCompletedWithWrappedCFException(g);
2991      }
2992  
2993      /**
2994 <     * thenRunAsync result completes exceptionally if action does
2994 >     * thenAcceptAsync result completes exceptionally if action does
2995       */
2996 <    public void testThenRunAsync3E() {
2997 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2998 <        FailingNoop r = new FailingNoop();
2999 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2996 >    public void testThenAcceptAsync3() {
2997 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2998 >        FailingConsumer r = new FailingConsumer();
2999 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3000          f.complete(null);
3001          checkCompletedWithWrappedCFException(g);
3002      }
3003  
3004      /**
3005 <     * thenRunAsync result completes exceptionally if source cancelled
3005 >     * thenAcceptAsync result completes exceptionally if source cancelled
3006       */
3007 <    public void testThenRunAsync4E() {
3008 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3009 <        Noop r = new Noop();
3010 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3007 >    public void testThenAcceptAsync4() {
3008 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3009 >        IncAction r = new IncAction();
3010 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3011          assertTrue(f.cancel(true));
3012          checkCompletedWithWrappedCancellationException(g);
3013      }
3014  
3015 +    // async with explicit executors
3016 +
3017      /**
3018       * thenApplyAsync result completes normally after normal completion of source
3019       */
3020      public void testThenApplyAsyncE() {
3021 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3021 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3022          CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3023          f.complete(one);
3024          checkCompletedNormally(g, two);
# Line 1913 | Line 3029 | public class CompletableFutureTest exten
3029       * completion of source
3030       */
3031      public void testThenApplyAsync2E() {
3032 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3032 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3033          CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3034          f.completeExceptionally(new CFException());
3035          checkCompletedWithWrappedCFException(g);
# Line 1923 | Line 3039 | public class CompletableFutureTest exten
3039       * thenApplyAsync result completes exceptionally if action does
3040       */
3041      public void testThenApplyAsync3E() {
3042 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3042 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3043          FailingFunction r = new FailingFunction();
3044          CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3045          f.complete(null);
# Line 1934 | Line 3050 | public class CompletableFutureTest exten
3050       * thenApplyAsync result completes exceptionally if source cancelled
3051       */
3052      public void testThenApplyAsync4E() {
3053 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3053 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3054          CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3055          assertTrue(f.cancel(true));
3056          checkCompletedWithWrappedCancellationException(g);
# Line 1945 | Line 3061 | public class CompletableFutureTest exten
3061       * completion of source
3062       */
3063      public void testThenAcceptAsyncE() {
3064 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3064 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3065          IncAction r = new IncAction();
3066          CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3067          f.complete(one);
3068          checkCompletedNormally(g, null);
3069 <        assertEquals(r.value, 2);
3069 >        assertEquals(r.value, (Integer) 2);
3070      }
3071  
3072      /**
# Line 1958 | Line 3074 | public class CompletableFutureTest exten
3074       * completion of source
3075       */
3076      public void testThenAcceptAsync2E() {
3077 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3077 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3078          IncAction r = new IncAction();
3079          CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3080          f.completeExceptionally(new CFException());
# Line 1969 | Line 3085 | public class CompletableFutureTest exten
3085       * thenAcceptAsync result completes exceptionally if action does
3086       */
3087      public void testThenAcceptAsync3E() {
3088 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3088 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3089          FailingConsumer r = new FailingConsumer();
3090          CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3091          f.complete(null);
# Line 1980 | Line 3096 | public class CompletableFutureTest exten
3096       * thenAcceptAsync result completes exceptionally if source cancelled
3097       */
3098      public void testThenAcceptAsync4E() {
3099 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3099 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3100          IncAction r = new IncAction();
3101          CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3102          assertTrue(f.cancel(true));
3103          checkCompletedWithWrappedCancellationException(g);
3104      }
3105  
1990    /**
1991     * thenCombineAsync result completes normally after normal
1992     * 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    }
2025
2026    /**
2027     * thenCombineAsync result completes exceptionally after exceptional
2028     * completion of either source
2029     */
2030    public void testThenCombineAsync2E() {
2031        CompletableFuture<Integer> f, g, h;
2032        ThreadExecutor e = new ThreadExecutor();
2033        int count = 0;
2034
2035        f = new CompletableFuture<Integer>();
2036        g = new CompletableFuture<Integer>();
2037        h = f.thenCombineAsync(g, subtract, e);
2038        f.completeExceptionally(new CFException());
2039        checkIncomplete(h);
2040        g.complete(1);
2041        checkCompletedWithWrappedCFException(h);
2042
2043        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);
2049        checkCompletedWithWrappedCFException(h);
2050
2051        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);
2057        checkCompletedWithWrappedCFException(h);
2058
2059        assertEquals(0, e.count.get());
2060    }
2061
2062    /**
2063     * 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
2080     */
2081    public void testThenCombineAsync4E() {
2082        CompletableFuture<Integer> f, g, h;
2083        ThreadExecutor e = new ThreadExecutor();
2084
2085        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);
2091        checkCompletedWithWrappedCancellationException(h);
2092
2093        f = new CompletableFuture<Integer>();
2094        g = new CompletableFuture<Integer>();
2095        h = f.thenCombineAsync(g, subtract, e);
2096        assertTrue(g.cancel(true));
2097        checkIncomplete(h);
2098        f.complete(3);
2099        checkCompletedWithWrappedCancellationException(h);
2100
2101        f = new CompletableFuture<Integer>();
2102        g = new CompletableFuture<Integer>();
2103        assertTrue(g.cancel(true));
2104        h = f.thenCombineAsync(g, subtract, e);
2105        checkIncomplete(h);
2106        f.complete(3);
2107        checkCompletedWithWrappedCancellationException(h);
2108
2109        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);
2114        checkCompletedWithWrappedCancellationException(h);
2115
2116        assertEquals(0, e.count.get());
2117    }
2118
2119    /**
2120     * 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);
2343
2344        r = new IncAction();
2345        f = new CompletableFuture<Integer>();
2346        f.complete(one);
2347        f2 = new CompletableFuture<Integer>();
2348        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2349        checkCompletedNormally(g, null);
2350        assertEquals(r.value, 2);
2351    }
2352
2353    /**
2354     * acceptEitherAsync result completes exceptionally after exceptional
2355     * completion of source
2356     */
2357    public void testAcceptEitherAsync2E() {
2358        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2359        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2360        IncAction r = new IncAction();
2361        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    }
2373
2374    /**
2375     * acceptEitherAsync result completes exceptionally if action does
2376     */
2377    public void testAcceptEitherAsync3E() {
2378        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2379        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2380        FailingConsumer r = new FailingConsumer();
2381        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2382        f.complete(one);
2383        checkCompletedWithWrappedCFException(g);
2384    }
2385
2386    /**
2387     * acceptEitherAsync result completes exceptionally if either
2388     * source cancelled
2389     */
2390    public void testAcceptEitherAsync4E() {
2391        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2392        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2393        IncAction r = new IncAction();
2394        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2395        assertTrue(f.cancel(true));
2396        checkCompletedWithWrappedCancellationException(g);
2397
2398        r = new IncAction();
2399        f = new CompletableFuture<Integer>();
2400        f2 = new CompletableFuture<Integer>();
2401        assertTrue(f2.cancel(true));
2402        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2403        checkCompletedWithWrappedCancellationException(g);
2404    }
2405
2406    /**
2407     * runAfterEitherAsync result completes normally after normal
2408     * completion of sources
2409     */
2410    public void testRunAfterEitherAsyncE() {
2411        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2412        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2413        Noop r = new Noop();
2414        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2415        f.complete(one);
2416        checkCompletedNormally(g, null);
2417        assertTrue(r.ran);
2418
2419        r = new Noop();
2420        f = new CompletableFuture<Integer>();
2421        f.complete(one);
2422        f2 = new CompletableFuture<Integer>();
2423        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2424        checkCompletedNormally(g, null);
2425        assertTrue(r.ran);
2426    }
2427
2428    /**
2429     * runAfterEitherAsync result completes exceptionally after exceptional
2430     * completion of source
2431     */
2432    public void testRunAfterEitherAsync2E() {
2433        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2434        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2435        Noop r = new Noop();
2436        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2437        f.completeExceptionally(new CFException());
2438        checkCompletedWithWrappedCFException(g);
2439
2440        r = new Noop();
2441        f = new CompletableFuture<Integer>();
2442        f2 = new CompletableFuture<Integer>();
2443        f2.completeExceptionally(new CFException());
2444        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2445        f.complete(one);
2446        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    }
2480
2481    /**
2482     * thenComposeAsync result completes normally after normal
2483     * completion of source
2484     */
2485    public void testThenComposeAsyncE() {
2486        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2487        CompletableFutureInc r = new CompletableFutureInc();
2488        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2489        f.complete(one);
2490        checkCompletedNormally(g, two);
2491    }
2492
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());
2502        checkCompletedWithWrappedCFException(g);
2503    }
2504
2505    /**
2506     * thenComposeAsync result completes exceptionally if action does
2507     */
2508    public void testThenComposeAsync3E() {
2509        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2510        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2511        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2512        f.complete(one);
2513        checkCompletedWithWrappedCFException(g);
2514    }
2515
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));
2524        checkCompletedWithWrappedCancellationException(g);
2525    }
2526
3106      // other static methods
3107  
3108      /**
# Line 2531 | Line 3110 | public class CompletableFutureTest exten
3110       * with the value null
3111       */
3112      public void testAllOf_empty() throws Exception {
3113 <        CompletableFuture<?> f = CompletableFuture.allOf();
3113 >        CompletableFuture<Void> f = CompletableFuture.allOf();
3114          checkCompletedNormally(f, null);
3115      }
3116  
3117      /**
3118 <     * allOf returns a future completed when all components complete
3118 >     * allOf returns a future completed normally with the value null
3119 >     * when all components complete normally
3120       */
3121 <    public void testAllOf() throws Exception {
3121 >    public void testAllOf_normal() throws Exception {
3122          for (int k = 1; k < 20; ++k) {
3123 <            CompletableFuture[] fs = new CompletableFuture[k];
3123 >            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3124              for (int i = 0; i < k; ++i)
3125 <                fs[i] = new CompletableFuture<Integer>();
3125 >                fs[i] = new CompletableFuture<>();
3126              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3127              for (int i = 0; i < k; ++i) {
3128                  checkIncomplete(f);
3129 +                checkIncomplete(CompletableFuture.allOf(fs));
3130                  fs[i].complete(one);
3131              }
3132              checkCompletedNormally(f, null);
3133 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3134          }
3135      }
3136  
# Line 2556 | Line 3138 | public class CompletableFutureTest exten
3138       * anyOf(no component futures) returns an incomplete future
3139       */
3140      public void testAnyOf_empty() throws Exception {
3141 <        CompletableFuture<?> f = CompletableFuture.anyOf();
3141 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
3142          checkIncomplete(f);
3143      }
3144  
3145      /**
3146 <     * anyOf returns a future completed when any components complete
3146 >     * anyOf returns a future completed normally with a value when
3147 >     * a component future does
3148       */
3149 <    public void testAnyOf() throws Exception {
3150 <        for (int k = 1; k < 20; ++k) {
3149 >    public void testAnyOf_normal() throws Exception {
3150 >        for (int k = 0; k < 10; ++k) {
3151              CompletableFuture[] fs = new CompletableFuture[k];
3152              for (int i = 0; i < k; ++i)
3153 <                fs[i] = new CompletableFuture<Integer>();
3153 >                fs[i] = new CompletableFuture<>();
3154              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3155              checkIncomplete(f);
3156              for (int i = 0; i < k; ++i) {
3157                  fs[i].complete(one);
3158                  checkCompletedNormally(f, one);
3159 +                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3160 +            }
3161 +        }
3162 +    }
3163 +
3164 +    /**
3165 +     * anyOf result completes exceptionally when any component does.
3166 +     */
3167 +    public void testAnyOf_exceptional() throws Exception {
3168 +        for (int k = 0; k < 10; ++k) {
3169 +            CompletableFuture[] fs = new CompletableFuture[k];
3170 +            for (int i = 0; i < k; ++i)
3171 +                fs[i] = new CompletableFuture<>();
3172 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3173 +            checkIncomplete(f);
3174 +            for (int i = 0; i < k; ++i) {
3175 +                fs[i].completeExceptionally(new CFException());
3176 +                checkCompletedWithWrappedCFException(f);
3177 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3178              }
3179          }
3180      }
# Line 2581 | Line 3183 | public class CompletableFutureTest exten
3183       * Completion methods throw NullPointerException with null arguments
3184       */
3185      public void testNPE() {
3186 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
3187 <        CompletableFuture<Integer> g = new CompletableFuture<Integer>();
3186 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3187 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3188          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3189          CompletableFuture<?> h;
3190          ThreadExecutor exec = new ThreadExecutor();
3191  
3192          Runnable[] throwingActions = {
3193 <            () -> { CompletableFuture.supplyAsync(null); },
3194 <            () -> { CompletableFuture.supplyAsync(null, exec); },
3195 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
3196 <
3197 <            () -> { CompletableFuture.runAsync(null); },
3198 <            () -> { CompletableFuture.runAsync(null, exec); },
3199 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
3200 <
3201 <            () -> { f.completeExceptionally(null); },
3202 <
3203 <            () -> { f.thenApply(null); },
3204 <            () -> { f.thenApplyAsync(null); },
3205 <            () -> { f.thenApplyAsync((x) -> x, null); },
3206 <            () -> { f.thenApplyAsync(null, exec); },
3207 <
3208 <            () -> { f.thenAccept(null); },
3209 <            () -> { f.thenAcceptAsync(null); },
3210 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
3211 <            () -> { f.thenAcceptAsync(null, exec); },
3212 <
3213 <            () -> { f.thenRun(null); },
3214 <            () -> { f.thenRunAsync(null); },
3215 <            () -> { f.thenRunAsync(() -> { ; }, null); },
3216 <            () -> { f.thenRunAsync(null, exec); },
3217 <
3218 <            () -> { f.thenCombine(g, null); },
3219 <            () -> { f.thenCombineAsync(g, null); },
3220 <            () -> { f.thenCombineAsync(g, null, exec); },
3221 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
3222 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
3223 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
3224 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
3225 <
3226 <            () -> { f.thenAcceptBoth(g, null); },
3227 <            () -> { f.thenAcceptBothAsync(g, null); },
3228 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
3229 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
3230 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
3231 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
3232 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
3233 <
3234 <            () -> { f.runAfterBoth(g, null); },
3235 <            () -> { f.runAfterBothAsync(g, null); },
3236 <            () -> { f.runAfterBothAsync(g, null, exec); },
3237 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
3238 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
3239 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
3240 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
3241 <
3242 <            () -> { f.applyToEither(g, null); },
3243 <            () -> { f.applyToEitherAsync(g, null); },
3244 <            () -> { f.applyToEitherAsync(g, null, exec); },
3245 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
3246 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
3247 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
3248 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
3249 <
3250 <            () -> { f.acceptEither(g, null); },
3251 <            () -> { f.acceptEitherAsync(g, null); },
3252 <            () -> { f.acceptEitherAsync(g, null, exec); },
3253 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
3254 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
3255 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
3256 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
3257 <
3258 <            () -> { f.runAfterEither(g, null); },
3259 <            () -> { f.runAfterEitherAsync(g, null); },
3260 <            () -> { f.runAfterEitherAsync(g, null, exec); },
3261 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
3262 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
3263 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
3264 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
3265 <
3266 <            () -> { f.thenCompose(null); },
3267 <            () -> { f.thenComposeAsync(null); },
3268 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
3269 <            () -> { f.thenComposeAsync(null, exec); },
3270 <
3271 <            () -> { f.exceptionally(null); },
3272 <
3273 <            () -> { f.handle(null); },
3274 <
3275 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
3276 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
3277 <            () -> { CompletableFuture.allOf(f, null); },
3278 <            () -> { CompletableFuture.allOf(null, f); },
3279 <
3280 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
3281 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
3282 <            () -> { CompletableFuture.anyOf(f, null); },
3283 <            () -> { CompletableFuture.anyOf(null, f); },
3193 >            () -> CompletableFuture.supplyAsync(null),
3194 >            () -> CompletableFuture.supplyAsync(null, exec),
3195 >            () -> CompletableFuture.supplyAsync(supplyOne, null),
3196 >
3197 >            () -> CompletableFuture.runAsync(null),
3198 >            () -> CompletableFuture.runAsync(null, exec),
3199 >            () -> CompletableFuture.runAsync(() -> {}, null),
3200 >
3201 >            () -> f.completeExceptionally(null),
3202 >
3203 >            () -> f.thenApply(null),
3204 >            () -> f.thenApplyAsync(null),
3205 >            () -> f.thenApplyAsync((x) -> x, null),
3206 >            () -> f.thenApplyAsync(null, exec),
3207 >
3208 >            () -> f.thenAccept(null),
3209 >            () -> f.thenAcceptAsync(null),
3210 >            () -> f.thenAcceptAsync((x) -> {} , null),
3211 >            () -> f.thenAcceptAsync(null, exec),
3212 >
3213 >            () -> f.thenRun(null),
3214 >            () -> f.thenRunAsync(null),
3215 >            () -> f.thenRunAsync(() -> {} , null),
3216 >            () -> f.thenRunAsync(null, exec),
3217 >
3218 >            () -> f.thenCombine(g, null),
3219 >            () -> f.thenCombineAsync(g, null),
3220 >            () -> f.thenCombineAsync(g, null, exec),
3221 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3222 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3223 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3224 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3225 >
3226 >            () -> f.thenAcceptBoth(g, null),
3227 >            () -> f.thenAcceptBothAsync(g, null),
3228 >            () -> f.thenAcceptBothAsync(g, null, exec),
3229 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3230 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3231 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3232 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3233 >
3234 >            () -> f.runAfterBoth(g, null),
3235 >            () -> f.runAfterBothAsync(g, null),
3236 >            () -> f.runAfterBothAsync(g, null, exec),
3237 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3238 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3239 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3240 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3241 >
3242 >            () -> f.applyToEither(g, null),
3243 >            () -> f.applyToEitherAsync(g, null),
3244 >            () -> f.applyToEitherAsync(g, null, exec),
3245 >            () -> f.applyToEither(nullFuture, (x) -> x),
3246 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3247 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3248 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
3249 >
3250 >            () -> f.acceptEither(g, null),
3251 >            () -> f.acceptEitherAsync(g, null),
3252 >            () -> f.acceptEitherAsync(g, null, exec),
3253 >            () -> f.acceptEither(nullFuture, (x) -> {}),
3254 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3255 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3256 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3257 >
3258 >            () -> f.runAfterEither(g, null),
3259 >            () -> f.runAfterEitherAsync(g, null),
3260 >            () -> f.runAfterEitherAsync(g, null, exec),
3261 >            () -> f.runAfterEither(nullFuture, () -> {}),
3262 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3263 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3264 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3265 >
3266 >            () -> f.thenCompose(null),
3267 >            () -> f.thenComposeAsync(null),
3268 >            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3269 >            () -> f.thenComposeAsync(null, exec),
3270 >
3271 >            () -> f.exceptionally(null),
3272 >
3273 >            () -> f.handle(null),
3274 >
3275 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3276 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3277 >            () -> CompletableFuture.allOf(f, null),
3278 >            () -> CompletableFuture.allOf(null, f),
3279 >
3280 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3281 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3282 >            () -> CompletableFuture.anyOf(f, null),
3283 >            () -> CompletableFuture.anyOf(null, f),
3284 >
3285 >            () -> f.obtrudeException(null),
3286          };
3287  
3288          assertThrows(NullPointerException.class, throwingActions);
3289          assertEquals(0, exec.count.get());
3290      }
3291  
3292 +    /**
3293 +     * toCompletableFuture returns this CompletableFuture.
3294 +     */
3295 +    public void testToCompletableFuture() {
3296 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3297 +        assertSame(f, f.toCompletableFuture());
3298 +    }
3299 +
3300 +    /**
3301 +     * whenComplete action executes on normal completion, propagating
3302 +     * source result.
3303 +     */
3304 +    public void testWhenComplete_normalCompletion1() {
3305 +        for (ExecutionMode m : ExecutionMode.values())
3306 +        for (boolean createIncomplete : new boolean[] { true, false })
3307 +        for (Integer v1 : new Integer[] { 1, null })
3308 +    {
3309 +        final AtomicInteger a = new AtomicInteger(0);
3310 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3311 +        if (!createIncomplete) f.complete(v1);
3312 +        final CompletableFuture<Integer> g = m.whenComplete
3313 +            (f,
3314 +             (Integer x, Throwable t) -> {
3315 +                threadAssertSame(x, v1);
3316 +                threadAssertNull(t);
3317 +                a.getAndIncrement();
3318 +            });
3319 +        if (createIncomplete) f.complete(v1);
3320 +
3321 +        checkCompletedNormally(g, v1);
3322 +        checkCompletedNormally(f, v1);
3323 +        assertEquals(1, a.get());
3324 +    }}
3325 +
3326 +    /**
3327 +     * whenComplete action executes on exceptional completion, propagating
3328 +     * source result.
3329 +     */
3330 +    public void testWhenComplete_exceptionalCompletion() {
3331 +        for (ExecutionMode m : ExecutionMode.values())
3332 +        for (boolean createIncomplete : new boolean[] { true, false })
3333 +        for (Integer v1 : new Integer[] { 1, null })
3334 +    {
3335 +        final AtomicInteger a = new AtomicInteger(0);
3336 +        final CFException ex = new CFException();
3337 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3338 +        if (!createIncomplete) f.completeExceptionally(ex);
3339 +        final CompletableFuture<Integer> g = m.whenComplete
3340 +            (f,
3341 +             (Integer x, Throwable t) -> {
3342 +                threadAssertNull(x);
3343 +                threadAssertSame(t, ex);
3344 +                a.getAndIncrement();
3345 +            });
3346 +        if (createIncomplete) f.completeExceptionally(ex);
3347 +        checkCompletedWithWrappedCFException(f, ex);
3348 +        checkCompletedWithWrappedCFException(g, ex);
3349 +        assertEquals(1, a.get());
3350 +    }}
3351 +
3352 +    /**
3353 +     * whenComplete action executes on cancelled source, propagating
3354 +     * CancellationException.
3355 +     */
3356 +    public void testWhenComplete_sourceCancelled() {
3357 +        for (ExecutionMode m : ExecutionMode.values())
3358 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3359 +        for (boolean createIncomplete : new boolean[] { true, false })
3360 +    {
3361 +        final AtomicInteger a = new AtomicInteger(0);
3362 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3363 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3364 +        final CompletableFuture<Integer> g = m.whenComplete
3365 +            (f,
3366 +             (Integer x, Throwable t) -> {
3367 +                threadAssertNull(x);
3368 +                threadAssertTrue(t instanceof CancellationException);
3369 +                a.getAndIncrement();
3370 +            });
3371 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3372 +
3373 +        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3374 +        checkCompletedWithWrappedCancellationException(g);
3375 +        checkCancelled(f);
3376 +        assertEquals(1, a.get());
3377 +    }}
3378 +
3379 +    /**
3380 +     * If a whenComplete action throws an exception when triggered by
3381 +     * a normal completion, it completes exceptionally
3382 +     */
3383 +    public void testWhenComplete_actionFailed() {
3384 +        for (boolean createIncomplete : new boolean[] { true, false })
3385 +        for (ExecutionMode m : ExecutionMode.values())
3386 +        for (Integer v1 : new Integer[] { 1, null })
3387 +    {
3388 +        final AtomicInteger a = new AtomicInteger(0);
3389 +        final CFException ex = new CFException();
3390 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3391 +        if (!createIncomplete) f.complete(v1);
3392 +        final CompletableFuture<Integer> g = m.whenComplete
3393 +            (f,
3394 +             (Integer x, Throwable t) -> {
3395 +                threadAssertSame(x, v1);
3396 +                threadAssertNull(t);
3397 +                a.getAndIncrement();
3398 +                throw ex;
3399 +            });
3400 +        if (createIncomplete) f.complete(v1);
3401 +        checkCompletedNormally(f, v1);
3402 +        checkCompletedWithWrappedCFException(g, ex);
3403 +        assertEquals(1, a.get());
3404 +    }}
3405 +
3406 +    /**
3407 +     * If a whenComplete action throws an exception when triggered by
3408 +     * a source completion that also throws an exception, the source
3409 +     * exception takes precedence.
3410 +     */
3411 +    public void testWhenComplete_actionFailedSourceFailed() {
3412 +        for (boolean createIncomplete : new boolean[] { true, false })
3413 +        for (ExecutionMode m : ExecutionMode.values())
3414 +        for (Integer v1 : new Integer[] { 1, null })
3415 +    {
3416 +        final AtomicInteger a = new AtomicInteger(0);
3417 +        final CFException ex1 = new CFException();
3418 +        final CFException ex2 = new CFException();
3419 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3420 +
3421 +        if (!createIncomplete) f.completeExceptionally(ex1);
3422 +        final CompletableFuture<Integer> g = m.whenComplete
3423 +            (f,
3424 +             (Integer x, Throwable t) -> {
3425 +                threadAssertSame(t, ex1);
3426 +                threadAssertNull(x);
3427 +                a.getAndIncrement();
3428 +                throw ex2;
3429 +            });
3430 +        if (createIncomplete) f.completeExceptionally(ex1);
3431 +
3432 +        checkCompletedWithWrappedCFException(f, ex1);
3433 +        checkCompletedWithWrappedCFException(g, ex1);
3434 +        assertEquals(1, a.get());
3435 +    }}
3436 +
3437   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines