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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines