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.35 by jsr166, Sun Jun 1 22:22:49 2014 UTC vs.
Revision 1.101 by jsr166, Sun Feb 22 04:34:44 2015 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import junit.framework.*;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 > import static java.util.concurrent.TimeUnit.SECONDS;
10 >
11 > import java.util.ArrayList;
12 > import java.util.List;
13 > import java.util.Objects;
14   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
15   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
16   import java.util.concurrent.CompletableFuture;
17   import java.util.concurrent.CompletionException;
18   import java.util.concurrent.CompletionStage;
19 + import java.util.concurrent.ExecutionException;
20 + import java.util.concurrent.Executor;
21 + import java.util.concurrent.ForkJoinPool;
22 + import java.util.concurrent.ForkJoinTask;
23   import java.util.concurrent.TimeoutException;
24   import java.util.concurrent.atomic.AtomicInteger;
22 import static java.util.concurrent.TimeUnit.MILLISECONDS;
23 import static java.util.concurrent.TimeUnit.SECONDS;
24 import java.util.*;
25 import java.util.function.Supplier;
26 import java.util.function.Consumer;
25   import java.util.function.BiConsumer;
28 import java.util.function.Function;
26   import java.util.function.BiFunction;
27 + import java.util.function.Consumer;
28 + import java.util.function.Function;
29 + import java.util.function.Supplier;
30 +
31 + import junit.framework.Test;
32 + import junit.framework.TestSuite;
33  
34   public class CompletableFutureTest extends JSR166TestCase {
35  
# Line 55 | Line 58 | public class CompletableFutureTest exten
58      }
59  
60      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
61 <        try {
62 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
60 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
61 >        checkTimedGet(f, value);
62 >
63          try {
64              assertEquals(value, f.join());
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 74 | Line 76 | public class CompletableFutureTest exten
76      }
77  
78      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
79 +        long startTime = System.nanoTime();
80 +        long timeoutMillis = LONG_DELAY_MS;
81          try {
82 <            f.get(LONG_DELAY_MS, MILLISECONDS);
82 >            f.get(timeoutMillis, MILLISECONDS);
83              shouldThrow();
84          } catch (ExecutionException success) {
85              assertTrue(success.getCause() instanceof CFException);
86          } catch (Throwable fail) { threadUnexpectedException(fail); }
87 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
88 +
89          try {
90              f.join();
91              shouldThrow();
# Line 103 | Line 109 | public class CompletableFutureTest exten
109          assertTrue(f.toString().contains("[Completed exceptionally]"));
110      }
111  
112 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
113 <                                              CFException ex) {
112 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
113 >                                                      Throwable ex) {
114 >        long startTime = System.nanoTime();
115 >        long timeoutMillis = LONG_DELAY_MS;
116          try {
117 <            f.get(LONG_DELAY_MS, MILLISECONDS);
117 >            f.get(timeoutMillis, MILLISECONDS);
118              shouldThrow();
119          } catch (ExecutionException success) {
120              assertSame(ex, success.getCause());
121          } catch (Throwable fail) { threadUnexpectedException(fail); }
122 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
123 +
124          try {
125              f.join();
126              shouldThrow();
# Line 129 | Line 139 | public class CompletableFutureTest exten
139          } catch (ExecutionException success) {
140              assertSame(ex, success.getCause());
141          } catch (Throwable fail) { threadUnexpectedException(fail); }
142 +
143          assertTrue(f.isDone());
144          assertFalse(f.isCancelled());
145          assertTrue(f.toString().contains("[Completed exceptionally]"));
146      }
147  
148 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
149 +                                                Throwable ex) {
150 +        checkCompletedExceptionallyWithRootCause(f, ex);
151 +        try {
152 +            CompletableFuture<Throwable> spy = f.handle
153 +                ((U u, Throwable t) -> t);
154 +            assertTrue(spy.join() instanceof CompletionException);
155 +            assertSame(ex, spy.join().getCause());
156 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
157 +    }
158 +
159 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
160 +        checkCompletedExceptionallyWithRootCause(f, ex);
161 +        try {
162 +            CompletableFuture<Throwable> spy = f.handle
163 +                ((U u, Throwable t) -> t);
164 +            assertSame(ex, spy.join());
165 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
166 +    }
167 +
168      void checkCancelled(CompletableFuture<?> f) {
169 +        long startTime = System.nanoTime();
170 +        long timeoutMillis = LONG_DELAY_MS;
171          try {
172 <            f.get(LONG_DELAY_MS, MILLISECONDS);
172 >            f.get(timeoutMillis, MILLISECONDS);
173              shouldThrow();
174          } catch (CancellationException success) {
175          } catch (Throwable fail) { threadUnexpectedException(fail); }
176 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
177 +
178          try {
179              f.join();
180              shouldThrow();
# Line 160 | Line 195 | public class CompletableFutureTest exten
195      }
196  
197      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
198 +        long startTime = System.nanoTime();
199 +        long timeoutMillis = LONG_DELAY_MS;
200          try {
201 <            f.get(LONG_DELAY_MS, MILLISECONDS);
201 >            f.get(timeoutMillis, MILLISECONDS);
202              shouldThrow();
203          } catch (ExecutionException success) {
204              assertTrue(success.getCause() instanceof CancellationException);
205          } catch (Throwable fail) { threadUnexpectedException(fail); }
206 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
207 +
208          try {
209              f.join();
210              shouldThrow();
# Line 204 | Line 243 | public class CompletableFutureTest exten
243       * isCancelled, join, get, and getNow
244       */
245      public void testComplete() {
246 +        for (Integer v1 : new Integer[] { 1, null })
247 +    {
248          CompletableFuture<Integer> f = new CompletableFuture<>();
249          checkIncomplete(f);
250 <        f.complete(one);
251 <        checkCompletedNormally(f, one);
252 <    }
250 >        assertTrue(f.complete(v1));
251 >        assertFalse(f.complete(v1));
252 >        checkCompletedNormally(f, v1);
253 >    }}
254  
255      /**
256       * completeExceptionally completes exceptionally, as indicated by
# Line 216 | Line 258 | public class CompletableFutureTest exten
258       */
259      public void testCompleteExceptionally() {
260          CompletableFuture<Integer> f = new CompletableFuture<>();
261 +        CFException ex = new CFException();
262          checkIncomplete(f);
263 <        f.completeExceptionally(new CFException());
264 <        checkCompletedWithWrappedCFException(f);
263 >        f.completeExceptionally(ex);
264 >        checkCompletedExceptionally(f, ex);
265      }
266  
267      /**
# Line 226 | Line 269 | public class CompletableFutureTest exten
269       * methods isDone, isCancelled, join, get, and getNow
270       */
271      public void testCancel() {
272 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
273 +    {
274          CompletableFuture<Integer> f = new CompletableFuture<>();
275          checkIncomplete(f);
276 <        assertTrue(f.cancel(true));
276 >        assertTrue(f.cancel(mayInterruptIfRunning));
277 >        assertTrue(f.cancel(mayInterruptIfRunning));
278 >        assertTrue(f.cancel(!mayInterruptIfRunning));
279          checkCancelled(f);
280 <    }
280 >    }}
281  
282      /**
283       * obtrudeValue forces completion with given value
# Line 238 | Line 285 | public class CompletableFutureTest exten
285      public void testObtrudeValue() {
286          CompletableFuture<Integer> f = new CompletableFuture<>();
287          checkIncomplete(f);
288 <        f.complete(one);
288 >        assertTrue(f.complete(one));
289          checkCompletedNormally(f, one);
290          f.obtrudeValue(three);
291          checkCompletedNormally(f, three);
# Line 247 | Line 294 | public class CompletableFutureTest exten
294          f = new CompletableFuture<>();
295          f.obtrudeValue(three);
296          checkCompletedNormally(f, three);
297 +        f.obtrudeValue(null);
298 +        checkCompletedNormally(f, null);
299          f = new CompletableFuture<>();
300          f.completeExceptionally(new CFException());
301          f.obtrudeValue(four);
# Line 257 | Line 306 | public class CompletableFutureTest exten
306       * obtrudeException forces completion with given exception
307       */
308      public void testObtrudeException() {
309 <        CompletableFuture<Integer> f = new CompletableFuture<>();
310 <        checkIncomplete(f);
311 <        f.complete(one);
312 <        checkCompletedNormally(f, one);
313 <        f.obtrudeException(new CFException());
265 <        checkCompletedWithWrappedCFException(f);
309 >        for (Integer v1 : new Integer[] { 1, null })
310 >    {
311 >        CFException ex;
312 >        CompletableFuture<Integer> f;
313 >
314          f = new CompletableFuture<>();
315 <        f.obtrudeException(new CFException());
316 <        checkCompletedWithWrappedCFException(f);
315 >        assertTrue(f.complete(v1));
316 >        for (int i = 0; i < 2; i++) {
317 >            f.obtrudeException(ex = new CFException());
318 >            checkCompletedExceptionally(f, ex);
319 >        }
320 >
321 >        f = new CompletableFuture<>();
322 >        for (int i = 0; i < 2; i++) {
323 >            f.obtrudeException(ex = new CFException());
324 >            checkCompletedExceptionally(f, ex);
325 >        }
326 >
327          f = new CompletableFuture<>();
328 +        f.completeExceptionally(ex = new CFException());
329 +        f.obtrudeValue(v1);
330 +        checkCompletedNormally(f, v1);
331 +        f.obtrudeException(ex = new CFException());
332 +        checkCompletedExceptionally(f, ex);
333          f.completeExceptionally(new CFException());
334 <        f.obtrudeValue(four);
335 <        checkCompletedNormally(f, four);
336 <        f.obtrudeException(new CFException());
337 <        checkCompletedWithWrappedCFException(f);
275 <    }
334 >        checkCompletedExceptionally(f, ex);
335 >        assertFalse(f.complete(v1));
336 >        checkCompletedExceptionally(f, ex);
337 >    }}
338  
339      /**
340       * getNumberOfDependents returns number of dependent tasks
341       */
342      public void testGetNumberOfDependents() {
343 +        for (ExecutionMode m : ExecutionMode.values())
344 +        for (Integer v1 : new Integer[] { 1, null })
345 +    {
346          CompletableFuture<Integer> f = new CompletableFuture<>();
347 <        assertEquals(f.getNumberOfDependents(), 0);
348 <        CompletableFuture g = f.thenRun(new Noop());
349 <        assertEquals(f.getNumberOfDependents(), 1);
350 <        assertEquals(g.getNumberOfDependents(), 0);
351 <        CompletableFuture h = f.thenRun(new Noop());
352 <        assertEquals(f.getNumberOfDependents(), 2);
353 <        f.complete(1);
347 >        assertEquals(0, f.getNumberOfDependents());
348 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
349 >        assertEquals(1, f.getNumberOfDependents());
350 >        assertEquals(0, g.getNumberOfDependents());
351 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
352 >        assertEquals(2, f.getNumberOfDependents());
353 >        assertEquals(0, h.getNumberOfDependents());
354 >        assertTrue(f.complete(v1));
355          checkCompletedNormally(g, null);
356 <        assertEquals(f.getNumberOfDependents(), 0);
357 <        assertEquals(g.getNumberOfDependents(), 0);
358 <    }
356 >        checkCompletedNormally(h, null);
357 >        assertEquals(0, f.getNumberOfDependents());
358 >        assertEquals(0, g.getNumberOfDependents());
359 >        assertEquals(0, h.getNumberOfDependents());
360 >    }}
361  
362      /**
363       * toString indicates current completion state
# Line 300 | Line 368 | public class CompletableFutureTest exten
368          f = new CompletableFuture<String>();
369          assertTrue(f.toString().contains("[Not completed]"));
370  
371 <        f.complete("foo");
371 >        assertTrue(f.complete("foo"));
372          assertTrue(f.toString().contains("[Completed normally]"));
373  
374          f = new CompletableFuture<String>();
375 <        f.completeExceptionally(new IndexOutOfBoundsException());
375 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
376          assertTrue(f.toString().contains("[Completed exceptionally]"));
377 +
378 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
379 +            f = new CompletableFuture<String>();
380 +            assertTrue(f.cancel(mayInterruptIfRunning));
381 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
382 +        }
383      }
384  
385      /**
# Line 316 | Line 390 | public class CompletableFutureTest exten
390          checkCompletedNormally(f, "test");
391      }
392  
393 <    // Choose non-commutative actions for better coverage
393 >    abstract class CheckedAction {
394 >        int invocationCount = 0;
395 >        final ExecutionMode m;
396 >        CheckedAction(ExecutionMode m) { this.m = m; }
397 >        void invoked() {
398 >            m.checkExecutionMode();
399 >            assertEquals(0, invocationCount++);
400 >        }
401 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
402 >        void assertInvoked() { assertEquals(1, invocationCount); }
403 >    }
404  
405 <    static final Supplier<Integer> supplyOne =
406 <        () -> Integer.valueOf(1);
407 <    static final Function<Integer, Integer> inc =
408 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
409 <    static final BiFunction<Integer, Integer, Integer> subtract =
410 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
327 <    static final class IncAction implements Consumer<Integer> {
328 <        int value;
329 <        public void accept(Integer x) { value = x.intValue() + 1; }
330 <    }
331 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
332 <        // Handle null values as well
333 <        public int subtract(Integer x, Integer y) {
334 <            return ((x == null) ? 42 : x.intValue())
335 <                - ((y == null) ? 99 : y.intValue());
405 >    abstract class CheckedIntegerAction extends CheckedAction {
406 >        Integer value;
407 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
408 >        void assertValue(Integer expected) {
409 >            assertInvoked();
410 >            assertEquals(expected, value);
411          }
412 <        int value;
413 <        public boolean ran() { return value != 0; }
412 >    }
413 >
414 >    class IntegerSupplier extends CheckedAction
415 >        implements Supplier<Integer>
416 >    {
417 >        final Integer value;
418 >        IntegerSupplier(ExecutionMode m, Integer value) {
419 >            super(m);
420 >            this.value = value;
421 >        }
422 >        public Integer get() {
423 >            invoked();
424 >            return value;
425 >        }
426 >    }
427 >
428 >    // A function that handles and produces null values as well.
429 >    static Integer inc(Integer x) {
430 >        return (x == null) ? null : x + 1;
431 >    }
432 >
433 >    class NoopConsumer extends CheckedIntegerAction
434 >        implements Consumer<Integer>
435 >    {
436 >        NoopConsumer(ExecutionMode m) { super(m); }
437 >        public void accept(Integer x) {
438 >            invoked();
439 >            value = x;
440 >        }
441 >    }
442 >
443 >    class IncFunction extends CheckedIntegerAction
444 >        implements Function<Integer,Integer>
445 >    {
446 >        IncFunction(ExecutionMode m) { super(m); }
447 >        public Integer apply(Integer x) {
448 >            invoked();
449 >            return value = inc(x);
450 >        }
451 >    }
452 >
453 >    // Choose non-commutative actions for better coverage
454 >    // A non-commutative function that handles and produces null values as well.
455 >    static Integer subtract(Integer x, Integer y) {
456 >        return (x == null && y == null) ? null :
457 >            ((x == null) ? 42 : x.intValue())
458 >            - ((y == null) ? 99 : y.intValue());
459 >    }
460 >
461 >    class SubtractAction extends CheckedIntegerAction
462 >        implements BiConsumer<Integer, Integer>
463 >    {
464 >        SubtractAction(ExecutionMode m) { super(m); }
465          public void accept(Integer x, Integer y) {
466 +            invoked();
467              value = subtract(x, y);
468          }
469      }
470 <    static final class Noop implements Runnable {
471 <        boolean ran;
472 <        public void run() { ran = true; }
470 >
471 >    class SubtractFunction extends CheckedIntegerAction
472 >        implements BiFunction<Integer, Integer, Integer>
473 >    {
474 >        SubtractFunction(ExecutionMode m) { super(m); }
475 >        public Integer apply(Integer x, Integer y) {
476 >            invoked();
477 >            return value = subtract(x, y);
478 >        }
479      }
480  
481 <    static final class FailingSupplier implements Supplier<Integer> {
482 <        boolean ran;
483 <        public Integer get() { ran = true; throw new CFException(); }
481 >    class Noop extends CheckedAction implements Runnable {
482 >        Noop(ExecutionMode m) { super(m); }
483 >        public void run() {
484 >            invoked();
485 >        }
486      }
487 <    static final class FailingConsumer implements Consumer<Integer> {
488 <        boolean ran;
489 <        public void accept(Integer x) { ran = true; throw new CFException(); }
487 >
488 >    class FailingSupplier extends CheckedAction
489 >        implements Supplier<Integer>
490 >    {
491 >        FailingSupplier(ExecutionMode m) { super(m); }
492 >        public Integer get() {
493 >            invoked();
494 >            throw new CFException();
495 >        }
496 >    }
497 >
498 >    class FailingConsumer extends CheckedIntegerAction
499 >        implements Consumer<Integer>
500 >    {
501 >        FailingConsumer(ExecutionMode m) { super(m); }
502 >        public void accept(Integer x) {
503 >            invoked();
504 >            value = x;
505 >            throw new CFException();
506 >        }
507      }
508 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
509 <        boolean ran;
510 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
508 >
509 >    class FailingBiConsumer extends CheckedIntegerAction
510 >        implements BiConsumer<Integer, Integer>
511 >    {
512 >        FailingBiConsumer(ExecutionMode m) { super(m); }
513 >        public void accept(Integer x, Integer y) {
514 >            invoked();
515 >            value = subtract(x, y);
516 >            throw new CFException();
517 >        }
518      }
519 <    static final class FailingFunction implements Function<Integer, Integer> {
520 <        boolean ran;
521 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
519 >
520 >    class FailingFunction extends CheckedIntegerAction
521 >        implements Function<Integer, Integer>
522 >    {
523 >        FailingFunction(ExecutionMode m) { super(m); }
524 >        public Integer apply(Integer x) {
525 >            invoked();
526 >            value = x;
527 >            throw new CFException();
528 >        }
529      }
530 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
531 <        boolean ran;
532 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
530 >
531 >    class FailingBiFunction extends CheckedIntegerAction
532 >        implements BiFunction<Integer, Integer, Integer>
533 >    {
534 >        FailingBiFunction(ExecutionMode m) { super(m); }
535 >        public Integer apply(Integer x, Integer y) {
536 >            invoked();
537 >            value = subtract(x, y);
538 >            throw new CFException();
539 >        }
540      }
541 <    static final class FailingNoop implements Runnable {
542 <        boolean ran;
543 <        public void run() { ran = true; throw new CFException(); }
541 >
542 >    class FailingRunnable extends CheckedAction implements Runnable {
543 >        FailingRunnable(ExecutionMode m) { super(m); }
544 >        public void run() {
545 >            invoked();
546 >            throw new CFException();
547 >        }
548      }
549  
550 <    static final class CompletableFutureInc
551 <        implements Function<Integer, CompletableFuture<Integer>> {
552 <        boolean ran;
550 >    class CompletableFutureInc extends CheckedIntegerAction
551 >        implements Function<Integer, CompletableFuture<Integer>>
552 >    {
553 >        CompletableFutureInc(ExecutionMode m) { super(m); }
554          public CompletableFuture<Integer> apply(Integer x) {
555 <            ran = true;
555 >            invoked();
556 >            value = x;
557              CompletableFuture<Integer> f = new CompletableFuture<>();
558 <            f.complete(Integer.valueOf(x.intValue() + 1));
558 >            assertTrue(f.complete(inc(x)));
559              return f;
560          }
561      }
562  
563 <    static final class FailingCompletableFutureFunction
564 <        implements Function<Integer, CompletableFuture<Integer>> {
565 <        boolean ran;
563 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
564 >        implements Function<Integer, CompletableFuture<Integer>>
565 >    {
566 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
567          public CompletableFuture<Integer> apply(Integer x) {
568 <            ran = true; throw new CFException();
568 >            invoked();
569 >            value = x;
570 >            throw new CFException();
571          }
572      }
573  
574      // Used for explicit executor tests
575      static final class ThreadExecutor implements Executor {
576 <        AtomicInteger count = new AtomicInteger(0);
576 >        final AtomicInteger count = new AtomicInteger(0);
577 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
578 >        static boolean startedCurrentThread() {
579 >            return Thread.currentThread().getThreadGroup() == tg;
580 >        }
581  
582          public void execute(Runnable r) {
583              count.getAndIncrement();
584 <            new Thread(r).start();
584 >            new Thread(tg, r).start();
585          }
586      }
587  
588 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
589 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
404 <    }
405 <
406 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
407 <        boolean ran;
408 <        public Integer apply(Integer x, Throwable t) {
409 <            ran = true;
410 <            return (t == null) ? two : three;
411 <        }
412 <    }
588 >    static final boolean defaultExecutorIsCommonPool
589 >        = ForkJoinPool.getCommonPoolParallelism() > 1;
590  
591      /**
592       * Permits the testing of parallel code for the 3 different
593 <     * execution modes without repeating all the testing code.
593 >     * execution modes without copy/pasting all the test methods.
594       */
595      enum ExecutionMode {
596 <        DEFAULT {
596 >        SYNC {
597 >            public void checkExecutionMode() {
598 >                assertFalse(ThreadExecutor.startedCurrentThread());
599 >                assertNull(ForkJoinTask.getPool());
600 >            }
601 >            public CompletableFuture<Void> runAsync(Runnable a) {
602 >                throw new UnsupportedOperationException();
603 >            }
604 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
605 >                throw new UnsupportedOperationException();
606 >            }
607 >            public <T> CompletableFuture<Void> thenRun
608 >                (CompletableFuture<T> f, Runnable a) {
609 >                return f.thenRun(a);
610 >            }
611 >            public <T> CompletableFuture<Void> thenAccept
612 >                (CompletableFuture<T> f, Consumer<? super T> a) {
613 >                return f.thenAccept(a);
614 >            }
615 >            public <T,U> CompletableFuture<U> thenApply
616 >                (CompletableFuture<T> f, Function<? super T,U> a) {
617 >                return f.thenApply(a);
618 >            }
619 >            public <T,U> CompletableFuture<U> thenCompose
620 >                (CompletableFuture<T> f,
621 >                 Function<? super T,? extends CompletionStage<U>> a) {
622 >                return f.thenCompose(a);
623 >            }
624 >            public <T,U> CompletableFuture<U> handle
625 >                (CompletableFuture<T> f,
626 >                 BiFunction<? super T,Throwable,? extends U> a) {
627 >                return f.handle(a);
628 >            }
629 >            public <T> CompletableFuture<T> whenComplete
630 >                (CompletableFuture<T> f,
631 >                 BiConsumer<? super T,? super Throwable> a) {
632 >                return f.whenComplete(a);
633 >            }
634              public <T,U> CompletableFuture<Void> runAfterBoth
635                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
636                  return f.runAfterBoth(g, a);
# Line 427 | Line 641 | public class CompletableFutureTest exten
641                   BiConsumer<? super T,? super U> a) {
642                  return f.thenAcceptBoth(g, a);
643              }
644 +            public <T,U,V> CompletableFuture<V> thenCombine
645 +                (CompletableFuture<T> f,
646 +                 CompletionStage<? extends U> g,
647 +                 BiFunction<? super T,? super U,? extends V> a) {
648 +                return f.thenCombine(g, a);
649 +            }
650 +            public <T> CompletableFuture<Void> runAfterEither
651 +                (CompletableFuture<T> f,
652 +                 CompletionStage<?> g,
653 +                 java.lang.Runnable a) {
654 +                return f.runAfterEither(g, a);
655 +            }
656 +            public <T> CompletableFuture<Void> acceptEither
657 +                (CompletableFuture<T> f,
658 +                 CompletionStage<? extends T> g,
659 +                 Consumer<? super T> a) {
660 +                return f.acceptEither(g, a);
661 +            }
662 +            public <T,U> CompletableFuture<U> applyToEither
663 +                (CompletableFuture<T> f,
664 +                 CompletionStage<? extends T> g,
665 +                 Function<? super T,U> a) {
666 +                return f.applyToEither(g, a);
667 +            }
668          },
669  
670 < //             /** Experimental way to do more testing */
671 < //         REVERSE_DEFAULT {
672 < //             public <T,U> CompletableFuture<Void> runAfterBoth
673 < //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
674 < //                 return g.runAfterBoth(f, a);
675 < //             }
676 < //             public <T,U> CompletableFuture<Void> thenAcceptBoth
677 < //                 (CompletableFuture<T> f,
678 < //                  CompletionStage<? extends U> g,
679 < //                  BiConsumer<? super T,? super U> a) {
680 < //                 return DEFAULT.thenAcceptBoth(f, g, a);
681 < //             }
682 < //         },
683 <
684 <        DEFAULT_ASYNC {
670 >        ASYNC {
671 >            public void checkExecutionMode() {
672 >                assertEquals(defaultExecutorIsCommonPool,
673 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
674 >            }
675 >            public CompletableFuture<Void> runAsync(Runnable a) {
676 >                return CompletableFuture.runAsync(a);
677 >            }
678 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
679 >                return CompletableFuture.supplyAsync(a);
680 >            }
681 >            public <T> CompletableFuture<Void> thenRun
682 >                (CompletableFuture<T> f, Runnable a) {
683 >                return f.thenRunAsync(a);
684 >            }
685 >            public <T> CompletableFuture<Void> thenAccept
686 >                (CompletableFuture<T> f, Consumer<? super T> a) {
687 >                return f.thenAcceptAsync(a);
688 >            }
689 >            public <T,U> CompletableFuture<U> thenApply
690 >                (CompletableFuture<T> f, Function<? super T,U> a) {
691 >                return f.thenApplyAsync(a);
692 >            }
693 >            public <T,U> CompletableFuture<U> thenCompose
694 >                (CompletableFuture<T> f,
695 >                 Function<? super T,? extends CompletionStage<U>> a) {
696 >                return f.thenComposeAsync(a);
697 >            }
698 >            public <T,U> CompletableFuture<U> handle
699 >                (CompletableFuture<T> f,
700 >                 BiFunction<? super T,Throwable,? extends U> a) {
701 >                return f.handleAsync(a);
702 >            }
703 >            public <T> CompletableFuture<T> whenComplete
704 >                (CompletableFuture<T> f,
705 >                 BiConsumer<? super T,? super Throwable> a) {
706 >                return f.whenCompleteAsync(a);
707 >            }
708              public <T,U> CompletableFuture<Void> runAfterBoth
709                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
710                  return f.runAfterBothAsync(g, a);
# Line 454 | Line 715 | public class CompletableFutureTest exten
715                   BiConsumer<? super T,? super U> a) {
716                  return f.thenAcceptBothAsync(g, a);
717              }
718 +            public <T,U,V> CompletableFuture<V> thenCombine
719 +                (CompletableFuture<T> f,
720 +                 CompletionStage<? extends U> g,
721 +                 BiFunction<? super T,? super U,? extends V> a) {
722 +                return f.thenCombineAsync(g, a);
723 +            }
724 +            public <T> CompletableFuture<Void> runAfterEither
725 +                (CompletableFuture<T> f,
726 +                 CompletionStage<?> g,
727 +                 java.lang.Runnable a) {
728 +                return f.runAfterEitherAsync(g, a);
729 +            }
730 +            public <T> CompletableFuture<Void> acceptEither
731 +                (CompletableFuture<T> f,
732 +                 CompletionStage<? extends T> g,
733 +                 Consumer<? super T> a) {
734 +                return f.acceptEitherAsync(g, a);
735 +            }
736 +            public <T,U> CompletableFuture<U> applyToEither
737 +                (CompletableFuture<T> f,
738 +                 CompletionStage<? extends T> g,
739 +                 Function<? super T,U> a) {
740 +                return f.applyToEitherAsync(g, a);
741 +            }
742          },
743  
459 //         REVERSE_DEFAULT_ASYNC {
460 //             public <T,U> CompletableFuture<Void> runAfterBoth
461 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
462 //                 return f.runAfterBothAsync(g, a);
463 //             }
464 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
465 //                 (CompletableFuture<T> f,
466 //                  CompletionStage<? extends U> g,
467 //                  BiConsumer<? super T,? super U> a) {
468 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
469 //             }
470 //         },
471
744          EXECUTOR {
745 +            public void checkExecutionMode() {
746 +                assertTrue(ThreadExecutor.startedCurrentThread());
747 +            }
748 +            public CompletableFuture<Void> runAsync(Runnable a) {
749 +                return CompletableFuture.runAsync(a, new ThreadExecutor());
750 +            }
751 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
752 +                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
753 +            }
754 +            public <T> CompletableFuture<Void> thenRun
755 +                (CompletableFuture<T> f, Runnable a) {
756 +                return f.thenRunAsync(a, new ThreadExecutor());
757 +            }
758 +            public <T> CompletableFuture<Void> thenAccept
759 +                (CompletableFuture<T> f, Consumer<? super T> a) {
760 +                return f.thenAcceptAsync(a, new ThreadExecutor());
761 +            }
762 +            public <T,U> CompletableFuture<U> thenApply
763 +                (CompletableFuture<T> f, Function<? super T,U> a) {
764 +                return f.thenApplyAsync(a, new ThreadExecutor());
765 +            }
766 +            public <T,U> CompletableFuture<U> thenCompose
767 +                (CompletableFuture<T> f,
768 +                 Function<? super T,? extends CompletionStage<U>> a) {
769 +                return f.thenComposeAsync(a, new ThreadExecutor());
770 +            }
771 +            public <T,U> CompletableFuture<U> handle
772 +                (CompletableFuture<T> f,
773 +                 BiFunction<? super T,Throwable,? extends U> a) {
774 +                return f.handleAsync(a, new ThreadExecutor());
775 +            }
776 +            public <T> CompletableFuture<T> whenComplete
777 +                (CompletableFuture<T> f,
778 +                 BiConsumer<? super T,? super Throwable> a) {
779 +                return f.whenCompleteAsync(a, new ThreadExecutor());
780 +            }
781              public <T,U> CompletableFuture<Void> runAfterBoth
782                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
783                  return f.runAfterBothAsync(g, a, new ThreadExecutor());
# Line 480 | Line 788 | public class CompletableFutureTest exten
788                   BiConsumer<? super T,? super U> a) {
789                  return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
790              }
791 +            public <T,U,V> CompletableFuture<V> thenCombine
792 +                (CompletableFuture<T> f,
793 +                 CompletionStage<? extends U> g,
794 +                 BiFunction<? super T,? super U,? extends V> a) {
795 +                return f.thenCombineAsync(g, a, new ThreadExecutor());
796 +            }
797 +            public <T> CompletableFuture<Void> runAfterEither
798 +                (CompletableFuture<T> f,
799 +                 CompletionStage<?> g,
800 +                 java.lang.Runnable a) {
801 +                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
802 +            }
803 +            public <T> CompletableFuture<Void> acceptEither
804 +                (CompletableFuture<T> f,
805 +                 CompletionStage<? extends T> g,
806 +                 Consumer<? super T> a) {
807 +                return f.acceptEitherAsync(g, a, new ThreadExecutor());
808 +            }
809 +            public <T,U> CompletableFuture<U> applyToEither
810 +                (CompletableFuture<T> f,
811 +                 CompletionStage<? extends T> g,
812 +                 Function<? super T,U> a) {
813 +                return f.applyToEitherAsync(g, a, new ThreadExecutor());
814 +            }
815          };
816  
817 +        public abstract void checkExecutionMode();
818 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
819 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
820 +        public abstract <T> CompletableFuture<Void> thenRun
821 +            (CompletableFuture<T> f, Runnable a);
822 +        public abstract <T> CompletableFuture<Void> thenAccept
823 +            (CompletableFuture<T> f, Consumer<? super T> a);
824 +        public abstract <T,U> CompletableFuture<U> thenApply
825 +            (CompletableFuture<T> f, Function<? super T,U> a);
826 +        public abstract <T,U> CompletableFuture<U> thenCompose
827 +            (CompletableFuture<T> f,
828 +             Function<? super T,? extends CompletionStage<U>> a);
829 +        public abstract <T,U> CompletableFuture<U> handle
830 +            (CompletableFuture<T> f,
831 +             BiFunction<? super T,Throwable,? extends U> a);
832 +        public abstract <T> CompletableFuture<T> whenComplete
833 +            (CompletableFuture<T> f,
834 +             BiConsumer<? super T,? super Throwable> a);
835          public abstract <T,U> CompletableFuture<Void> runAfterBoth
836              (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
837          public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
838              (CompletableFuture<T> f,
839               CompletionStage<? extends U> g,
840               BiConsumer<? super T,? super U> a);
841 +        public abstract <T,U,V> CompletableFuture<V> thenCombine
842 +            (CompletableFuture<T> f,
843 +             CompletionStage<? extends U> g,
844 +             BiFunction<? super T,? super U,? extends V> a);
845 +        public abstract <T> CompletableFuture<Void> runAfterEither
846 +            (CompletableFuture<T> f,
847 +             CompletionStage<?> g,
848 +             java.lang.Runnable a);
849 +        public abstract <T> CompletableFuture<Void> acceptEither
850 +            (CompletableFuture<T> f,
851 +             CompletionStage<? extends T> g,
852 +             Consumer<? super T> a);
853 +        public abstract <T,U> CompletableFuture<U> applyToEither
854 +            (CompletableFuture<T> f,
855 +             CompletionStage<? extends T> g,
856 +             Function<? super T,U> a);
857      }
858  
859      /**
860 <     * exceptionally action completes with function value on source
861 <     * exception; otherwise with source value
860 >     * exceptionally action is not invoked when source completes
861 >     * normally, and source result is propagated
862       */
863 <    public void testExceptionally() {
864 <        CompletableFuture<Integer> f = new CompletableFuture<>();
865 <        ExceptionToInteger r = new ExceptionToInteger();
866 <        CompletableFuture<Integer> g = f.exceptionally(r);
867 <        f.completeExceptionally(new CFException());
868 <        checkCompletedNormally(g, three);
863 >    public void testExceptionally_normalCompletion() {
864 >        for (boolean createIncomplete : new boolean[] { true, false })
865 >        for (Integer v1 : new Integer[] { 1, null })
866 >    {
867 >        final AtomicInteger a = new AtomicInteger(0);
868 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
869 >        if (!createIncomplete) assertTrue(f.complete(v1));
870 >        final CompletableFuture<Integer> g = f.exceptionally
871 >            ((Throwable t) -> {
872 >                // Should not be called
873 >                a.getAndIncrement();
874 >                throw new AssertionError();
875 >            });
876 >        if (createIncomplete) assertTrue(f.complete(v1));
877  
878 <        f = new CompletableFuture<>();
879 <        r = new ExceptionToInteger();
880 <        g = f.exceptionally(r);
881 <        f.complete(one);
508 <        checkCompletedNormally(g, one);
509 <    }
878 >        checkCompletedNormally(g, v1);
879 >        checkCompletedNormally(f, v1);
880 >        assertEquals(0, a.get());
881 >    }}
882  
883      /**
884 <     * handle action completes normally with function value on either
885 <     * normal or exceptional completion of source
884 >     * exceptionally action completes with function value on source
885 >     * exception
886       */
887 <    public void testHandle() {
888 <        CompletableFuture<Integer> f, g;
889 <        IntegerHandler r;
890 <
891 <        f = new CompletableFuture<>();
892 <        f.completeExceptionally(new CFException());
893 <        g = f.handle(r = new IntegerHandler());
894 <        assertTrue(r.ran);
895 <        checkCompletedNormally(g, three);
896 <
897 <        f = new CompletableFuture<>();
898 <        g = f.handle(r = new IntegerHandler());
899 <        assertFalse(r.ran);
900 <        f.completeExceptionally(new CFException());
901 <        checkCompletedNormally(g, three);
902 <        assertTrue(r.ran);
887 >    public void testExceptionally_exceptionalCompletion() {
888 >        for (boolean createIncomplete : new boolean[] { true, false })
889 >        for (Integer v1 : new Integer[] { 1, null })
890 >    {
891 >        final AtomicInteger a = new AtomicInteger(0);
892 >        final CFException ex = new CFException();
893 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
894 >        if (!createIncomplete) f.completeExceptionally(ex);
895 >        final CompletableFuture<Integer> g = f.exceptionally
896 >            ((Throwable t) -> {
897 >                ExecutionMode.SYNC.checkExecutionMode();
898 >                threadAssertSame(t, ex);
899 >                a.getAndIncrement();
900 >                return v1;
901 >            });
902 >        if (createIncomplete) f.completeExceptionally(ex);
903  
904 <        f = new CompletableFuture<>();
905 <        f.complete(one);
906 <        g = f.handle(r = new IntegerHandler());
535 <        assertTrue(r.ran);
536 <        checkCompletedNormally(g, two);
904 >        checkCompletedNormally(g, v1);
905 >        assertEquals(1, a.get());
906 >    }}
907  
908 <        f = new CompletableFuture<>();
909 <        g = f.handle(r = new IntegerHandler());
910 <        assertFalse(r.ran);
911 <        f.complete(one);
912 <        assertTrue(r.ran);
913 <        checkCompletedNormally(g, two);
914 <    }
908 >    public void testExceptionally_exceptionalCompletionActionFailed() {
909 >        for (boolean createIncomplete : new boolean[] { true, false })
910 >    {
911 >        final AtomicInteger a = new AtomicInteger(0);
912 >        final CFException ex1 = new CFException();
913 >        final CFException ex2 = new CFException();
914 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
915 >        if (!createIncomplete) f.completeExceptionally(ex1);
916 >        final CompletableFuture<Integer> g = f.exceptionally
917 >            ((Throwable t) -> {
918 >                ExecutionMode.SYNC.checkExecutionMode();
919 >                threadAssertSame(t, ex1);
920 >                a.getAndIncrement();
921 >                throw ex2;
922 >            });
923 >        if (createIncomplete) f.completeExceptionally(ex1);
924 >
925 >        checkCompletedWithWrappedException(g, ex2);
926 >        assertEquals(1, a.get());
927 >    }}
928  
929      /**
930 <     * runAsync completes after running Runnable
930 >     * whenComplete action executes on normal completion, propagating
931 >     * source result.
932       */
933 <    public void testRunAsync() {
934 <        Noop r = new Noop();
935 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
936 <        assertNull(f.join());
937 <        assertTrue(r.ran);
938 <        checkCompletedNormally(f, null);
939 <    }
933 >    public void testWhenComplete_normalCompletion1() {
934 >        for (ExecutionMode m : ExecutionMode.values())
935 >        for (boolean createIncomplete : new boolean[] { true, false })
936 >        for (Integer v1 : new Integer[] { 1, null })
937 >    {
938 >        final AtomicInteger a = new AtomicInteger(0);
939 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
940 >        if (!createIncomplete) assertTrue(f.complete(v1));
941 >        final CompletableFuture<Integer> g = m.whenComplete
942 >            (f,
943 >             (Integer x, Throwable t) -> {
944 >                m.checkExecutionMode();
945 >                threadAssertSame(x, v1);
946 >                threadAssertNull(t);
947 >                a.getAndIncrement();
948 >            });
949 >        if (createIncomplete) assertTrue(f.complete(v1));
950  
951 <    /**
952 <     * runAsync with executor completes after running Runnable
953 <     */
954 <    public void testRunAsync2() {
561 <        Noop r = new Noop();
562 <        ThreadExecutor exec = new ThreadExecutor();
563 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
564 <        assertNull(f.join());
565 <        assertTrue(r.ran);
566 <        checkCompletedNormally(f, null);
567 <        assertEquals(1, exec.count.get());
568 <    }
951 >        checkCompletedNormally(g, v1);
952 >        checkCompletedNormally(f, v1);
953 >        assertEquals(1, a.get());
954 >    }}
955  
956      /**
957 <     * failing runAsync completes exceptionally after running Runnable
957 >     * whenComplete action executes on exceptional completion, propagating
958 >     * source result.
959       */
960 <    public void testRunAsync3() {
961 <        FailingNoop r = new FailingNoop();
962 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
963 <        checkCompletedWithWrappedCFException(f);
964 <        assertTrue(r.ran);
965 <    }
960 >    public void testWhenComplete_exceptionalCompletion() {
961 >        for (ExecutionMode m : ExecutionMode.values())
962 >        for (boolean createIncomplete : new boolean[] { true, false })
963 >    {
964 >        final AtomicInteger a = new AtomicInteger(0);
965 >        final CFException ex = new CFException();
966 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
967 >        if (!createIncomplete) f.completeExceptionally(ex);
968 >        final CompletableFuture<Integer> g = m.whenComplete
969 >            (f,
970 >             (Integer x, Throwable t) -> {
971 >                m.checkExecutionMode();
972 >                threadAssertNull(x);
973 >                threadAssertSame(t, ex);
974 >                a.getAndIncrement();
975 >            });
976 >        if (createIncomplete) f.completeExceptionally(ex);
977 >
978 >        checkCompletedWithWrappedException(g, ex);
979 >        checkCompletedExceptionally(f, ex);
980 >        assertEquals(1, a.get());
981 >    }}
982  
983      /**
984 <     * supplyAsync completes with result of supplier
984 >     * whenComplete action executes on cancelled source, propagating
985 >     * CancellationException.
986       */
987 <    public void testSupplyAsync() {
988 <        CompletableFuture<Integer> f;
989 <        f = CompletableFuture.supplyAsync(supplyOne);
990 <        assertEquals(f.join(), one);
991 <        checkCompletedNormally(f, one);
992 <    }
987 >    public void testWhenComplete_sourceCancelled() {
988 >        for (ExecutionMode m : ExecutionMode.values())
989 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
990 >        for (boolean createIncomplete : new boolean[] { true, false })
991 >    {
992 >        final AtomicInteger a = new AtomicInteger(0);
993 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
994 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
995 >        final CompletableFuture<Integer> g = m.whenComplete
996 >            (f,
997 >             (Integer x, Throwable t) -> {
998 >                m.checkExecutionMode();
999 >                threadAssertNull(x);
1000 >                threadAssertTrue(t instanceof CancellationException);
1001 >                a.getAndIncrement();
1002 >            });
1003 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1004  
1005 <    /**
1006 <     * supplyAsync with executor completes with result of supplier
1007 <     */
1008 <    public void testSupplyAsync2() {
594 <        CompletableFuture<Integer> f;
595 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
596 <        assertEquals(f.join(), one);
597 <        checkCompletedNormally(f, one);
598 <    }
1005 >        checkCompletedWithWrappedCancellationException(g);
1006 >        checkCancelled(f);
1007 >        assertEquals(1, a.get());
1008 >    }}
1009  
1010      /**
1011 <     * Failing supplyAsync completes exceptionally
1011 >     * If a whenComplete action throws an exception when triggered by
1012 >     * a normal completion, it completes exceptionally
1013       */
1014 <    public void testSupplyAsync3() {
1015 <        FailingSupplier r = new FailingSupplier();
1016 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1017 <        checkCompletedWithWrappedCFException(f);
1018 <        assertTrue(r.ran);
1019 <    }
1014 >    public void testWhenComplete_actionFailed() {
1015 >        for (boolean createIncomplete : new boolean[] { true, false })
1016 >        for (ExecutionMode m : ExecutionMode.values())
1017 >        for (Integer v1 : new Integer[] { 1, null })
1018 >    {
1019 >        final AtomicInteger a = new AtomicInteger(0);
1020 >        final CFException ex = new CFException();
1021 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1022 >        if (!createIncomplete) assertTrue(f.complete(v1));
1023 >        final CompletableFuture<Integer> g = m.whenComplete
1024 >            (f,
1025 >             (Integer x, Throwable t) -> {
1026 >                m.checkExecutionMode();
1027 >                threadAssertSame(x, v1);
1028 >                threadAssertNull(t);
1029 >                a.getAndIncrement();
1030 >                throw ex;
1031 >            });
1032 >        if (createIncomplete) assertTrue(f.complete(v1));
1033  
1034 <    // seq completion methods
1034 >        checkCompletedWithWrappedException(g, ex);
1035 >        checkCompletedNormally(f, v1);
1036 >        assertEquals(1, a.get());
1037 >    }}
1038  
1039      /**
1040 <     * thenRun result completes normally after normal completion of source
1040 >     * If a whenComplete action throws an exception when triggered by
1041 >     * a source completion that also throws an exception, the source
1042 >     * exception takes precedence.
1043       */
1044 <    public void testThenRun() {
1045 <        CompletableFuture<Integer> f;
1046 <        CompletableFuture<Void> g;
1047 <        Noop r;
1048 <
1049 <        f = new CompletableFuture<>();
1050 <        g = f.thenRun(r = new Noop());
1051 <        f.complete(null);
1052 <        checkCompletedNormally(g, null);
1053 <        assertTrue(r.ran);
1054 <
1055 <        f = new CompletableFuture<>();
1056 <        f.complete(null);
1057 <        g = f.thenRun(r = new Noop());
1058 <        checkCompletedNormally(g, null);
1059 <        assertTrue(r.ran);
1060 <    }
1044 >    public void testWhenComplete_actionFailedSourceFailed() {
1045 >        for (boolean createIncomplete : new boolean[] { true, false })
1046 >        for (ExecutionMode m : ExecutionMode.values())
1047 >    {
1048 >        final AtomicInteger a = new AtomicInteger(0);
1049 >        final CFException ex1 = new CFException();
1050 >        final CFException ex2 = new CFException();
1051 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1052 >
1053 >        if (!createIncomplete) f.completeExceptionally(ex1);
1054 >        final CompletableFuture<Integer> g = m.whenComplete
1055 >            (f,
1056 >             (Integer x, Throwable t) -> {
1057 >                m.checkExecutionMode();
1058 >                threadAssertSame(t, ex1);
1059 >                threadAssertNull(x);
1060 >                a.getAndIncrement();
1061 >                throw ex2;
1062 >            });
1063 >        if (createIncomplete) f.completeExceptionally(ex1);
1064 >
1065 >        checkCompletedWithWrappedException(g, ex1);
1066 >        checkCompletedExceptionally(f, ex1);
1067 >        assertEquals(1, a.get());
1068 >    }}
1069  
1070      /**
1071 <     * thenRun result completes exceptionally after exceptional
1071 >     * handle action completes normally with function value on normal
1072       * completion of source
1073       */
1074 <    public void testThenRun2() {
1075 <        CompletableFuture<Integer> f;
1076 <        CompletableFuture<Void> g;
1077 <        Noop r;
1078 <
1079 <        f = new CompletableFuture<>();
1080 <        g = f.thenRun(r = new Noop());
1081 <        f.completeExceptionally(new CFException());
1082 <        checkCompletedWithWrappedCFException(g);
1083 <        assertFalse(r.ran);
1074 >    public void testHandle_normalCompletion() {
1075 >        for (ExecutionMode m : ExecutionMode.values())
1076 >        for (boolean createIncomplete : new boolean[] { true, false })
1077 >        for (Integer v1 : new Integer[] { 1, null })
1078 >    {
1079 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1080 >        final AtomicInteger a = new AtomicInteger(0);
1081 >        if (!createIncomplete) assertTrue(f.complete(v1));
1082 >        final CompletableFuture<Integer> g = m.handle
1083 >            (f,
1084 >             (Integer x, Throwable t) -> {
1085 >                m.checkExecutionMode();
1086 >                threadAssertSame(x, v1);
1087 >                threadAssertNull(t);
1088 >                a.getAndIncrement();
1089 >                return inc(v1);
1090 >            });
1091 >        if (createIncomplete) assertTrue(f.complete(v1));
1092  
1093 <        f = new CompletableFuture<>();
1094 <        f.completeExceptionally(new CFException());
1095 <        g = f.thenRun(r = new Noop());
1096 <        checkCompletedWithWrappedCFException(g);
652 <        assertFalse(r.ran);
653 <    }
1093 >        checkCompletedNormally(g, inc(v1));
1094 >        checkCompletedNormally(f, v1);
1095 >        assertEquals(1, a.get());
1096 >    }}
1097  
1098      /**
1099 <     * thenRun result completes exceptionally if action does
1099 >     * handle action completes normally with function value on
1100 >     * exceptional completion of source
1101       */
1102 <    public void testThenRun3() {
1103 <        CompletableFuture<Integer> f;
1104 <        CompletableFuture<Void> g;
1105 <        FailingNoop r;
1102 >    public void testHandle_exceptionalCompletion() {
1103 >        for (ExecutionMode m : ExecutionMode.values())
1104 >        for (boolean createIncomplete : new boolean[] { true, false })
1105 >        for (Integer v1 : new Integer[] { 1, null })
1106 >    {
1107 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1108 >        final AtomicInteger a = new AtomicInteger(0);
1109 >        final CFException ex = new CFException();
1110 >        if (!createIncomplete) f.completeExceptionally(ex);
1111 >        final CompletableFuture<Integer> g = m.handle
1112 >            (f,
1113 >             (Integer x, Throwable t) -> {
1114 >                m.checkExecutionMode();
1115 >                threadAssertNull(x);
1116 >                threadAssertSame(t, ex);
1117 >                a.getAndIncrement();
1118 >                return v1;
1119 >            });
1120 >        if (createIncomplete) f.completeExceptionally(ex);
1121  
1122 <        f = new CompletableFuture<>();
1123 <        g = f.thenRun(r = new FailingNoop());
1124 <        f.complete(null);
1125 <        checkCompletedWithWrappedCFException(g);
1122 >        checkCompletedNormally(g, v1);
1123 >        checkCompletedExceptionally(f, ex);
1124 >        assertEquals(1, a.get());
1125 >    }}
1126  
1127 <        f = new CompletableFuture<>();
1128 <        f.complete(null);
1129 <        g = f.thenRun(r = new FailingNoop());
1130 <        checkCompletedWithWrappedCFException(g);
1131 <    }
1127 >    /**
1128 >     * handle action completes normally with function value on
1129 >     * cancelled source
1130 >     */
1131 >    public void testHandle_sourceCancelled() {
1132 >        for (ExecutionMode m : ExecutionMode.values())
1133 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1134 >        for (boolean createIncomplete : new boolean[] { true, false })
1135 >        for (Integer v1 : new Integer[] { 1, null })
1136 >    {
1137 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1138 >        final AtomicInteger a = new AtomicInteger(0);
1139 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1140 >        final CompletableFuture<Integer> g = m.handle
1141 >            (f,
1142 >             (Integer x, Throwable t) -> {
1143 >                m.checkExecutionMode();
1144 >                threadAssertNull(x);
1145 >                threadAssertTrue(t instanceof CancellationException);
1146 >                a.getAndIncrement();
1147 >                return v1;
1148 >            });
1149 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1150 >
1151 >        checkCompletedNormally(g, v1);
1152 >        checkCancelled(f);
1153 >        assertEquals(1, a.get());
1154 >    }}
1155  
1156      /**
1157 <     * thenRun result completes exceptionally if source cancelled
1157 >     * handle result completes exceptionally if action does
1158       */
1159 <    public void testThenRun4() {
1160 <        CompletableFuture<Integer> f;
1161 <        CompletableFuture<Void> g;
1162 <        Noop r;
1159 >    public void testHandle_sourceFailedActionFailed() {
1160 >        for (ExecutionMode m : ExecutionMode.values())
1161 >        for (boolean createIncomplete : new boolean[] { true, false })
1162 >    {
1163 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1164 >        final AtomicInteger a = new AtomicInteger(0);
1165 >        final CFException ex1 = new CFException();
1166 >        final CFException ex2 = new CFException();
1167 >        if (!createIncomplete) f.completeExceptionally(ex1);
1168 >        final CompletableFuture<Integer> g = m.handle
1169 >            (f,
1170 >             (Integer x, Throwable t) -> {
1171 >                m.checkExecutionMode();
1172 >                threadAssertNull(x);
1173 >                threadAssertSame(ex1, t);
1174 >                a.getAndIncrement();
1175 >                throw ex2;
1176 >            });
1177 >        if (createIncomplete) f.completeExceptionally(ex1);
1178 >
1179 >        checkCompletedWithWrappedException(g, ex2);
1180 >        checkCompletedExceptionally(f, ex1);
1181 >        assertEquals(1, a.get());
1182 >    }}
1183  
1184 <        f = new CompletableFuture<>();
1185 <        g = f.thenRun(r = new Noop());
1186 <        assertTrue(f.cancel(true));
1187 <        checkCompletedWithWrappedCancellationException(g);
1184 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1185 >        for (ExecutionMode m : ExecutionMode.values())
1186 >        for (boolean createIncomplete : new boolean[] { true, false })
1187 >        for (Integer v1 : new Integer[] { 1, null })
1188 >    {
1189 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1190 >        final AtomicInteger a = new AtomicInteger(0);
1191 >        final CFException ex = new CFException();
1192 >        if (!createIncomplete) assertTrue(f.complete(v1));
1193 >        final CompletableFuture<Integer> g = m.handle
1194 >            (f,
1195 >             (Integer x, Throwable t) -> {
1196 >                m.checkExecutionMode();
1197 >                threadAssertSame(x, v1);
1198 >                threadAssertNull(t);
1199 >                a.getAndIncrement();
1200 >                throw ex;
1201 >            });
1202 >        if (createIncomplete) assertTrue(f.complete(v1));
1203  
1204 <        f = new CompletableFuture<>();
1205 <        assertTrue(f.cancel(true));
1206 <        g = f.thenRun(r = new Noop());
1207 <        checkCompletedWithWrappedCancellationException(g);
691 <    }
1204 >        checkCompletedWithWrappedException(g, ex);
1205 >        checkCompletedNormally(f, v1);
1206 >        assertEquals(1, a.get());
1207 >    }}
1208  
1209      /**
1210 <     * thenApply result completes normally after normal completion of source
1210 >     * runAsync completes after running Runnable
1211       */
1212 <    public void testThenApply() {
1213 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1214 <        CompletableFuture<Integer> g = f.thenApply(inc);
1215 <        f.complete(one);
1216 <        checkCompletedNormally(g, two);
1217 <    }
1212 >    public void testRunAsync_normalCompletion() {
1213 >        ExecutionMode[] executionModes = {
1214 >            ExecutionMode.ASYNC,
1215 >            ExecutionMode.EXECUTOR,
1216 >        };
1217 >        for (ExecutionMode m : executionModes)
1218 >    {
1219 >        final Noop r = new Noop(m);
1220 >        final CompletableFuture<Void> f = m.runAsync(r);
1221 >        assertNull(f.join());
1222 >        checkCompletedNormally(f, null);
1223 >        r.assertInvoked();
1224 >    }}
1225  
1226      /**
1227 <     * thenApply result completes exceptionally after exceptional
705 <     * completion of source
1227 >     * failing runAsync completes exceptionally after running Runnable
1228       */
1229 <    public void testThenApply2() {
1230 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1231 <        CompletableFuture<Integer> g = f.thenApply(inc);
1232 <        f.completeExceptionally(new CFException());
1233 <        checkCompletedWithWrappedCFException(g);
1234 <    }
1229 >    public void testRunAsync_exceptionalCompletion() {
1230 >        ExecutionMode[] executionModes = {
1231 >            ExecutionMode.ASYNC,
1232 >            ExecutionMode.EXECUTOR,
1233 >        };
1234 >        for (ExecutionMode m : executionModes)
1235 >    {
1236 >        final FailingRunnable r = new FailingRunnable(m);
1237 >        final CompletableFuture<Void> f = m.runAsync(r);
1238 >        checkCompletedWithWrappedCFException(f);
1239 >        r.assertInvoked();
1240 >    }}
1241  
1242      /**
1243 <     * thenApply result completes exceptionally if action does
1243 >     * supplyAsync completes with result of supplier
1244       */
1245 <    public void testThenApply3() {
1246 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1247 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1248 <        f.complete(one);
1249 <        checkCompletedWithWrappedCFException(g);
1250 <    }
1245 >    public void testSupplyAsync_normalCompletion() {
1246 >        ExecutionMode[] executionModes = {
1247 >            ExecutionMode.ASYNC,
1248 >            ExecutionMode.EXECUTOR,
1249 >        };
1250 >        for (ExecutionMode m : executionModes)
1251 >        for (Integer v1 : new Integer[] { 1, null })
1252 >    {
1253 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1254 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1255 >        assertSame(v1, f.join());
1256 >        checkCompletedNormally(f, v1);
1257 >        r.assertInvoked();
1258 >    }}
1259  
1260      /**
1261 <     * thenApply result completes exceptionally if source cancelled
1261 >     * Failing supplyAsync completes exceptionally
1262       */
1263 <    public void testThenApply4() {
1264 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1265 <        CompletableFuture<Integer> g = f.thenApply(inc);
1266 <        assertTrue(f.cancel(true));
1267 <        checkCompletedWithWrappedCancellationException(g);
1268 <    }
1263 >    public void testSupplyAsync_exceptionalCompletion() {
1264 >        ExecutionMode[] executionModes = {
1265 >            ExecutionMode.ASYNC,
1266 >            ExecutionMode.EXECUTOR,
1267 >        };
1268 >        for (ExecutionMode m : executionModes)
1269 >    {
1270 >        FailingSupplier r = new FailingSupplier(m);
1271 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1272 >        checkCompletedWithWrappedCFException(f);
1273 >        r.assertInvoked();
1274 >    }}
1275 >
1276 >    // seq completion methods
1277  
1278      /**
1279 <     * thenAccept result completes normally after normal completion of source
1279 >     * thenRun result completes normally after normal completion of source
1280       */
1281 <    public void testThenAccept() {
1282 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1283 <        IncAction r = new IncAction();
1284 <        CompletableFuture<Void> g = f.thenAccept(r);
1285 <        f.complete(one);
1286 <        checkCompletedNormally(g, null);
1287 <        assertEquals(r.value, 2);
1288 <    }
1281 >    public void testThenRun_normalCompletion() {
1282 >        for (ExecutionMode m : ExecutionMode.values())
1283 >        for (Integer v1 : new Integer[] { 1, null })
1284 >    {
1285 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1286 >        final Noop[] rs = new Noop[6];
1287 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1288 >
1289 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1290 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1291 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1292 >        checkIncomplete(h0);
1293 >        checkIncomplete(h1);
1294 >        checkIncomplete(h2);
1295 >        assertTrue(f.complete(v1));
1296 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1297 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1298 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1299 >
1300 >        checkCompletedNormally(h0, null);
1301 >        checkCompletedNormally(h1, null);
1302 >        checkCompletedNormally(h2, null);
1303 >        checkCompletedNormally(h3, null);
1304 >        checkCompletedNormally(h4, null);
1305 >        checkCompletedNormally(h5, null);
1306 >        checkCompletedNormally(f, v1);
1307 >        for (Noop r : rs) r.assertInvoked();
1308 >    }}
1309  
1310      /**
1311 <     * thenAccept result completes exceptionally after exceptional
1311 >     * thenRun result completes exceptionally after exceptional
1312       * completion of source
1313       */
1314 <    public void testThenAccept2() {
1315 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1316 <        IncAction r = new IncAction();
1317 <        CompletableFuture<Void> g = f.thenAccept(r);
1318 <        f.completeExceptionally(new CFException());
1319 <        checkCompletedWithWrappedCFException(g);
1320 <    }
1314 >    public void testThenRun_exceptionalCompletion() {
1315 >        for (ExecutionMode m : ExecutionMode.values())
1316 >    {
1317 >        final CFException ex = new CFException();
1318 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1319 >        final Noop[] rs = new Noop[6];
1320 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1321  
1322 <    /**
1323 <     * thenAccept result completes exceptionally if action does
1324 <     */
1325 <    public void testThenAccept3() {
1326 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1327 <        FailingConsumer r = new FailingConsumer();
1328 <        CompletableFuture<Void> g = f.thenAccept(r);
1329 <        f.complete(one);
1330 <        checkCompletedWithWrappedCFException(g);
1331 <        assertTrue(r.ran);
1332 <    }
1322 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1323 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1324 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1325 >        checkIncomplete(h0);
1326 >        checkIncomplete(h1);
1327 >        checkIncomplete(h2);
1328 >        assertTrue(f.completeExceptionally(ex));
1329 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1330 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1331 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1332 >
1333 >        checkCompletedWithWrappedException(h0, ex);
1334 >        checkCompletedWithWrappedException(h1, ex);
1335 >        checkCompletedWithWrappedException(h2, ex);
1336 >        checkCompletedWithWrappedException(h3, ex);
1337 >        checkCompletedWithWrappedException(h4, ex);
1338 >        checkCompletedWithWrappedException(h5, ex);
1339 >        checkCompletedExceptionally(f, ex);
1340 >        for (Noop r : rs) r.assertNotInvoked();
1341 >    }}
1342  
1343      /**
1344 <     * thenAccept result completes exceptionally if source cancelled
1344 >     * thenRun result completes exceptionally if source cancelled
1345       */
1346 <    public void testThenAccept4() {
1347 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1348 <        IncAction r = new IncAction();
1349 <        CompletableFuture<Void> g = f.thenAccept(r);
1350 <        assertTrue(f.cancel(true));
1351 <        checkCompletedWithWrappedCancellationException(g);
1352 <    }
1346 >    public void testThenRun_sourceCancelled() {
1347 >        for (ExecutionMode m : ExecutionMode.values())
1348 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1349 >    {
1350 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1351 >        final Noop[] rs = new Noop[6];
1352 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1353 >
1354 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1355 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1356 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1357 >        checkIncomplete(h0);
1358 >        checkIncomplete(h1);
1359 >        checkIncomplete(h2);
1360 >        assertTrue(f.cancel(mayInterruptIfRunning));
1361 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1362 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1363 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1364 >
1365 >        checkCompletedWithWrappedCancellationException(h0);
1366 >        checkCompletedWithWrappedCancellationException(h1);
1367 >        checkCompletedWithWrappedCancellationException(h2);
1368 >        checkCompletedWithWrappedCancellationException(h3);
1369 >        checkCompletedWithWrappedCancellationException(h4);
1370 >        checkCompletedWithWrappedCancellationException(h5);
1371 >        checkCancelled(f);
1372 >        for (Noop r : rs) r.assertNotInvoked();
1373 >    }}
1374  
1375      /**
1376 <     * thenCombine result completes normally after normal completion
783 <     * of sources
1376 >     * thenRun result completes exceptionally if action does
1377       */
1378 <    public void testThenCombine() {
1379 <        CompletableFuture<Integer> f, g, h;
1380 <
1381 <        f = new CompletableFuture<>();
1382 <        g = new CompletableFuture<>();
1383 <        h = f.thenCombine(g, subtract);
1384 <        f.complete(3);
792 <        checkIncomplete(h);
793 <        g.complete(1);
794 <        checkCompletedNormally(h, 2);
795 <
796 <        f = new CompletableFuture<>();
797 <        g = new CompletableFuture<>();
798 <        h = f.thenCombine(g, subtract);
799 <        g.complete(1);
800 <        checkIncomplete(h);
801 <        f.complete(3);
802 <        checkCompletedNormally(h, 2);
1378 >    public void testThenRun_actionFailed() {
1379 >        for (ExecutionMode m : ExecutionMode.values())
1380 >        for (Integer v1 : new Integer[] { 1, null })
1381 >    {
1382 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1383 >        final FailingRunnable[] rs = new FailingRunnable[6];
1384 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1385  
1386 <        f = new CompletableFuture<>();
1387 <        g = new CompletableFuture<>();
1388 <        g.complete(1);
1389 <        f.complete(3);
1390 <        h = f.thenCombine(g, subtract);
1391 <        checkCompletedNormally(h, 2);
1392 <    }
1386 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1387 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1388 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1389 >        assertTrue(f.complete(v1));
1390 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1391 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1392 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1393 >
1394 >        checkCompletedWithWrappedCFException(h0);
1395 >        checkCompletedWithWrappedCFException(h1);
1396 >        checkCompletedWithWrappedCFException(h2);
1397 >        checkCompletedWithWrappedCFException(h3);
1398 >        checkCompletedWithWrappedCFException(h4);
1399 >        checkCompletedWithWrappedCFException(h5);
1400 >        checkCompletedNormally(f, v1);
1401 >    }}
1402  
1403      /**
1404 <     * thenCombine result completes exceptionally after exceptional
814 <     * completion of either source
1404 >     * thenApply result completes normally after normal completion of source
1405       */
1406 <    public void testThenCombine2() {
1407 <        CompletableFuture<Integer> f, g, h;
1408 <
1409 <        f = new CompletableFuture<>();
1410 <        g = new CompletableFuture<>();
1411 <        h = f.thenCombine(g, subtract);
1412 <        f.completeExceptionally(new CFException());
823 <        checkIncomplete(h);
824 <        g.complete(1);
825 <        checkCompletedWithWrappedCFException(h);
826 <
827 <        f = new CompletableFuture<>();
828 <        g = new CompletableFuture<>();
829 <        h = f.thenCombine(g, subtract);
830 <        g.completeExceptionally(new CFException());
831 <        checkIncomplete(h);
832 <        f.complete(3);
833 <        checkCompletedWithWrappedCFException(h);
834 <
835 <        f = new CompletableFuture<>();
836 <        g = new CompletableFuture<>();
837 <        f.complete(3);
838 <        g.completeExceptionally(new CFException());
839 <        h = f.thenCombine(g, subtract);
840 <        checkCompletedWithWrappedCFException(h);
1406 >    public void testThenApply_normalCompletion() {
1407 >        for (ExecutionMode m : ExecutionMode.values())
1408 >        for (Integer v1 : new Integer[] { 1, null })
1409 >    {
1410 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1411 >        final IncFunction[] rs = new IncFunction[4];
1412 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1413  
1414 <        f = new CompletableFuture<>();
1415 <        g = new CompletableFuture<>();
1416 <        f.completeExceptionally(new CFException());
1417 <        g.complete(3);
1418 <        h = f.thenCombine(g, subtract);
1419 <        checkCompletedWithWrappedCFException(h);
1420 <    }
1414 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1415 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1416 >        checkIncomplete(h0);
1417 >        checkIncomplete(h1);
1418 >        assertTrue(f.complete(v1));
1419 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1420 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1421 >
1422 >        checkCompletedNormally(h0, inc(v1));
1423 >        checkCompletedNormally(h1, inc(v1));
1424 >        checkCompletedNormally(h2, inc(v1));
1425 >        checkCompletedNormally(h3, inc(v1));
1426 >        checkCompletedNormally(f, v1);
1427 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1428 >    }}
1429  
1430      /**
1431 <     * thenCombine result completes exceptionally if action does
1431 >     * thenApply result completes exceptionally after exceptional
1432 >     * completion of source
1433       */
1434 <    public void testThenCombine3() {
1435 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1436 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1437 <        FailingBiFunction r = new FailingBiFunction();
1438 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1439 <        f.complete(one);
1440 <        checkIncomplete(g);
1441 <        assertFalse(r.ran);
1442 <        f2.complete(two);
1443 <        checkCompletedWithWrappedCFException(g);
1444 <        assertTrue(r.ran);
1445 <    }
1434 >    public void testThenApply_exceptionalCompletion() {
1435 >        for (ExecutionMode m : ExecutionMode.values())
1436 >    {
1437 >        final CFException ex = new CFException();
1438 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1439 >        final IncFunction[] rs = new IncFunction[4];
1440 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1441 >
1442 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1443 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1444 >        assertTrue(f.completeExceptionally(ex));
1445 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1446 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1447 >
1448 >        checkCompletedWithWrappedException(h0, ex);
1449 >        checkCompletedWithWrappedException(h1, ex);
1450 >        checkCompletedWithWrappedException(h2, ex);
1451 >        checkCompletedWithWrappedException(h3, ex);
1452 >        checkCompletedExceptionally(f, ex);
1453 >        for (IncFunction r : rs) r.assertNotInvoked();
1454 >    }}
1455  
1456      /**
1457 <     * thenCombine result completes exceptionally if either source cancelled
1457 >     * thenApply result completes exceptionally if source cancelled
1458       */
1459 <    public void testThenCombine4() {
1460 <        CompletableFuture<Integer> f, g, h;
1461 <
1462 <        f = new CompletableFuture<>();
1463 <        g = new CompletableFuture<>();
1464 <        h = f.thenCombine(g, subtract);
1465 <        assertTrue(f.cancel(true));
876 <        checkIncomplete(h);
877 <        g.complete(1);
878 <        checkCompletedWithWrappedCancellationException(h);
1459 >    public void testThenApply_sourceCancelled() {
1460 >        for (ExecutionMode m : ExecutionMode.values())
1461 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1462 >    {
1463 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1464 >        final IncFunction[] rs = new IncFunction[4];
1465 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1466  
1467 <        f = new CompletableFuture<>();
1468 <        g = new CompletableFuture<>();
1469 <        h = f.thenCombine(g, subtract);
1470 <        assertTrue(g.cancel(true));
1471 <        checkIncomplete(h);
885 <        f.complete(3);
886 <        checkCompletedWithWrappedCancellationException(h);
1467 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1468 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1469 >        assertTrue(f.cancel(mayInterruptIfRunning));
1470 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1471 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1472  
1473 <        f = new CompletableFuture<>();
1474 <        g = new CompletableFuture<>();
1475 <        assertTrue(f.cancel(true));
1476 <        assertTrue(g.cancel(true));
1477 <        h = f.thenCombine(g, subtract);
1478 <        checkCompletedWithWrappedCancellationException(h);
1479 <    }
1473 >        checkCompletedWithWrappedCancellationException(h0);
1474 >        checkCompletedWithWrappedCancellationException(h1);
1475 >        checkCompletedWithWrappedCancellationException(h2);
1476 >        checkCompletedWithWrappedCancellationException(h3);
1477 >        checkCancelled(f);
1478 >        for (IncFunction r : rs) r.assertNotInvoked();
1479 >    }}
1480  
1481      /**
1482 <     * thenAcceptBoth result completes normally after normal
898 <     * completion of sources
1482 >     * thenApply result completes exceptionally if action does
1483       */
1484 <    public void testThenAcceptBoth_normalCompletion1() {
1484 >    public void testThenApply_actionFailed() {
1485          for (ExecutionMode m : ExecutionMode.values())
1486          for (Integer v1 : new Integer[] { 1, null })
1487 <        for (Integer v2 : new Integer[] { 2, null }) {
904 <
1487 >    {
1488          final CompletableFuture<Integer> f = new CompletableFuture<>();
1489 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1490 <        final SubtractAction r = new SubtractAction();
908 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
909 <
910 <        f.complete(v1);
911 <        checkIncomplete(h);
912 <        assertEquals(r.value, 0);
913 <        g.complete(v2);
1489 >        final FailingFunction[] rs = new FailingFunction[4];
1490 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1491  
1492 <        checkCompletedNormally(h, null);
1493 <        assertEquals(r.value, r.subtract(v1, v2));
1492 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1493 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1494 >        assertTrue(f.complete(v1));
1495 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1496 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1497 >
1498 >        checkCompletedWithWrappedCFException(h0);
1499 >        checkCompletedWithWrappedCFException(h1);
1500 >        checkCompletedWithWrappedCFException(h2);
1501 >        checkCompletedWithWrappedCFException(h3);
1502          checkCompletedNormally(f, v1);
1503 <        checkCompletedNormally(g, v2);
919 <        }
920 <    }
1503 >    }}
1504  
1505 <    public void testThenAcceptBoth_normalCompletion2() {
1505 >    /**
1506 >     * thenAccept result completes normally after normal completion of source
1507 >     */
1508 >    public void testThenAccept_normalCompletion() {
1509          for (ExecutionMode m : ExecutionMode.values())
1510          for (Integer v1 : new Integer[] { 1, null })
1511 <        for (Integer v2 : new Integer[] { 2, null }) {
926 <
1511 >    {
1512          final CompletableFuture<Integer> f = new CompletableFuture<>();
1513 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1514 <        final SubtractAction r = new SubtractAction();
930 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1513 >        final NoopConsumer[] rs = new NoopConsumer[4];
1514 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1515  
1516 <        g.complete(v2);
1517 <        checkIncomplete(h);
1518 <        assertEquals(r.value, 0);
1519 <        f.complete(v1);
1520 <
1521 <        checkCompletedNormally(h, null);
1522 <        assertEquals(r.value, r.subtract(v1, v2));
1516 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1517 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1518 >        checkIncomplete(h0);
1519 >        checkIncomplete(h1);
1520 >        assertTrue(f.complete(v1));
1521 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1522 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1523 >
1524 >        checkCompletedNormally(h0, null);
1525 >        checkCompletedNormally(h1, null);
1526 >        checkCompletedNormally(h2, null);
1527 >        checkCompletedNormally(h3, null);
1528          checkCompletedNormally(f, v1);
1529 <        checkCompletedNormally(g, v2);
1530 <        }
942 <    }
1529 >        for (NoopConsumer r : rs) r.assertValue(v1);
1530 >    }}
1531  
1532 <    public void testThenAcceptBoth_normalCompletion3() {
1532 >    /**
1533 >     * thenAccept result completes exceptionally after exceptional
1534 >     * completion of source
1535 >     */
1536 >    public void testThenAccept_exceptionalCompletion() {
1537          for (ExecutionMode m : ExecutionMode.values())
1538 <        for (Integer v1 : new Integer[] { 1, null })
1539 <        for (Integer v2 : new Integer[] { 2, null }) {
948 <
1538 >    {
1539 >        final CFException ex = new CFException();
1540          final CompletableFuture<Integer> f = new CompletableFuture<>();
1541 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1542 <        final SubtractAction r = new SubtractAction();
1541 >        final NoopConsumer[] rs = new NoopConsumer[4];
1542 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1543  
1544 <        g.complete(v2);
1545 <        f.complete(v1);
1546 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1547 <
1548 <        checkCompletedNormally(h, null);
1549 <        assertEquals(r.value, r.subtract(v1, v2));
1550 <        checkCompletedNormally(f, v1);
1551 <        checkCompletedNormally(g, v2);
1552 <        }
1553 <    }
1544 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1545 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1546 >        assertTrue(f.completeExceptionally(ex));
1547 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1548 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1549 >
1550 >        checkCompletedWithWrappedException(h0, ex);
1551 >        checkCompletedWithWrappedException(h1, ex);
1552 >        checkCompletedWithWrappedException(h2, ex);
1553 >        checkCompletedWithWrappedException(h3, ex);
1554 >        checkCompletedExceptionally(f, ex);
1555 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1556 >    }}
1557  
1558 <    public void testThenAcceptBoth_normalCompletion4() {
1558 >    /**
1559 >     * thenAccept result completes exceptionally if source cancelled
1560 >     */
1561 >    public void testThenAccept_sourceCancelled() {
1562          for (ExecutionMode m : ExecutionMode.values())
1563 <        for (Integer v1 : new Integer[] { 1, null })
1564 <        for (Integer v2 : new Integer[] { 2, null }) {
968 <
1563 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1564 >    {
1565          final CompletableFuture<Integer> f = new CompletableFuture<>();
1566 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1567 <        final SubtractAction r = new SubtractAction();
1566 >        final NoopConsumer[] rs = new NoopConsumer[4];
1567 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1568  
1569 <        f.complete(v1);
1570 <        g.complete(v2);
1571 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1569 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1570 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1571 >        assertTrue(f.cancel(mayInterruptIfRunning));
1572 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1573 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1574  
1575 <        checkCompletedNormally(h, null);
1576 <        assertEquals(r.value, r.subtract(v1, v2));
1577 <        checkCompletedNormally(f, v1);
1578 <        checkCompletedNormally(g, v2);
1579 <        }
1580 <    }
1575 >        checkCompletedWithWrappedCancellationException(h0);
1576 >        checkCompletedWithWrappedCancellationException(h1);
1577 >        checkCompletedWithWrappedCancellationException(h2);
1578 >        checkCompletedWithWrappedCancellationException(h3);
1579 >        checkCancelled(f);
1580 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1581 >    }}
1582  
1583      /**
1584 <     * thenAcceptBoth result completes exceptionally after exceptional
986 <     * completion of either source
1584 >     * thenAccept result completes exceptionally if action does
1585       */
1586 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1586 >    public void testThenAccept_actionFailed() {
1587          for (ExecutionMode m : ExecutionMode.values())
1588 <        for (Integer v1 : new Integer[] { 1, null }) {
1589 <
1588 >        for (Integer v1 : new Integer[] { 1, null })
1589 >    {
1590          final CompletableFuture<Integer> f = new CompletableFuture<>();
1591 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1592 <        final SubtractAction r = new SubtractAction();
995 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
996 <        final CFException ex = new CFException();
997 <
998 <        f.completeExceptionally(ex);
999 <        checkIncomplete(h);
1000 <        g.complete(v1);
1591 >        final FailingConsumer[] rs = new FailingConsumer[4];
1592 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1593  
1594 <        checkCompletedWithWrappedCFException(h, ex);
1595 <        checkCompletedWithWrappedCFException(f, ex);
1596 <        assertFalse(r.ran());
1597 <        checkCompletedNormally(g, v1);
1598 <        }
1599 <    }
1594 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1595 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1596 >        assertTrue(f.complete(v1));
1597 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1598 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1599 >
1600 >        checkCompletedWithWrappedCFException(h0);
1601 >        checkCompletedWithWrappedCFException(h1);
1602 >        checkCompletedWithWrappedCFException(h2);
1603 >        checkCompletedWithWrappedCFException(h3);
1604 >        checkCompletedNormally(f, v1);
1605 >    }}
1606  
1607 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1607 >    /**
1608 >     * thenCombine result completes normally after normal completion
1609 >     * of sources
1610 >     */
1611 >    public void testThenCombine_normalCompletion() {
1612          for (ExecutionMode m : ExecutionMode.values())
1613 <        for (Integer v1 : new Integer[] { 1, null }) {
1614 <
1613 >        for (boolean fFirst : new boolean[] { true, false })
1614 >        for (Integer v1 : new Integer[] { 1, null })
1615 >        for (Integer v2 : new Integer[] { 2, null })
1616 >    {
1617          final CompletableFuture<Integer> f = new CompletableFuture<>();
1618          final CompletableFuture<Integer> g = new CompletableFuture<>();
1619 <        final SubtractAction r = new SubtractAction();
1620 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1017 <        final CFException ex = new CFException();
1619 >        final SubtractFunction[] rs = new SubtractFunction[6];
1620 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1621  
1622 <        g.completeExceptionally(ex);
1623 <        checkIncomplete(h);
1624 <        f.complete(v1);
1622 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1623 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1624 >        final Integer w1 =  fFirst ? v1 : v2;
1625 >        final Integer w2 = !fFirst ? v1 : v2;
1626 >
1627 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1628 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1629 >        assertTrue(fst.complete(w1));
1630 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1631 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1632 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1633 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1634 >        checkCompletedNormally(h1, subtract(w1, w1));
1635 >        checkCompletedNormally(h3, subtract(w1, w1));
1636 >        rs[1].assertValue(subtract(w1, w1));
1637 >        rs[3].assertValue(subtract(w1, w1));
1638 >        assertTrue(snd.complete(w2));
1639 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1640 >
1641 >        checkCompletedNormally(h0, subtract(v1, v2));
1642 >        checkCompletedNormally(h2, subtract(v1, v2));
1643 >        checkCompletedNormally(h4, subtract(v1, v2));
1644 >        rs[0].assertValue(subtract(v1, v2));
1645 >        rs[2].assertValue(subtract(v1, v2));
1646 >        rs[4].assertValue(subtract(v1, v2));
1647  
1023        checkCompletedWithWrappedCFException(h, ex);
1024        checkCompletedWithWrappedCFException(g, ex);
1025        assertFalse(r.ran());
1648          checkCompletedNormally(f, v1);
1649 <        }
1650 <    }
1649 >        checkCompletedNormally(g, v2);
1650 >    }}
1651  
1652 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1652 >    /**
1653 >     * thenCombine result completes exceptionally after exceptional
1654 >     * completion of either source
1655 >     */
1656 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1657          for (ExecutionMode m : ExecutionMode.values())
1658 <        for (Integer v1 : new Integer[] { 1, null }) {
1659 <
1658 >        for (boolean fFirst : new boolean[] { true, false })
1659 >        for (boolean failFirst : new boolean[] { true, false })
1660 >        for (Integer v1 : new Integer[] { 1, null })
1661 >    {
1662          final CompletableFuture<Integer> f = new CompletableFuture<>();
1663          final CompletableFuture<Integer> g = new CompletableFuture<>();
1036        final SubtractAction r = new SubtractAction();
1664          final CFException ex = new CFException();
1665 +        final SubtractFunction r1 = new SubtractFunction(m);
1666 +        final SubtractFunction r2 = new SubtractFunction(m);
1667 +        final SubtractFunction r3 = new SubtractFunction(m);
1668 +
1669 +        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1670 +        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1671 +        final Callable<Boolean> complete1 = failFirst ?
1672 +            () -> fst.completeExceptionally(ex) :
1673 +            () -> fst.complete(v1);
1674 +        final Callable<Boolean> complete2 = failFirst ?
1675 +            () -> snd.complete(v1) :
1676 +            () -> snd.completeExceptionally(ex);
1677 +
1678 +        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1679 +        assertTrue(complete1.call());
1680 +        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1681 +        checkIncomplete(h1);
1682 +        checkIncomplete(h2);
1683 +        assertTrue(complete2.call());
1684 +        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1685 +
1686 +        checkCompletedWithWrappedException(h1, ex);
1687 +        checkCompletedWithWrappedException(h2, ex);
1688 +        checkCompletedWithWrappedException(h3, ex);
1689 +        r1.assertNotInvoked();
1690 +        r2.assertNotInvoked();
1691 +        r3.assertNotInvoked();
1692 +        checkCompletedNormally(failFirst ? snd : fst, v1);
1693 +        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1694 +    }}
1695  
1696 <        g.completeExceptionally(ex);
1697 <        f.complete(v1);
1698 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1699 <
1043 <        checkCompletedWithWrappedCFException(h, ex);
1044 <        checkCompletedWithWrappedCFException(g, ex);
1045 <        assertFalse(r.ran());
1046 <        checkCompletedNormally(f, v1);
1047 <        }
1048 <    }
1049 <
1050 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1696 >    /**
1697 >     * thenCombine result completes exceptionally if either source cancelled
1698 >     */
1699 >    public void testThenCombine_sourceCancelled() throws Throwable {
1700          for (ExecutionMode m : ExecutionMode.values())
1701 <        for (Integer v1 : new Integer[] { 1, null }) {
1702 <
1701 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1702 >        for (boolean fFirst : new boolean[] { true, false })
1703 >        for (boolean failFirst : new boolean[] { true, false })
1704 >        for (Integer v1 : new Integer[] { 1, null })
1705 >    {
1706          final CompletableFuture<Integer> f = new CompletableFuture<>();
1707          final CompletableFuture<Integer> g = new CompletableFuture<>();
1708 <        final SubtractAction r = new SubtractAction();
1709 <        final CFException ex = new CFException();
1710 <
1711 <        f.completeExceptionally(ex);
1712 <        g.complete(v1);
1713 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1714 <
1715 <        checkCompletedWithWrappedCFException(h, ex);
1716 <        checkCompletedWithWrappedCFException(f, ex);
1717 <        assertFalse(r.ran());
1718 <        checkCompletedNormally(g, v1);
1719 <        }
1720 <    }
1708 >        final SubtractFunction r1 = new SubtractFunction(m);
1709 >        final SubtractFunction r2 = new SubtractFunction(m);
1710 >        final SubtractFunction r3 = new SubtractFunction(m);
1711 >
1712 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1713 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1714 >        final Callable<Boolean> complete1 = failFirst ?
1715 >            () -> fst.cancel(mayInterruptIfRunning) :
1716 >            () -> fst.complete(v1);
1717 >        final Callable<Boolean> complete2 = failFirst ?
1718 >            () -> snd.complete(v1) :
1719 >            () -> snd.cancel(mayInterruptIfRunning);
1720 >
1721 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1722 >        assertTrue(complete1.call());
1723 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1724 >        checkIncomplete(h1);
1725 >        checkIncomplete(h2);
1726 >        assertTrue(complete2.call());
1727 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1728 >
1729 >        checkCompletedWithWrappedCancellationException(h1);
1730 >        checkCompletedWithWrappedCancellationException(h2);
1731 >        checkCompletedWithWrappedCancellationException(h3);
1732 >        r1.assertNotInvoked();
1733 >        r2.assertNotInvoked();
1734 >        r3.assertNotInvoked();
1735 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1736 >        checkCancelled(failFirst ? fst : snd);
1737 >    }}
1738  
1739      /**
1740 <     * thenAcceptBoth result completes exceptionally if action does
1740 >     * thenCombine result completes exceptionally if action does
1741       */
1742 <    public void testThenAcceptBoth_actionFailed1() {
1742 >    public void testThenCombine_actionFailed() {
1743          for (ExecutionMode m : ExecutionMode.values())
1744 +        for (boolean fFirst : new boolean[] { true, false })
1745          for (Integer v1 : new Integer[] { 1, null })
1746 <        for (Integer v2 : new Integer[] { 2, null }) {
1747 <
1746 >        for (Integer v2 : new Integer[] { 2, null })
1747 >    {
1748          final CompletableFuture<Integer> f = new CompletableFuture<>();
1749          final CompletableFuture<Integer> g = new CompletableFuture<>();
1750 <        final FailingBiConsumer r = new FailingBiConsumer();
1751 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1752 <
1753 <        f.complete(v1);
1754 <        checkIncomplete(h);
1755 <        g.complete(v2);
1756 <
1757 <        checkCompletedWithWrappedCFException(h);
1750 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1751 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1752 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1753 >
1754 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1755 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1756 >        final Integer w1 =  fFirst ? v1 : v2;
1757 >        final Integer w2 = !fFirst ? v1 : v2;
1758 >
1759 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1760 >        assertTrue(fst.complete(w1));
1761 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1762 >        assertTrue(snd.complete(w2));
1763 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1764 >
1765 >        checkCompletedWithWrappedCFException(h1);
1766 >        checkCompletedWithWrappedCFException(h2);
1767 >        checkCompletedWithWrappedCFException(h3);
1768 >        r1.assertInvoked();
1769 >        r2.assertInvoked();
1770 >        r3.assertInvoked();
1771          checkCompletedNormally(f, v1);
1772          checkCompletedNormally(g, v2);
1773 <        }
1091 <    }
1773 >    }}
1774  
1775 <    public void testThenAcceptBoth_actionFailed2() {
1775 >    /**
1776 >     * thenAcceptBoth result completes normally after normal
1777 >     * completion of sources
1778 >     */
1779 >    public void testThenAcceptBoth_normalCompletion() {
1780          for (ExecutionMode m : ExecutionMode.values())
1781 +        for (boolean fFirst : new boolean[] { true, false })
1782          for (Integer v1 : new Integer[] { 1, null })
1783 <        for (Integer v2 : new Integer[] { 2, null }) {
1784 <
1783 >        for (Integer v2 : new Integer[] { 2, null })
1784 >    {
1785          final CompletableFuture<Integer> f = new CompletableFuture<>();
1786          final CompletableFuture<Integer> g = new CompletableFuture<>();
1787 <        final FailingBiConsumer r = new FailingBiConsumer();
1788 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1789 <
1790 <        g.complete(v2);
1791 <        checkIncomplete(h);
1792 <        f.complete(v1);
1793 <
1794 <        checkCompletedWithWrappedCFException(h);
1787 >        final SubtractAction r1 = new SubtractAction(m);
1788 >        final SubtractAction r2 = new SubtractAction(m);
1789 >        final SubtractAction r3 = new SubtractAction(m);
1790 >
1791 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1792 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1793 >        final Integer w1 =  fFirst ? v1 : v2;
1794 >        final Integer w2 = !fFirst ? v1 : v2;
1795 >
1796 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1797 >        assertTrue(fst.complete(w1));
1798 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1799 >        checkIncomplete(h1);
1800 >        checkIncomplete(h2);
1801 >        r1.assertNotInvoked();
1802 >        r2.assertNotInvoked();
1803 >        assertTrue(snd.complete(w2));
1804 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1805 >
1806 >        checkCompletedNormally(h1, null);
1807 >        checkCompletedNormally(h2, null);
1808 >        checkCompletedNormally(h3, null);
1809 >        r1.assertValue(subtract(v1, v2));
1810 >        r2.assertValue(subtract(v1, v2));
1811 >        r3.assertValue(subtract(v1, v2));
1812          checkCompletedNormally(f, v1);
1813          checkCompletedNormally(g, v2);
1814 <        }
1111 <    }
1814 >    }}
1815  
1816      /**
1817 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1817 >     * thenAcceptBoth result completes exceptionally after exceptional
1818 >     * completion of either source
1819       */
1820 <    public void testThenAcceptBoth_sourceCancelled1() {
1820 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1821          for (ExecutionMode m : ExecutionMode.values())
1822 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1823 <        for (Integer v1 : new Integer[] { 1, null }) {
1824 <
1822 >        for (boolean fFirst : new boolean[] { true, false })
1823 >        for (boolean failFirst : new boolean[] { true, false })
1824 >        for (Integer v1 : new Integer[] { 1, null })
1825 >    {
1826          final CompletableFuture<Integer> f = new CompletableFuture<>();
1827          final CompletableFuture<Integer> g = new CompletableFuture<>();
1828 <        final SubtractAction r = new SubtractAction();
1829 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1830 <
1831 <        assertTrue(f.cancel(mayInterruptIfRunning));
1832 <        checkIncomplete(h);
1833 <        g.complete(v1);
1834 <
1835 <        checkCompletedWithWrappedCancellationException(h);
1836 <        checkCancelled(f);
1837 <        assertFalse(r.ran());
1838 <        checkCompletedNormally(g, v1);
1839 <        }
1840 <    }
1828 >        final CFException ex = new CFException();
1829 >        final SubtractAction r1 = new SubtractAction(m);
1830 >        final SubtractAction r2 = new SubtractAction(m);
1831 >        final SubtractAction r3 = new SubtractAction(m);
1832 >
1833 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1834 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1835 >        final Callable<Boolean> complete1 = failFirst ?
1836 >            () -> fst.completeExceptionally(ex) :
1837 >            () -> fst.complete(v1);
1838 >        final Callable<Boolean> complete2 = failFirst ?
1839 >            () -> snd.complete(v1) :
1840 >            () -> snd.completeExceptionally(ex);
1841 >
1842 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1843 >        assertTrue(complete1.call());
1844 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1845 >        checkIncomplete(h1);
1846 >        checkIncomplete(h2);
1847 >        assertTrue(complete2.call());
1848 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1849 >
1850 >        checkCompletedWithWrappedException(h1, ex);
1851 >        checkCompletedWithWrappedException(h2, ex);
1852 >        checkCompletedWithWrappedException(h3, ex);
1853 >        r1.assertNotInvoked();
1854 >        r2.assertNotInvoked();
1855 >        r3.assertNotInvoked();
1856 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1857 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1858 >    }}
1859  
1860 <    public void testThenAcceptBoth_sourceCancelled2() {
1860 >    /**
1861 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1862 >     */
1863 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1864          for (ExecutionMode m : ExecutionMode.values())
1865          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1866 <        for (Integer v1 : new Integer[] { 1, null }) {
1867 <
1866 >        for (boolean fFirst : new boolean[] { true, false })
1867 >        for (boolean failFirst : new boolean[] { true, false })
1868 >        for (Integer v1 : new Integer[] { 1, null })
1869 >    {
1870          final CompletableFuture<Integer> f = new CompletableFuture<>();
1871          final CompletableFuture<Integer> g = new CompletableFuture<>();
1872 <        final SubtractAction r = new SubtractAction();
1873 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1872 >        final SubtractAction r1 = new SubtractAction(m);
1873 >        final SubtractAction r2 = new SubtractAction(m);
1874 >        final SubtractAction r3 = new SubtractAction(m);
1875 >
1876 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1877 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1878 >        final Callable<Boolean> complete1 = failFirst ?
1879 >            () -> fst.cancel(mayInterruptIfRunning) :
1880 >            () -> fst.complete(v1);
1881 >        final Callable<Boolean> complete2 = failFirst ?
1882 >            () -> snd.complete(v1) :
1883 >            () -> snd.cancel(mayInterruptIfRunning);
1884 >
1885 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1886 >        assertTrue(complete1.call());
1887 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1888 >        checkIncomplete(h1);
1889 >        checkIncomplete(h2);
1890 >        assertTrue(complete2.call());
1891 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1892 >
1893 >        checkCompletedWithWrappedCancellationException(h1);
1894 >        checkCompletedWithWrappedCancellationException(h2);
1895 >        checkCompletedWithWrappedCancellationException(h3);
1896 >        r1.assertNotInvoked();
1897 >        r2.assertNotInvoked();
1898 >        r3.assertNotInvoked();
1899 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1900 >        checkCancelled(failFirst ? fst : snd);
1901 >    }}
1902  
1903 <        assertTrue(g.cancel(mayInterruptIfRunning));
1904 <        checkIncomplete(h);
1905 <        f.complete(v1);
1906 <
1151 <        checkCompletedWithWrappedCancellationException(h);
1152 <        checkCancelled(g);
1153 <        assertFalse(r.ran());
1154 <        checkCompletedNormally(f, v1);
1155 <        }
1156 <    }
1157 <
1158 <    public void testThenAcceptBoth_sourceCancelled3() {
1903 >    /**
1904 >     * thenAcceptBoth result completes exceptionally if action does
1905 >     */
1906 >    public void testThenAcceptBoth_actionFailed() {
1907          for (ExecutionMode m : ExecutionMode.values())
1908 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1909 <        for (Integer v1 : new Integer[] { 1, null }) {
1910 <
1908 >        for (boolean fFirst : new boolean[] { true, false })
1909 >        for (Integer v1 : new Integer[] { 1, null })
1910 >        for (Integer v2 : new Integer[] { 2, null })
1911 >    {
1912          final CompletableFuture<Integer> f = new CompletableFuture<>();
1913          final CompletableFuture<Integer> g = new CompletableFuture<>();
1914 <        final SubtractAction r = new SubtractAction();
1915 <
1916 <        assertTrue(g.cancel(mayInterruptIfRunning));
1917 <        f.complete(v1);
1918 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1919 <
1920 <        checkCompletedWithWrappedCancellationException(h);
1921 <        checkCancelled(g);
1922 <        assertFalse(r.ran());
1914 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1915 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1916 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1917 >
1918 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1919 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1920 >        final Integer w1 =  fFirst ? v1 : v2;
1921 >        final Integer w2 = !fFirst ? v1 : v2;
1922 >
1923 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1924 >        assertTrue(fst.complete(w1));
1925 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1926 >        assertTrue(snd.complete(w2));
1927 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1928 >
1929 >        checkCompletedWithWrappedCFException(h1);
1930 >        checkCompletedWithWrappedCFException(h2);
1931 >        checkCompletedWithWrappedCFException(h3);
1932 >        r1.assertInvoked();
1933 >        r2.assertInvoked();
1934 >        r3.assertInvoked();
1935          checkCompletedNormally(f, v1);
1936 <        }
1937 <    }
1177 <
1178 <    public void testThenAcceptBoth_sourceCancelled4() {
1179 <        for (ExecutionMode m : ExecutionMode.values())
1180 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1181 <        for (Integer v1 : new Integer[] { 1, null }) {
1182 <
1183 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1184 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1185 <        final SubtractAction r = new SubtractAction();
1186 <
1187 <        assertTrue(f.cancel(mayInterruptIfRunning));
1188 <        g.complete(v1);
1189 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1190 <
1191 <        checkCompletedWithWrappedCancellationException(h);
1192 <        checkCancelled(f);
1193 <        assertFalse(r.ran());
1194 <        checkCompletedNormally(g, v1);
1195 <        }
1196 <    }
1936 >        checkCompletedNormally(g, v2);
1937 >    }}
1938  
1939      /**
1940       * runAfterBoth result completes normally after normal
1941       * completion of sources
1942       */
1943 <    public void testRunAfterBoth_normalCompletion1() {
1943 >    public void testRunAfterBoth_normalCompletion() {
1944          for (ExecutionMode m : ExecutionMode.values())
1945 +        for (boolean fFirst : new boolean[] { true, false })
1946          for (Integer v1 : new Integer[] { 1, null })
1947 <        for (Integer v2 : new Integer[] { 2, null }) {
1948 <
1947 >        for (Integer v2 : new Integer[] { 2, null })
1948 >    {
1949          final CompletableFuture<Integer> f = new CompletableFuture<>();
1950          final CompletableFuture<Integer> g = new CompletableFuture<>();
1951 <        final Noop r = new Noop();
1952 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1953 <
1954 <        f.complete(v1);
1955 <        checkIncomplete(h);
1956 <        assertFalse(r.ran);
1957 <        g.complete(v2);
1958 <
1959 <        checkCompletedNormally(h, null);
1960 <        assertTrue(r.ran);
1951 >        final Noop r1 = new Noop(m);
1952 >        final Noop r2 = new Noop(m);
1953 >        final Noop r3 = new Noop(m);
1954 >
1955 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1956 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1957 >        final Integer w1 =  fFirst ? v1 : v2;
1958 >        final Integer w2 = !fFirst ? v1 : v2;
1959 >
1960 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1961 >        assertTrue(fst.complete(w1));
1962 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1963 >        checkIncomplete(h1);
1964 >        checkIncomplete(h2);
1965 >        r1.assertNotInvoked();
1966 >        r2.assertNotInvoked();
1967 >        assertTrue(snd.complete(w2));
1968 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1969 >
1970 >        checkCompletedNormally(h1, null);
1971 >        checkCompletedNormally(h2, null);
1972 >        checkCompletedNormally(h3, null);
1973 >        r1.assertInvoked();
1974 >        r2.assertInvoked();
1975 >        r3.assertInvoked();
1976          checkCompletedNormally(f, v1);
1977          checkCompletedNormally(g, v2);
1978 <        }
1222 <    }
1978 >    }}
1979  
1980 <    public void testRunAfterBoth_normalCompletion2() {
1980 >    /**
1981 >     * runAfterBoth result completes exceptionally after exceptional
1982 >     * completion of either source
1983 >     */
1984 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1985          for (ExecutionMode m : ExecutionMode.values())
1986 +        for (boolean fFirst : new boolean[] { true, false })
1987 +        for (boolean failFirst : new boolean[] { true, false })
1988          for (Integer v1 : new Integer[] { 1, null })
1989 <        for (Integer v2 : new Integer[] { 2, null }) {
1228 <
1989 >    {
1990          final CompletableFuture<Integer> f = new CompletableFuture<>();
1991          final CompletableFuture<Integer> g = new CompletableFuture<>();
1992 <        final Noop r = new Noop();
1993 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1994 <
1995 <        g.complete(v2);
1996 <        checkIncomplete(h);
1997 <        assertFalse(r.ran);
1998 <        f.complete(v1);
1999 <
2000 <        checkCompletedNormally(h, null);
2001 <        assertTrue(r.ran);
2002 <        checkCompletedNormally(f, v1);
2003 <        checkCompletedNormally(g, v2);
2004 <        }
2005 <    }
1992 >        final CFException ex = new CFException();
1993 >        final Noop r1 = new Noop(m);
1994 >        final Noop r2 = new Noop(m);
1995 >        final Noop r3 = new Noop(m);
1996 >
1997 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1998 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1999 >        final Callable<Boolean> complete1 = failFirst ?
2000 >            () -> fst.completeExceptionally(ex) :
2001 >            () -> fst.complete(v1);
2002 >        final Callable<Boolean> complete2 = failFirst ?
2003 >            () -> snd.complete(v1) :
2004 >            () -> snd.completeExceptionally(ex);
2005 >
2006 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2007 >        assertTrue(complete1.call());
2008 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2009 >        checkIncomplete(h1);
2010 >        checkIncomplete(h2);
2011 >        assertTrue(complete2.call());
2012 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2013 >
2014 >        checkCompletedWithWrappedException(h1, ex);
2015 >        checkCompletedWithWrappedException(h2, ex);
2016 >        checkCompletedWithWrappedException(h3, ex);
2017 >        r1.assertNotInvoked();
2018 >        r2.assertNotInvoked();
2019 >        r3.assertNotInvoked();
2020 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2021 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2022 >    }}
2023  
2024 <    public void testRunAfterBoth_normalCompletion3() {
2024 >    /**
2025 >     * runAfterBoth result completes exceptionally if either source cancelled
2026 >     */
2027 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2028          for (ExecutionMode m : ExecutionMode.values())
2029 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2030 +        for (boolean fFirst : new boolean[] { true, false })
2031 +        for (boolean failFirst : new boolean[] { true, false })
2032          for (Integer v1 : new Integer[] { 1, null })
2033 <        for (Integer v2 : new Integer[] { 2, null }) {
1250 <
2033 >    {
2034          final CompletableFuture<Integer> f = new CompletableFuture<>();
2035          final CompletableFuture<Integer> g = new CompletableFuture<>();
2036 <        final Noop r = new Noop();
2036 >        final Noop r1 = new Noop(m);
2037 >        final Noop r2 = new Noop(m);
2038 >        final Noop r3 = new Noop(m);
2039 >
2040 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2041 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2042 >        final Callable<Boolean> complete1 = failFirst ?
2043 >            () -> fst.cancel(mayInterruptIfRunning) :
2044 >            () -> fst.complete(v1);
2045 >        final Callable<Boolean> complete2 = failFirst ?
2046 >            () -> snd.complete(v1) :
2047 >            () -> snd.cancel(mayInterruptIfRunning);
2048 >
2049 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2050 >        assertTrue(complete1.call());
2051 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2052 >        checkIncomplete(h1);
2053 >        checkIncomplete(h2);
2054 >        assertTrue(complete2.call());
2055 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2056 >
2057 >        checkCompletedWithWrappedCancellationException(h1);
2058 >        checkCompletedWithWrappedCancellationException(h2);
2059 >        checkCompletedWithWrappedCancellationException(h3);
2060 >        r1.assertNotInvoked();
2061 >        r2.assertNotInvoked();
2062 >        r3.assertNotInvoked();
2063 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2064 >        checkCancelled(failFirst ? fst : snd);
2065 >    }}
2066  
2067 <        g.complete(v2);
2068 <        f.complete(v1);
2069 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2070 <
2071 <        checkCompletedNormally(h, null);
2072 <        assertTrue(r.ran);
2067 >    /**
2068 >     * runAfterBoth result completes exceptionally if action does
2069 >     */
2070 >    public void testRunAfterBoth_actionFailed() {
2071 >        for (ExecutionMode m : ExecutionMode.values())
2072 >        for (boolean fFirst : new boolean[] { true, false })
2073 >        for (Integer v1 : new Integer[] { 1, null })
2074 >        for (Integer v2 : new Integer[] { 2, null })
2075 >    {
2076 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2077 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2078 >        final FailingRunnable r1 = new FailingRunnable(m);
2079 >        final FailingRunnable r2 = new FailingRunnable(m);
2080 >        final FailingRunnable r3 = new FailingRunnable(m);
2081 >
2082 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2083 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2084 >        final Integer w1 =  fFirst ? v1 : v2;
2085 >        final Integer w2 = !fFirst ? v1 : v2;
2086 >
2087 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2088 >        assertTrue(fst.complete(w1));
2089 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2090 >        assertTrue(snd.complete(w2));
2091 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2092 >
2093 >        checkCompletedWithWrappedCFException(h1);
2094 >        checkCompletedWithWrappedCFException(h2);
2095 >        checkCompletedWithWrappedCFException(h3);
2096 >        r1.assertInvoked();
2097 >        r2.assertInvoked();
2098 >        r3.assertInvoked();
2099          checkCompletedNormally(f, v1);
2100          checkCompletedNormally(g, v2);
2101 <        }
1264 <    }
2101 >    }}
2102  
2103 <    public void testRunAfterBoth_normalCompletion4() {
2103 >    /**
2104 >     * applyToEither result completes normally after normal completion
2105 >     * of either source
2106 >     */
2107 >    public void testApplyToEither_normalCompletion() {
2108          for (ExecutionMode m : ExecutionMode.values())
2109          for (Integer v1 : new Integer[] { 1, null })
2110 <        for (Integer v2 : new Integer[] { 2, null }) {
2111 <
2110 >        for (Integer v2 : new Integer[] { 2, null })
2111 >    {
2112          final CompletableFuture<Integer> f = new CompletableFuture<>();
2113          final CompletableFuture<Integer> g = new CompletableFuture<>();
2114 <        final Noop r = new Noop();
2114 >        final IncFunction[] rs = new IncFunction[6];
2115 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2116  
2117 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2118 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2119 +        checkIncomplete(h0);
2120 +        checkIncomplete(h1);
2121 +        rs[0].assertNotInvoked();
2122 +        rs[1].assertNotInvoked();
2123          f.complete(v1);
2124 +        checkCompletedNormally(h0, inc(v1));
2125 +        checkCompletedNormally(h1, inc(v1));
2126 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2127 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2128 +        checkCompletedNormally(h2, inc(v1));
2129 +        checkCompletedNormally(h3, inc(v1));
2130          g.complete(v2);
1277        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2131  
2132 <        checkCompletedNormally(h, null);
2133 <        assertTrue(r.ran);
2132 >        // unspecified behavior - both source completions available
2133 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2134 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2135 >        rs[4].assertValue(h4.join());
2136 >        rs[5].assertValue(h5.join());
2137 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2138 >                   Objects.equals(inc(v2), h4.join()));
2139 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2140 >                   Objects.equals(inc(v2), h5.join()));
2141 >
2142          checkCompletedNormally(f, v1);
2143          checkCompletedNormally(g, v2);
2144 <        }
2145 <    }
2144 >        checkCompletedNormally(h0, inc(v1));
2145 >        checkCompletedNormally(h1, inc(v1));
2146 >        checkCompletedNormally(h2, inc(v1));
2147 >        checkCompletedNormally(h3, inc(v1));
2148 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2149 >    }}
2150  
2151      /**
2152 <     * runAfterBoth result completes exceptionally after exceptional
2152 >     * applyToEither result completes exceptionally after exceptional
2153       * completion of either source
2154       */
2155 <    public void testRunAfterBoth_exceptionalCompletion1() {
2155 >    public void testApplyToEither_exceptionalCompletion() {
2156          for (ExecutionMode m : ExecutionMode.values())
2157 <        for (Integer v1 : new Integer[] { 1, null }) {
2158 <
2157 >        for (Integer v1 : new Integer[] { 1, null })
2158 >    {
2159          final CompletableFuture<Integer> f = new CompletableFuture<>();
2160          final CompletableFuture<Integer> g = new CompletableFuture<>();
1296        final Noop r = new Noop();
1297        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2161          final CFException ex = new CFException();
2162 +        final IncFunction[] rs = new IncFunction[6];
2163 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2164  
2165 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2166 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2167 +        checkIncomplete(h0);
2168 +        checkIncomplete(h1);
2169 +        rs[0].assertNotInvoked();
2170 +        rs[1].assertNotInvoked();
2171          f.completeExceptionally(ex);
2172 <        checkIncomplete(h);
2172 >        checkCompletedWithWrappedException(h0, ex);
2173 >        checkCompletedWithWrappedException(h1, ex);
2174 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2175 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2176 >        checkCompletedWithWrappedException(h2, ex);
2177 >        checkCompletedWithWrappedException(h3, ex);
2178          g.complete(v1);
2179  
2180 <        checkCompletedWithWrappedCFException(h, ex);
2181 <        checkCompletedWithWrappedCFException(f, ex);
2182 <        assertFalse(r.ran);
2183 <        checkCompletedNormally(g, v1);
2180 >        // unspecified behavior - both source completions available
2181 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2182 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2183 >        try {
2184 >            assertEquals(inc(v1), h4.join());
2185 >            rs[4].assertValue(inc(v1));
2186 >        } catch (CompletionException ok) {
2187 >            checkCompletedWithWrappedException(h4, ex);
2188 >            rs[4].assertNotInvoked();
2189 >        }
2190 >        try {
2191 >            assertEquals(inc(v1), h5.join());
2192 >            rs[5].assertValue(inc(v1));
2193 >        } catch (CompletionException ok) {
2194 >            checkCompletedWithWrappedException(h5, ex);
2195 >            rs[5].assertNotInvoked();
2196          }
1309    }
2197  
2198 <    public void testRunAfterBoth_exceptionalCompletion2() {
2199 <        for (ExecutionMode m : ExecutionMode.values())
2200 <        for (Integer v1 : new Integer[] { 1, null }) {
2198 >        checkCompletedExceptionally(f, ex);
2199 >        checkCompletedNormally(g, v1);
2200 >        checkCompletedWithWrappedException(h0, ex);
2201 >        checkCompletedWithWrappedException(h1, ex);
2202 >        checkCompletedWithWrappedException(h2, ex);
2203 >        checkCompletedWithWrappedException(h3, ex);
2204 >        checkCompletedWithWrappedException(h4, ex);
2205 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2206 >    }}
2207  
2208 +    public void testApplyToEither_exceptionalCompletion2() {
2209 +        for (ExecutionMode m : ExecutionMode.values())
2210 +        for (boolean fFirst : new boolean[] { true, false })
2211 +        for (Integer v1 : new Integer[] { 1, null })
2212 +    {
2213          final CompletableFuture<Integer> f = new CompletableFuture<>();
2214          final CompletableFuture<Integer> g = new CompletableFuture<>();
1317        final Noop r = new Noop();
1318        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2215          final CFException ex = new CFException();
2216 +        final IncFunction[] rs = new IncFunction[6];
2217 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2218  
2219 <        g.completeExceptionally(ex);
2220 <        checkIncomplete(h);
2221 <        f.complete(v1);
2219 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2220 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2221 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2222 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2223 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2224 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2225 >
2226 >        // unspecified behavior - both source completions available
2227 >        try {
2228 >            assertEquals(inc(v1), h0.join());
2229 >            rs[0].assertValue(inc(v1));
2230 >        } catch (CompletionException ok) {
2231 >            checkCompletedWithWrappedException(h0, ex);
2232 >            rs[0].assertNotInvoked();
2233 >        }
2234 >        try {
2235 >            assertEquals(inc(v1), h1.join());
2236 >            rs[1].assertValue(inc(v1));
2237 >        } catch (CompletionException ok) {
2238 >            checkCompletedWithWrappedException(h1, ex);
2239 >            rs[1].assertNotInvoked();
2240 >        }
2241 >        try {
2242 >            assertEquals(inc(v1), h2.join());
2243 >            rs[2].assertValue(inc(v1));
2244 >        } catch (CompletionException ok) {
2245 >            checkCompletedWithWrappedException(h2, ex);
2246 >            rs[2].assertNotInvoked();
2247 >        }
2248 >        try {
2249 >            assertEquals(inc(v1), h3.join());
2250 >            rs[3].assertValue(inc(v1));
2251 >        } catch (CompletionException ok) {
2252 >            checkCompletedWithWrappedException(h3, ex);
2253 >            rs[3].assertNotInvoked();
2254 >        }
2255  
1325        checkCompletedWithWrappedCFException(h, ex);
1326        checkCompletedWithWrappedCFException(g, ex);
1327        assertFalse(r.ran);
2256          checkCompletedNormally(f, v1);
2257 <        }
2258 <    }
2257 >        checkCompletedExceptionally(g, ex);
2258 >    }}
2259  
2260 <    public void testRunAfterBoth_exceptionalCompletion3() {
2260 >    /**
2261 >     * applyToEither result completes exceptionally if either source cancelled
2262 >     */
2263 >    public void testApplyToEither_sourceCancelled() {
2264          for (ExecutionMode m : ExecutionMode.values())
2265 <        for (Integer v1 : new Integer[] { 1, null }) {
2266 <
2265 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2266 >        for (Integer v1 : new Integer[] { 1, null })
2267 >    {
2268          final CompletableFuture<Integer> f = new CompletableFuture<>();
2269          final CompletableFuture<Integer> g = new CompletableFuture<>();
2270 <        final Noop r = new Noop();
2271 <        final CFException ex = new CFException();
2270 >        final IncFunction[] rs = new IncFunction[6];
2271 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2272  
2273 <        g.completeExceptionally(ex);
2274 <        f.complete(v1);
2275 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2273 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2274 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2275 >        checkIncomplete(h0);
2276 >        checkIncomplete(h1);
2277 >        rs[0].assertNotInvoked();
2278 >        rs[1].assertNotInvoked();
2279 >        f.cancel(mayInterruptIfRunning);
2280 >        checkCompletedWithWrappedCancellationException(h0);
2281 >        checkCompletedWithWrappedCancellationException(h1);
2282 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2283 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2284 >        checkCompletedWithWrappedCancellationException(h2);
2285 >        checkCompletedWithWrappedCancellationException(h3);
2286 >        g.complete(v1);
2287  
2288 <        checkCompletedWithWrappedCFException(h, ex);
2289 <        checkCompletedWithWrappedCFException(g, ex);
2290 <        assertFalse(r.ran);
2291 <        checkCompletedNormally(f, v1);
2288 >        // unspecified behavior - both source completions available
2289 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2290 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2291 >        try {
2292 >            assertEquals(inc(v1), h4.join());
2293 >            rs[4].assertValue(inc(v1));
2294 >        } catch (CompletionException ok) {
2295 >            checkCompletedWithWrappedCancellationException(h4);
2296 >            rs[4].assertNotInvoked();
2297 >        }
2298 >        try {
2299 >            assertEquals(inc(v1), h5.join());
2300 >            rs[5].assertValue(inc(v1));
2301 >        } catch (CompletionException ok) {
2302 >            checkCompletedWithWrappedCancellationException(h5);
2303 >            rs[5].assertNotInvoked();
2304          }
1350    }
2305  
2306 <    public void testRunAfterBoth_exceptionalCompletion4() {
2307 <        for (ExecutionMode m : ExecutionMode.values())
2308 <        for (Integer v1 : new Integer[] { 1, null }) {
2306 >        checkCancelled(f);
2307 >        checkCompletedNormally(g, v1);
2308 >        checkCompletedWithWrappedCancellationException(h0);
2309 >        checkCompletedWithWrappedCancellationException(h1);
2310 >        checkCompletedWithWrappedCancellationException(h2);
2311 >        checkCompletedWithWrappedCancellationException(h3);
2312 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2313 >    }}
2314  
2315 +    public void testApplyToEither_sourceCancelled2() {
2316 +        for (ExecutionMode m : ExecutionMode.values())
2317 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2318 +        for (boolean fFirst : new boolean[] { true, false })
2319 +        for (Integer v1 : new Integer[] { 1, null })
2320 +    {
2321          final CompletableFuture<Integer> f = new CompletableFuture<>();
2322          final CompletableFuture<Integer> g = new CompletableFuture<>();
2323 <        final Noop r = new Noop();
2324 <        final CFException ex = new CFException();
2323 >        final IncFunction[] rs = new IncFunction[6];
2324 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2325  
2326 <        f.completeExceptionally(ex);
2327 <        g.complete(v1);
2328 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2326 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2327 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2328 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2329 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2330 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2331 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2332  
2333 <        checkCompletedWithWrappedCFException(h, ex);
2334 <        checkCompletedWithWrappedCFException(f, ex);
2335 <        assertFalse(r.ran);
2336 <        checkCompletedNormally(g, v1);
2333 >        // unspecified behavior - both source completions available
2334 >        try {
2335 >            assertEquals(inc(v1), h0.join());
2336 >            rs[0].assertValue(inc(v1));
2337 >        } catch (CompletionException ok) {
2338 >            checkCompletedWithWrappedCancellationException(h0);
2339 >            rs[0].assertNotInvoked();
2340          }
2341 <    }
2341 >        try {
2342 >            assertEquals(inc(v1), h1.join());
2343 >            rs[1].assertValue(inc(v1));
2344 >        } catch (CompletionException ok) {
2345 >            checkCompletedWithWrappedCancellationException(h1);
2346 >            rs[1].assertNotInvoked();
2347 >        }
2348 >        try {
2349 >            assertEquals(inc(v1), h2.join());
2350 >            rs[2].assertValue(inc(v1));
2351 >        } catch (CompletionException ok) {
2352 >            checkCompletedWithWrappedCancellationException(h2);
2353 >            rs[2].assertNotInvoked();
2354 >        }
2355 >        try {
2356 >            assertEquals(inc(v1), h3.join());
2357 >            rs[3].assertValue(inc(v1));
2358 >        } catch (CompletionException ok) {
2359 >            checkCompletedWithWrappedCancellationException(h3);
2360 >            rs[3].assertNotInvoked();
2361 >        }
2362 >
2363 >        checkCompletedNormally(f, v1);
2364 >        checkCancelled(g);
2365 >    }}
2366  
2367      /**
2368 <     * runAfterBoth result completes exceptionally if action does
2368 >     * applyToEither result completes exceptionally if action does
2369       */
2370 <    public void testRunAfterBoth_actionFailed1() {
2370 >    public void testApplyToEither_actionFailed() {
2371          for (ExecutionMode m : ExecutionMode.values())
2372          for (Integer v1 : new Integer[] { 1, null })
2373 <        for (Integer v2 : new Integer[] { 2, null }) {
2374 <
2373 >        for (Integer v2 : new Integer[] { 2, null })
2374 >    {
2375          final CompletableFuture<Integer> f = new CompletableFuture<>();
2376          final CompletableFuture<Integer> g = new CompletableFuture<>();
2377 <        final FailingNoop r = new FailingNoop();
2378 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2377 >        final FailingFunction[] rs = new FailingFunction[6];
2378 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2379  
2380 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2381 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2382          f.complete(v1);
2383 <        checkIncomplete(h);
2383 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2384 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2385 >        checkCompletedWithWrappedCFException(h0);
2386 >        checkCompletedWithWrappedCFException(h1);
2387 >        checkCompletedWithWrappedCFException(h2);
2388 >        checkCompletedWithWrappedCFException(h3);
2389 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2390 >
2391          g.complete(v2);
2392  
2393 <        checkCompletedWithWrappedCFException(h);
2393 >        // unspecified behavior - both source completions available
2394 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2395 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2396 >
2397 >        checkCompletedWithWrappedCFException(h4);
2398 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2399 >                   Objects.equals(v2, rs[4].value));
2400 >        checkCompletedWithWrappedCFException(h5);
2401 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2402 >                   Objects.equals(v2, rs[5].value));
2403 >
2404          checkCompletedNormally(f, v1);
2405          checkCompletedNormally(g, v2);
2406 <        }
1393 <    }
2406 >    }}
2407  
2408 <    public void testRunAfterBoth_actionFailed2() {
2408 >    /**
2409 >     * acceptEither result completes normally after normal completion
2410 >     * of either source
2411 >     */
2412 >    public void testAcceptEither_normalCompletion() {
2413          for (ExecutionMode m : ExecutionMode.values())
2414          for (Integer v1 : new Integer[] { 1, null })
2415 <        for (Integer v2 : new Integer[] { 2, null }) {
2416 <
2415 >        for (Integer v2 : new Integer[] { 2, null })
2416 >    {
2417          final CompletableFuture<Integer> f = new CompletableFuture<>();
2418          final CompletableFuture<Integer> g = new CompletableFuture<>();
2419 <        final FailingNoop r = new FailingNoop();
2420 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2419 >        final NoopConsumer[] rs = new NoopConsumer[6];
2420 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2421  
2422 <        g.complete(v2);
2423 <        checkIncomplete(h);
2422 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2423 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2424 >        checkIncomplete(h0);
2425 >        checkIncomplete(h1);
2426 >        rs[0].assertNotInvoked();
2427 >        rs[1].assertNotInvoked();
2428          f.complete(v1);
2429 +        checkCompletedNormally(h0, null);
2430 +        checkCompletedNormally(h1, null);
2431 +        rs[0].assertValue(v1);
2432 +        rs[1].assertValue(v1);
2433 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2434 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2435 +        checkCompletedNormally(h2, null);
2436 +        checkCompletedNormally(h3, null);
2437 +        rs[2].assertValue(v1);
2438 +        rs[3].assertValue(v1);
2439 +        g.complete(v2);
2440 +
2441 +        // unspecified behavior - both source completions available
2442 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2443 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2444 +        checkCompletedNormally(h4, null);
2445 +        checkCompletedNormally(h5, null);
2446 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2447 +                   Objects.equals(v2, rs[4].value));
2448 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2449 +                   Objects.equals(v2, rs[5].value));
2450  
1409        checkCompletedWithWrappedCFException(h);
2451          checkCompletedNormally(f, v1);
2452          checkCompletedNormally(g, v2);
2453 <        }
2454 <    }
2453 >        checkCompletedNormally(h0, null);
2454 >        checkCompletedNormally(h1, null);
2455 >        checkCompletedNormally(h2, null);
2456 >        checkCompletedNormally(h3, null);
2457 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2458 >    }}
2459  
2460      /**
2461 <     * runAfterBoth result completes exceptionally if either source cancelled
2461 >     * acceptEither result completes exceptionally after exceptional
2462 >     * completion of either source
2463       */
2464 <    public void testRunAfterBoth_sourceCancelled1() {
2464 >    public void testAcceptEither_exceptionalCompletion() {
2465          for (ExecutionMode m : ExecutionMode.values())
2466 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2467 <        for (Integer v1 : new Integer[] { 1, null }) {
1422 <
2466 >        for (Integer v1 : new Integer[] { 1, null })
2467 >    {
2468          final CompletableFuture<Integer> f = new CompletableFuture<>();
2469          final CompletableFuture<Integer> g = new CompletableFuture<>();
2470 <        final Noop r = new Noop();
2471 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2470 >        final CFException ex = new CFException();
2471 >        final NoopConsumer[] rs = new NoopConsumer[6];
2472 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2473 >
2474 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2475 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2476 >        checkIncomplete(h0);
2477 >        checkIncomplete(h1);
2478 >        rs[0].assertNotInvoked();
2479 >        rs[1].assertNotInvoked();
2480 >        f.completeExceptionally(ex);
2481 >        checkCompletedWithWrappedException(h0, ex);
2482 >        checkCompletedWithWrappedException(h1, ex);
2483 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2484 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2485 >        checkCompletedWithWrappedException(h2, ex);
2486 >        checkCompletedWithWrappedException(h3, ex);
2487  
1428        assertTrue(f.cancel(mayInterruptIfRunning));
1429        checkIncomplete(h);
2488          g.complete(v1);
2489  
2490 <        checkCompletedWithWrappedCancellationException(h);
2491 <        checkCancelled(f);
2492 <        assertFalse(r.ran);
2493 <        checkCompletedNormally(g, v1);
2490 >        // unspecified behavior - both source completions available
2491 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2492 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2493 >        try {
2494 >            assertNull(h4.join());
2495 >            rs[4].assertValue(v1);
2496 >        } catch (CompletionException ok) {
2497 >            checkCompletedWithWrappedException(h4, ex);
2498 >            rs[4].assertNotInvoked();
2499          }
2500 <    }
2501 <
2502 <    public void testRunAfterBoth_sourceCancelled2() {
2503 <        for (ExecutionMode m : ExecutionMode.values())
2504 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2505 <        for (Integer v1 : new Integer[] { 1, null }) {
1443 <
1444 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1445 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1446 <        final Noop r = new Noop();
1447 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1448 <
1449 <        assertTrue(g.cancel(mayInterruptIfRunning));
1450 <        checkIncomplete(h);
1451 <        f.complete(v1);
1452 <
1453 <        checkCompletedWithWrappedCancellationException(h);
1454 <        checkCancelled(g);
1455 <        assertFalse(r.ran);
1456 <        checkCompletedNormally(f, v1);
2500 >        try {
2501 >            assertNull(h5.join());
2502 >            rs[5].assertValue(v1);
2503 >        } catch (CompletionException ok) {
2504 >            checkCompletedWithWrappedException(h5, ex);
2505 >            rs[5].assertNotInvoked();
2506          }
1458    }
2507  
2508 <    public void testRunAfterBoth_sourceCancelled3() {
2509 <        for (ExecutionMode m : ExecutionMode.values())
2510 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2511 <        for (Integer v1 : new Integer[] { 1, null }) {
2508 >        checkCompletedExceptionally(f, ex);
2509 >        checkCompletedNormally(g, v1);
2510 >        checkCompletedWithWrappedException(h0, ex);
2511 >        checkCompletedWithWrappedException(h1, ex);
2512 >        checkCompletedWithWrappedException(h2, ex);
2513 >        checkCompletedWithWrappedException(h3, ex);
2514 >        checkCompletedWithWrappedException(h4, ex);
2515 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2516 >    }}
2517  
2518 +    public void testAcceptEither_exceptionalCompletion2() {
2519 +        for (ExecutionMode m : ExecutionMode.values())
2520 +        for (boolean fFirst : new boolean[] { true, false })
2521 +        for (Integer v1 : new Integer[] { 1, null })
2522 +    {
2523          final CompletableFuture<Integer> f = new CompletableFuture<>();
2524          final CompletableFuture<Integer> g = new CompletableFuture<>();
2525 <        final Noop r = new Noop();
2525 >        final CFException ex = new CFException();
2526 >        final NoopConsumer[] rs = new NoopConsumer[6];
2527 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2528  
2529 <        assertTrue(g.cancel(mayInterruptIfRunning));
2530 <        f.complete(v1);
2531 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2529 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2530 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2531 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2532 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2533 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2534 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2535 >
2536 >        // unspecified behavior - both source completions available
2537 >        try {
2538 >            assertEquals(null, h0.join());
2539 >            rs[0].assertValue(v1);
2540 >        } catch (CompletionException ok) {
2541 >            checkCompletedWithWrappedException(h0, ex);
2542 >            rs[0].assertNotInvoked();
2543 >        }
2544 >        try {
2545 >            assertEquals(null, h1.join());
2546 >            rs[1].assertValue(v1);
2547 >        } catch (CompletionException ok) {
2548 >            checkCompletedWithWrappedException(h1, ex);
2549 >            rs[1].assertNotInvoked();
2550 >        }
2551 >        try {
2552 >            assertEquals(null, h2.join());
2553 >            rs[2].assertValue(v1);
2554 >        } catch (CompletionException ok) {
2555 >            checkCompletedWithWrappedException(h2, ex);
2556 >            rs[2].assertNotInvoked();
2557 >        }
2558 >        try {
2559 >            assertEquals(null, h3.join());
2560 >            rs[3].assertValue(v1);
2561 >        } catch (CompletionException ok) {
2562 >            checkCompletedWithWrappedException(h3, ex);
2563 >            rs[3].assertNotInvoked();
2564 >        }
2565  
1473        checkCompletedWithWrappedCancellationException(h);
1474        checkCancelled(g);
1475        assertFalse(r.ran);
2566          checkCompletedNormally(f, v1);
2567 <        }
2568 <    }
2567 >        checkCompletedExceptionally(g, ex);
2568 >    }}
2569  
2570 <    public void testRunAfterBoth_sourceCancelled4() {
2570 >    /**
2571 >     * acceptEither result completes exceptionally if either source cancelled
2572 >     */
2573 >    public void testAcceptEither_sourceCancelled() {
2574          for (ExecutionMode m : ExecutionMode.values())
2575          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2576 <        for (Integer v1 : new Integer[] { 1, null }) {
2577 <
2576 >        for (Integer v1 : new Integer[] { 1, null })
2577 >    {
2578          final CompletableFuture<Integer> f = new CompletableFuture<>();
2579          final CompletableFuture<Integer> g = new CompletableFuture<>();
2580 <        final Noop r = new Noop();
2580 >        final NoopConsumer[] rs = new NoopConsumer[6];
2581 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2582 >
2583 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2584 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2585 >        checkIncomplete(h0);
2586 >        checkIncomplete(h1);
2587 >        rs[0].assertNotInvoked();
2588 >        rs[1].assertNotInvoked();
2589 >        f.cancel(mayInterruptIfRunning);
2590 >        checkCompletedWithWrappedCancellationException(h0);
2591 >        checkCompletedWithWrappedCancellationException(h1);
2592 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2593 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2594 >        checkCompletedWithWrappedCancellationException(h2);
2595 >        checkCompletedWithWrappedCancellationException(h3);
2596  
1489        assertTrue(f.cancel(mayInterruptIfRunning));
2597          g.complete(v1);
1491        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2598  
2599 <        checkCompletedWithWrappedCancellationException(h);
2600 <        checkCancelled(f);
2601 <        assertFalse(r.ran);
2602 <        checkCompletedNormally(g, v1);
2599 >        // unspecified behavior - both source completions available
2600 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2601 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2602 >        try {
2603 >            assertNull(h4.join());
2604 >            rs[4].assertValue(v1);
2605 >        } catch (CompletionException ok) {
2606 >            checkCompletedWithWrappedCancellationException(h4);
2607 >            rs[4].assertNotInvoked();
2608 >        }
2609 >        try {
2610 >            assertNull(h5.join());
2611 >            rs[5].assertValue(v1);
2612 >        } catch (CompletionException ok) {
2613 >            checkCompletedWithWrappedCancellationException(h5);
2614 >            rs[5].assertNotInvoked();
2615          }
1498    }
1499
1500    /**
1501     * applyToEither result completes normally after normal completion
1502     * of either source
1503     */
1504    public void testApplyToEither() {
1505        CompletableFuture<Integer> f = new CompletableFuture<>();
1506        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1507        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1508        f.complete(one);
1509        checkCompletedNormally(g, two);
1510        f2.complete(one);
1511        checkCompletedNormally(g, two);
1512
1513        f = new CompletableFuture<>();
1514        f.complete(one);
1515        f2 = new CompletableFuture<>();
1516        g = f.applyToEither(f2, inc);
1517        checkCompletedNormally(g, two);
1518    }
1519
1520    /**
1521     * applyToEither result completes exceptionally after exceptional
1522     * completion of either source
1523     */
1524    public void testApplyToEither2() {
1525        CompletableFuture<Integer> f = new CompletableFuture<>();
1526        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1527        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1528        f.completeExceptionally(new CFException());
1529        f2.complete(one);
1530        checkCompletedWithWrappedCFException(g);
2616  
2617 <        f = new CompletableFuture<>();
2618 <        f2 = new CompletableFuture<>();
2619 <        f2.completeExceptionally(new CFException());
2620 <        g = f.applyToEither(f2, inc);
2621 <        checkCompletedWithWrappedCFException(g);
2622 <    }
2623 <
2624 <    /**
1540 <     * applyToEither result completes exceptionally if action does
1541 <     */
1542 <    public void testApplyToEither3() {
1543 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1544 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1545 <        FailingFunction r = new FailingFunction();
1546 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1547 <        f2.complete(two);
1548 <        checkCompletedWithWrappedCFException(g);
1549 <    }
1550 <
1551 <    /**
1552 <     * applyToEither result completes exceptionally if either source cancelled
1553 <     */
1554 <    public void testApplyToEither4() {
1555 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1556 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1557 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1558 <        assertTrue(f.cancel(true));
1559 <        checkCompletedWithWrappedCancellationException(g);
1560 <        f = new CompletableFuture<>();
1561 <        f2 = new CompletableFuture<>();
1562 <        assertTrue(f2.cancel(true));
1563 <        checkCompletedWithWrappedCancellationException(g);
1564 <    }
2617 >        checkCancelled(f);
2618 >        checkCompletedNormally(g, v1);
2619 >        checkCompletedWithWrappedCancellationException(h0);
2620 >        checkCompletedWithWrappedCancellationException(h1);
2621 >        checkCompletedWithWrappedCancellationException(h2);
2622 >        checkCompletedWithWrappedCancellationException(h3);
2623 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2624 >    }}
2625  
2626      /**
2627 <     * acceptEither result completes normally after normal completion
1568 <     * of either source
2627 >     * acceptEither result completes exceptionally if action does
2628       */
2629 <    public void testAcceptEither() {
2630 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2631 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2632 <        IncAction r = new IncAction();
2633 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2634 <        f.complete(one);
2635 <        checkCompletedNormally(g, null);
2636 <        f2.complete(one);
2637 <        checkCompletedNormally(g, null);
1579 <        assertEquals(r.value, 2);
1580 <
1581 <        r = new IncAction();
1582 <        f = new CompletableFuture<>();
1583 <        f.complete(one);
1584 <        f2 = new CompletableFuture<>();
1585 <        g = f.acceptEither(f2, r);
1586 <        checkCompletedNormally(g, null);
1587 <        assertEquals(r.value, 2);
1588 <    }
2629 >    public void testAcceptEither_actionFailed() {
2630 >        for (ExecutionMode m : ExecutionMode.values())
2631 >        for (Integer v1 : new Integer[] { 1, null })
2632 >        for (Integer v2 : new Integer[] { 2, null })
2633 >    {
2634 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2635 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2636 >        final FailingConsumer[] rs = new FailingConsumer[6];
2637 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2638  
2639 <    /**
2640 <     * acceptEither result completes exceptionally after exceptional
2641 <     * completion of either source
2642 <     */
2643 <    public void testAcceptEither2() {
2644 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2645 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2646 <        IncAction r = new IncAction();
2647 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2648 <        f.completeExceptionally(new CFException());
1600 <        f2.complete(one);
1601 <        checkCompletedWithWrappedCFException(g);
2639 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2640 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2641 >        f.complete(v1);
2642 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2643 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2644 >        checkCompletedWithWrappedCFException(h0);
2645 >        checkCompletedWithWrappedCFException(h1);
2646 >        checkCompletedWithWrappedCFException(h2);
2647 >        checkCompletedWithWrappedCFException(h3);
2648 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2649  
2650 <        r = new IncAction();
1604 <        f = new CompletableFuture<>();
1605 <        f2 = new CompletableFuture<>();
1606 <        f2.completeExceptionally(new CFException());
1607 <        g = f.acceptEither(f2, r);
1608 <        checkCompletedWithWrappedCFException(g);
1609 <    }
2650 >        g.complete(v2);
2651  
2652 <    /**
2653 <     * acceptEither result completes exceptionally if action does
2654 <     */
2655 <    public void testAcceptEither3() {
2656 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2657 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2658 <        FailingConsumer r = new FailingConsumer();
2659 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2660 <        f2.complete(two);
2661 <        checkCompletedWithWrappedCFException(g);
1621 <    }
2652 >        // unspecified behavior - both source completions available
2653 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2654 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2655 >
2656 >        checkCompletedWithWrappedCFException(h4);
2657 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2658 >                   Objects.equals(v2, rs[4].value));
2659 >        checkCompletedWithWrappedCFException(h5);
2660 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2661 >                   Objects.equals(v2, rs[5].value));
2662  
2663 <    /**
2664 <     * acceptEither result completes exceptionally if either source cancelled
2665 <     */
1626 <    public void testAcceptEither4() {
1627 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1628 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1629 <        IncAction r = new IncAction();
1630 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1631 <        assertTrue(f.cancel(true));
1632 <        checkCompletedWithWrappedCancellationException(g);
1633 <        f = new CompletableFuture<>();
1634 <        f2 = new CompletableFuture<>();
1635 <        assertTrue(f2.cancel(true));
1636 <        checkCompletedWithWrappedCancellationException(g);
1637 <    }
2663 >        checkCompletedNormally(f, v1);
2664 >        checkCompletedNormally(g, v2);
2665 >    }}
2666  
2667      /**
2668       * runAfterEither result completes normally after normal completion
2669       * of either source
2670       */
2671 <    public void testRunAfterEither() {
2672 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2673 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2674 <        Noop r = new Noop();
2675 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2676 <        f.complete(one);
2677 <        checkCompletedNormally(g, null);
2678 <        f2.complete(one);
2679 <        checkCompletedNormally(g, null);
1652 <        assertTrue(r.ran);
1653 <
1654 <        r = new Noop();
1655 <        f = new CompletableFuture<>();
1656 <        f.complete(one);
1657 <        f2 = new CompletableFuture<>();
1658 <        g = f.runAfterEither(f2, r);
1659 <        checkCompletedNormally(g, null);
1660 <        assertTrue(r.ran);
1661 <    }
1662 <
1663 <    /**
1664 <     * runAfterEither result completes exceptionally after exceptional
1665 <     * completion of either source
1666 <     */
1667 <    public void testRunAfterEither2() {
1668 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1669 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1670 <        Noop r = new Noop();
1671 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1672 <        f.completeExceptionally(new CFException());
1673 <        f2.complete(one);
1674 <        checkCompletedWithWrappedCFException(g);
1675 <
1676 <        r = new Noop();
1677 <        f = new CompletableFuture<>();
1678 <        f2 = new CompletableFuture<>();
1679 <        f2.completeExceptionally(new CFException());
1680 <        g = f.runAfterEither(f2, r);
1681 <        checkCompletedWithWrappedCFException(g);
1682 <    }
1683 <
1684 <    /**
1685 <     * runAfterEither result completes exceptionally if action does
1686 <     */
1687 <    public void testRunAfterEither3() {
1688 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1689 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1690 <        FailingNoop r = new FailingNoop();
1691 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1692 <        f2.complete(two);
1693 <        checkCompletedWithWrappedCFException(g);
1694 <    }
1695 <
1696 <    /**
1697 <     * runAfterEither result completes exceptionally if either source cancelled
1698 <     */
1699 <    public void testRunAfterEither4() {
1700 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1701 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1702 <        Noop r = new Noop();
1703 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1704 <        assertTrue(f.cancel(true));
1705 <        checkCompletedWithWrappedCancellationException(g);
1706 <        f = new CompletableFuture<>();
1707 <        f2 = new CompletableFuture<>();
1708 <        assertTrue(f2.cancel(true));
1709 <        checkCompletedWithWrappedCancellationException(g);
1710 <    }
1711 <
1712 <    /**
1713 <     * thenCompose result completes normally after normal completion of source
1714 <     */
1715 <    public void testThenCompose() {
1716 <        CompletableFuture<Integer> f, g;
1717 <        CompletableFutureInc r;
1718 <
1719 <        f = new CompletableFuture<>();
1720 <        g = f.thenCompose(r = new CompletableFutureInc());
1721 <        f.complete(one);
1722 <        checkCompletedNormally(g, two);
1723 <        assertTrue(r.ran);
1724 <
1725 <        f = new CompletableFuture<>();
1726 <        f.complete(one);
1727 <        g = f.thenCompose(r = new CompletableFutureInc());
1728 <        checkCompletedNormally(g, two);
1729 <        assertTrue(r.ran);
1730 <    }
1731 <
1732 <    /**
1733 <     * thenCompose result completes exceptionally after exceptional
1734 <     * completion of source
1735 <     */
1736 <    public void testThenCompose2() {
1737 <        CompletableFuture<Integer> f, g;
1738 <        CompletableFutureInc r;
1739 <
1740 <        f = new CompletableFuture<>();
1741 <        g = f.thenCompose(r = new CompletableFutureInc());
1742 <        f.completeExceptionally(new CFException());
1743 <        checkCompletedWithWrappedCFException(g);
1744 <
1745 <        f = new CompletableFuture<>();
1746 <        f.completeExceptionally(new CFException());
1747 <        g = f.thenCompose(r = new CompletableFutureInc());
1748 <        checkCompletedWithWrappedCFException(g);
1749 <    }
1750 <
1751 <    /**
1752 <     * thenCompose result completes exceptionally if action does
1753 <     */
1754 <    public void testThenCompose3() {
1755 <        CompletableFuture<Integer> f, g;
1756 <        FailingCompletableFutureFunction r;
1757 <
1758 <        f = new CompletableFuture<>();
1759 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1760 <        f.complete(one);
1761 <        checkCompletedWithWrappedCFException(g);
1762 <
1763 <        f = new CompletableFuture<>();
1764 <        f.complete(one);
1765 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1766 <        checkCompletedWithWrappedCFException(g);
1767 <    }
1768 <
1769 <    /**
1770 <     * thenCompose result completes exceptionally if source cancelled
1771 <     */
1772 <    public void testThenCompose4() {
1773 <        CompletableFuture<Integer> f, g;
1774 <        CompletableFutureInc r;
1775 <
1776 <        f = new CompletableFuture<>();
1777 <        g = f.thenCompose(r = new CompletableFutureInc());
1778 <        assertTrue(f.cancel(true));
1779 <        checkCompletedWithWrappedCancellationException(g);
1780 <
1781 <        f = new CompletableFuture<>();
1782 <        assertTrue(f.cancel(true));
1783 <        g = f.thenCompose(r = new CompletableFutureInc());
1784 <        checkCompletedWithWrappedCancellationException(g);
1785 <    }
1786 <
1787 <    // asyncs
1788 <
1789 <    /**
1790 <     * thenRunAsync result completes normally after normal completion of source
1791 <     */
1792 <    public void testThenRunAsync() {
1793 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1794 <        Noop r = new Noop();
1795 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1796 <        f.complete(null);
1797 <        checkCompletedNormally(g, null);
1798 <
1799 <        // reordered version
1800 <        f = new CompletableFuture<>();
1801 <        f.complete(null);
1802 <        r = new Noop();
1803 <        g = f.thenRunAsync(r);
1804 <        checkCompletedNormally(g, null);
1805 <    }
1806 <
1807 <    /**
1808 <     * thenRunAsync result completes exceptionally after exceptional
1809 <     * completion of source
1810 <     */
1811 <    public void testThenRunAsync2() {
1812 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1813 <        Noop r = new Noop();
1814 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1815 <        f.completeExceptionally(new CFException());
1816 <        try {
1817 <            g.join();
1818 <            shouldThrow();
1819 <        } catch (CompletionException success) {}
1820 <        checkCompletedWithWrappedCFException(g);
1821 <    }
1822 <
1823 <    /**
1824 <     * thenRunAsync result completes exceptionally if action does
1825 <     */
1826 <    public void testThenRunAsync3() {
1827 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1828 <        FailingNoop r = new FailingNoop();
1829 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1830 <        f.complete(null);
1831 <        checkCompletedWithWrappedCFException(g);
1832 <    }
1833 <
1834 <    /**
1835 <     * thenRunAsync result completes exceptionally if source cancelled
1836 <     */
1837 <    public void testThenRunAsync4() {
1838 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1839 <        Noop r = new Noop();
1840 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1841 <        assertTrue(f.cancel(true));
1842 <        checkCompletedWithWrappedCancellationException(g);
1843 <    }
1844 <
1845 <    /**
1846 <     * thenApplyAsync result completes normally after normal completion of source
1847 <     */
1848 <    public void testThenApplyAsync() {
1849 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1850 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1851 <        f.complete(one);
1852 <        checkCompletedNormally(g, two);
1853 <    }
1854 <
1855 <    /**
1856 <     * thenApplyAsync result completes exceptionally after exceptional
1857 <     * completion of source
1858 <     */
1859 <    public void testThenApplyAsync2() {
1860 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1861 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1862 <        f.completeExceptionally(new CFException());
1863 <        checkCompletedWithWrappedCFException(g);
1864 <    }
1865 <
1866 <    /**
1867 <     * thenApplyAsync result completes exceptionally if action does
1868 <     */
1869 <    public void testThenApplyAsync3() {
1870 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1871 <        FailingFunction r = new FailingFunction();
1872 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1873 <        f.complete(null);
1874 <        checkCompletedWithWrappedCFException(g);
1875 <    }
1876 <
1877 <    /**
1878 <     * thenApplyAsync result completes exceptionally if source cancelled
1879 <     */
1880 <    public void testThenApplyAsync4() {
1881 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1882 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1883 <        assertTrue(f.cancel(true));
1884 <        checkCompletedWithWrappedCancellationException(g);
1885 <    }
1886 <
1887 <    /**
1888 <     * thenAcceptAsync result completes normally after normal
1889 <     * completion of source
1890 <     */
1891 <    public void testThenAcceptAsync() {
1892 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1893 <        IncAction r = new IncAction();
1894 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1895 <        f.complete(one);
1896 <        checkCompletedNormally(g, null);
1897 <        assertEquals(r.value, 2);
1898 <    }
1899 <
1900 <    /**
1901 <     * thenAcceptAsync result completes exceptionally after exceptional
1902 <     * completion of source
1903 <     */
1904 <    public void testThenAcceptAsync2() {
1905 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1906 <        IncAction r = new IncAction();
1907 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1908 <        f.completeExceptionally(new CFException());
1909 <        checkCompletedWithWrappedCFException(g);
1910 <    }
1911 <
1912 <    /**
1913 <     * thenAcceptAsync result completes exceptionally if action does
1914 <     */
1915 <    public void testThenAcceptAsync3() {
1916 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1917 <        FailingConsumer r = new FailingConsumer();
1918 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1919 <        f.complete(null);
1920 <        checkCompletedWithWrappedCFException(g);
1921 <    }
1922 <
1923 <    /**
1924 <     * thenAcceptAsync result completes exceptionally if source cancelled
1925 <     */
1926 <    public void testThenAcceptAsync4() {
1927 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1928 <        IncAction r = new IncAction();
1929 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1930 <        assertTrue(f.cancel(true));
1931 <        checkCompletedWithWrappedCancellationException(g);
1932 <    }
1933 <
1934 <    /**
1935 <     * thenCombineAsync result completes normally after normal
1936 <     * completion of sources
1937 <     */
1938 <    public void testThenCombineAsync() {
1939 <        CompletableFuture<Integer> f, g, h;
1940 <
1941 <        f = new CompletableFuture<>();
1942 <        g = new CompletableFuture<>();
1943 <        h = f.thenCombineAsync(g, subtract);
1944 <        f.complete(3);
1945 <        checkIncomplete(h);
1946 <        g.complete(1);
1947 <        checkCompletedNormally(h, 2);
1948 <
1949 <        f = new CompletableFuture<>();
1950 <        g = new CompletableFuture<>();
1951 <        h = f.thenCombineAsync(g, subtract);
1952 <        g.complete(1);
1953 <        checkIncomplete(h);
1954 <        f.complete(3);
1955 <        checkCompletedNormally(h, 2);
1956 <
1957 <        f = new CompletableFuture<>();
1958 <        g = new CompletableFuture<>();
1959 <        g.complete(1);
1960 <        f.complete(3);
1961 <        h = f.thenCombineAsync(g, subtract);
1962 <        checkCompletedNormally(h, 2);
1963 <    }
1964 <
1965 <    /**
1966 <     * thenCombineAsync result completes exceptionally after exceptional
1967 <     * completion of either source
1968 <     */
1969 <    public void testThenCombineAsync2() {
1970 <        CompletableFuture<Integer> f, g, h;
1971 <
1972 <        f = new CompletableFuture<>();
1973 <        g = new CompletableFuture<>();
1974 <        h = f.thenCombineAsync(g, subtract);
1975 <        f.completeExceptionally(new CFException());
1976 <        checkIncomplete(h);
1977 <        g.complete(1);
1978 <        checkCompletedWithWrappedCFException(h);
1979 <
1980 <        f = new CompletableFuture<>();
1981 <        g = new CompletableFuture<>();
1982 <        h = f.thenCombineAsync(g, subtract);
1983 <        g.completeExceptionally(new CFException());
1984 <        checkIncomplete(h);
1985 <        f.complete(3);
1986 <        checkCompletedWithWrappedCFException(h);
1987 <
1988 <        f = new CompletableFuture<>();
1989 <        g = new CompletableFuture<>();
1990 <        g.completeExceptionally(new CFException());
1991 <        f.complete(3);
1992 <        h = f.thenCombineAsync(g, subtract);
1993 <        checkCompletedWithWrappedCFException(h);
1994 <    }
1995 <
1996 <    /**
1997 <     * thenCombineAsync result completes exceptionally if action does
1998 <     */
1999 <    public void testThenCombineAsync3() {
2000 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2001 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2002 <        FailingBiFunction r = new FailingBiFunction();
2003 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
2004 <        f.complete(one);
2005 <        checkIncomplete(g);
2006 <        assertFalse(r.ran);
2007 <        f2.complete(two);
2008 <        checkCompletedWithWrappedCFException(g);
2009 <        assertTrue(r.ran);
2010 <    }
2011 <
2012 <    /**
2013 <     * thenCombineAsync result completes exceptionally if either source cancelled
2014 <     */
2015 <    public void testThenCombineAsync4() {
2016 <        CompletableFuture<Integer> f, g, h;
2017 <
2018 <        f = new CompletableFuture<>();
2019 <        g = new CompletableFuture<>();
2020 <        h = f.thenCombineAsync(g, subtract);
2021 <        assertTrue(f.cancel(true));
2022 <        checkIncomplete(h);
2023 <        g.complete(1);
2024 <        checkCompletedWithWrappedCancellationException(h);
2025 <
2026 <        f = new CompletableFuture<>();
2027 <        g = new CompletableFuture<>();
2028 <        h = f.thenCombineAsync(g, subtract);
2029 <        assertTrue(g.cancel(true));
2030 <        checkIncomplete(h);
2031 <        f.complete(3);
2032 <        checkCompletedWithWrappedCancellationException(h);
2033 <
2034 <        f = new CompletableFuture<>();
2035 <        g = new CompletableFuture<>();
2036 <        g.complete(3);
2037 <        assertTrue(f.cancel(true));
2038 <        h = f.thenCombineAsync(g, subtract);
2039 <        checkCompletedWithWrappedCancellationException(h);
2040 <
2041 <        f = new CompletableFuture<>();
2042 <        g = new CompletableFuture<>();
2043 <        f.complete(3);
2044 <        assertTrue(g.cancel(true));
2045 <        h = f.thenCombineAsync(g, subtract);
2046 <        checkCompletedWithWrappedCancellationException(h);
2047 <    }
2048 <
2049 <    /**
2050 <     * applyToEitherAsync result completes normally after normal
2051 <     * completion of sources
2052 <     */
2053 <    public void testApplyToEitherAsync() {
2054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2055 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2056 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2057 <        f.complete(one);
2058 <        checkCompletedNormally(g, two);
2059 <
2060 <        f = new CompletableFuture<>();
2061 <        f.complete(one);
2062 <        f2 = new CompletableFuture<>();
2063 <        g = f.applyToEitherAsync(f2, inc);
2064 <        checkCompletedNormally(g, two);
2065 <    }
2066 <
2067 <    /**
2068 <     * applyToEitherAsync result completes exceptionally after exceptional
2069 <     * completion of source
2070 <     */
2071 <    public void testApplyToEitherAsync2() {
2072 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2073 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2074 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2075 <        f.completeExceptionally(new CFException());
2076 <        checkCompletedWithWrappedCFException(g);
2077 <
2078 <        f = new CompletableFuture<>();
2079 <        f2 = new CompletableFuture<>();
2080 <        f2.completeExceptionally(new CFException());
2081 <        g = f.applyToEitherAsync(f2, inc);
2082 <        f.complete(one);
2083 <        checkCompletedWithWrappedCFException(g);
2084 <    }
2085 <
2086 <    /**
2087 <     * applyToEitherAsync result completes exceptionally if action does
2088 <     */
2089 <    public void testApplyToEitherAsync3() {
2090 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2091 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2092 <        FailingFunction r = new FailingFunction();
2093 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2094 <        f.complete(one);
2095 <        checkCompletedWithWrappedCFException(g);
2096 <    }
2097 <
2098 <    /**
2099 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2100 <     */
2101 <    public void testApplyToEitherAsync4() {
2102 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2103 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2104 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2105 <        assertTrue(f.cancel(true));
2106 <        checkCompletedWithWrappedCancellationException(g);
2107 <
2108 <        f = new CompletableFuture<>();
2109 <        f2 = new CompletableFuture<>();
2110 <        assertTrue(f2.cancel(true));
2111 <        g = f.applyToEitherAsync(f2, inc);
2112 <        checkCompletedWithWrappedCancellationException(g);
2113 <    }
2114 <
2115 <    /**
2116 <     * acceptEitherAsync result completes normally after normal
2117 <     * completion of sources
2118 <     */
2119 <    public void testAcceptEitherAsync() {
2120 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2121 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2122 <        IncAction r = new IncAction();
2123 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2124 <        f.complete(one);
2125 <        checkCompletedNormally(g, null);
2126 <        assertEquals(r.value, 2);
2127 <
2128 <        r = new IncAction();
2129 <        f = new CompletableFuture<>();
2130 <        f.complete(one);
2131 <        f2 = new CompletableFuture<>();
2132 <        g = f.acceptEitherAsync(f2, r);
2133 <        checkCompletedNormally(g, null);
2134 <        assertEquals(r.value, 2);
2135 <    }
2136 <
2137 <    /**
2138 <     * acceptEitherAsync result completes exceptionally after exceptional
2139 <     * completion of source
2140 <     */
2141 <    public void testAcceptEitherAsync2() {
2142 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2143 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2144 <        IncAction r = new IncAction();
2145 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2146 <        f.completeExceptionally(new CFException());
2147 <        checkCompletedWithWrappedCFException(g);
2148 <
2149 <        r = new IncAction();
2150 <        f = new CompletableFuture<>();
2151 <        f2 = new CompletableFuture<>();
2152 <        f2.completeExceptionally(new CFException());
2153 <        g = f.acceptEitherAsync(f2, r);
2154 <        f.complete(one);
2155 <        checkCompletedWithWrappedCFException(g);
2156 <    }
2157 <
2158 <    /**
2159 <     * acceptEitherAsync result completes exceptionally if action does
2160 <     */
2161 <    public void testAcceptEitherAsync3() {
2162 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2163 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2164 <        FailingConsumer r = new FailingConsumer();
2165 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2166 <        f.complete(one);
2167 <        checkCompletedWithWrappedCFException(g);
2168 <    }
2169 <
2170 <    /**
2171 <     * acceptEitherAsync result completes exceptionally if either
2172 <     * source cancelled
2173 <     */
2174 <    public void testAcceptEitherAsync4() {
2175 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2176 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2177 <        IncAction r = new IncAction();
2178 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2179 <        assertTrue(f.cancel(true));
2180 <        checkCompletedWithWrappedCancellationException(g);
2181 <
2182 <        r = new IncAction();
2183 <        f = new CompletableFuture<>();
2184 <        f2 = new CompletableFuture<>();
2185 <        assertTrue(f2.cancel(true));
2186 <        g = f.acceptEitherAsync(f2, r);
2187 <        checkCompletedWithWrappedCancellationException(g);
2188 <    }
2189 <
2190 <    /**
2191 <     * runAfterEitherAsync result completes normally after normal
2192 <     * completion of sources
2193 <     */
2194 <    public void testRunAfterEitherAsync() {
2195 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2196 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2197 <        Noop r = new Noop();
2198 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2199 <        f.complete(one);
2200 <        checkCompletedNormally(g, null);
2201 <        assertTrue(r.ran);
2202 <
2203 <        r = new Noop();
2204 <        f = new CompletableFuture<>();
2205 <        f.complete(one);
2206 <        f2 = new CompletableFuture<>();
2207 <        g = f.runAfterEitherAsync(f2, r);
2208 <        checkCompletedNormally(g, null);
2209 <        assertTrue(r.ran);
2210 <    }
2211 <
2212 <    /**
2213 <     * runAfterEitherAsync result completes exceptionally after exceptional
2214 <     * completion of source
2215 <     */
2216 <    public void testRunAfterEitherAsync2() {
2217 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2218 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2219 <        Noop r = new Noop();
2220 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2221 <        f.completeExceptionally(new CFException());
2222 <        checkCompletedWithWrappedCFException(g);
2223 <
2224 <        r = new Noop();
2225 <        f = new CompletableFuture<>();
2226 <        f2 = new CompletableFuture<>();
2227 <        f2.completeExceptionally(new CFException());
2228 <        g = f.runAfterEitherAsync(f2, r);
2229 <        f.complete(one);
2230 <        checkCompletedWithWrappedCFException(g);
2231 <    }
2232 <
2233 <    /**
2234 <     * runAfterEitherAsync result completes exceptionally if action does
2235 <     */
2236 <    public void testRunAfterEitherAsync3() {
2237 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2238 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2239 <        FailingNoop r = new FailingNoop();
2240 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2241 <        f.complete(one);
2242 <        checkCompletedWithWrappedCFException(g);
2243 <    }
2244 <
2245 <    /**
2246 <     * runAfterEitherAsync result completes exceptionally if either
2247 <     * source cancelled
2248 <     */
2249 <    public void testRunAfterEitherAsync4() {
2250 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2251 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2252 <        Noop r = new Noop();
2253 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2254 <        assertTrue(f.cancel(true));
2255 <        checkCompletedWithWrappedCancellationException(g);
2256 <
2257 <        r = new Noop();
2258 <        f = new CompletableFuture<>();
2259 <        f2 = new CompletableFuture<>();
2260 <        assertTrue(f2.cancel(true));
2261 <        g = f.runAfterEitherAsync(f2, r);
2262 <        checkCompletedWithWrappedCancellationException(g);
2263 <    }
2264 <
2265 <    /**
2266 <     * thenComposeAsync result completes normally after normal
2267 <     * completion of source
2268 <     */
2269 <    public void testThenComposeAsync() {
2270 <        CompletableFuture<Integer> f, g;
2271 <        CompletableFutureInc r;
2272 <
2273 <        f = new CompletableFuture<>();
2274 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2275 <        f.complete(one);
2276 <        checkCompletedNormally(g, two);
2277 <
2278 <        f = new CompletableFuture<>();
2279 <        f.complete(one);
2280 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2281 <        checkCompletedNormally(g, two);
2282 <    }
2283 <
2284 <    /**
2285 <     * thenComposeAsync result completes exceptionally after
2286 <     * exceptional completion of source
2287 <     */
2288 <    public void testThenComposeAsync2() {
2289 <        CompletableFuture<Integer> f, g;
2290 <        CompletableFutureInc r;
2291 <
2292 <        f = new CompletableFuture<>();
2293 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2294 <        f.completeExceptionally(new CFException());
2295 <        checkCompletedWithWrappedCFException(g);
2296 <        assertFalse(r.ran);
2297 <
2298 <        f = new CompletableFuture<>();
2299 <        f.completeExceptionally(new CFException());
2300 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2301 <        checkCompletedWithWrappedCFException(g);
2302 <        assertFalse(r.ran);
2303 <    }
2304 <
2305 <    /**
2306 <     * thenComposeAsync result completes exceptionally if action does
2307 <     */
2308 <    public void testThenComposeAsync3() {
2309 <        CompletableFuture<Integer> f, g;
2310 <        FailingCompletableFutureFunction r;
2311 <
2312 <        f = new CompletableFuture<>();
2313 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2314 <        f.complete(one);
2315 <        checkCompletedWithWrappedCFException(g);
2316 <
2317 <        f = new CompletableFuture<>();
2318 <        f.complete(one);
2319 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2320 <        checkCompletedWithWrappedCFException(g);
2321 <    }
2322 <
2323 <    /**
2324 <     * thenComposeAsync result completes exceptionally if source cancelled
2325 <     */
2326 <    public void testThenComposeAsync4() {
2327 <        CompletableFuture<Integer> f, g;
2328 <        CompletableFutureInc r;
2329 <
2330 <        f = new CompletableFuture<>();
2331 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2332 <        assertTrue(f.cancel(true));
2333 <        checkCompletedWithWrappedCancellationException(g);
2334 <
2335 <        f = new CompletableFuture<>();
2336 <        assertTrue(f.cancel(true));
2337 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2338 <        checkCompletedWithWrappedCancellationException(g);
2339 <    }
2340 <
2341 <    // async with explicit executors
2342 <
2343 <    /**
2344 <     * thenRunAsync result completes normally after normal completion of source
2345 <     */
2346 <    public void testThenRunAsyncE() {
2347 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2348 <        Noop r = new Noop();
2349 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2350 <        f.complete(null);
2351 <        checkCompletedNormally(g, null);
2352 <
2353 <        // reordered version
2354 <        f = new CompletableFuture<>();
2355 <        f.complete(null);
2356 <        r = new Noop();
2357 <        g = f.thenRunAsync(r, new ThreadExecutor());
2358 <        checkCompletedNormally(g, null);
2359 <    }
2360 <
2361 <    /**
2362 <     * thenRunAsync result completes exceptionally after exceptional
2363 <     * completion of source
2364 <     */
2365 <    public void testThenRunAsync2E() {
2366 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2367 <        Noop r = new Noop();
2368 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2369 <        f.completeExceptionally(new CFException());
2370 <        try {
2371 <            g.join();
2372 <            shouldThrow();
2373 <        } catch (CompletionException success) {}
2374 <        checkCompletedWithWrappedCFException(g);
2375 <    }
2376 <
2377 <    /**
2378 <     * thenRunAsync result completes exceptionally if action does
2379 <     */
2380 <    public void testThenRunAsync3E() {
2381 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2382 <        FailingNoop r = new FailingNoop();
2383 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2384 <        f.complete(null);
2385 <        checkCompletedWithWrappedCFException(g);
2386 <    }
2387 <
2388 <    /**
2389 <     * thenRunAsync result completes exceptionally if source cancelled
2390 <     */
2391 <    public void testThenRunAsync4E() {
2392 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2393 <        Noop r = new Noop();
2394 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2395 <        assertTrue(f.cancel(true));
2396 <        checkCompletedWithWrappedCancellationException(g);
2397 <    }
2398 <
2399 <    /**
2400 <     * thenApplyAsync result completes normally after normal completion of source
2401 <     */
2402 <    public void testThenApplyAsyncE() {
2403 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2404 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2405 <        f.complete(one);
2406 <        checkCompletedNormally(g, two);
2407 <    }
2408 <
2409 <    /**
2410 <     * thenApplyAsync result completes exceptionally after exceptional
2411 <     * completion of source
2412 <     */
2413 <    public void testThenApplyAsync2E() {
2414 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2415 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2416 <        f.completeExceptionally(new CFException());
2417 <        checkCompletedWithWrappedCFException(g);
2418 <    }
2419 <
2420 <    /**
2421 <     * thenApplyAsync result completes exceptionally if action does
2422 <     */
2423 <    public void testThenApplyAsync3E() {
2424 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2425 <        FailingFunction r = new FailingFunction();
2426 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2427 <        f.complete(null);
2428 <        checkCompletedWithWrappedCFException(g);
2429 <    }
2430 <
2431 <    /**
2432 <     * thenApplyAsync result completes exceptionally if source cancelled
2433 <     */
2434 <    public void testThenApplyAsync4E() {
2435 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2436 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2437 <        assertTrue(f.cancel(true));
2438 <        checkCompletedWithWrappedCancellationException(g);
2439 <    }
2440 <
2441 <    /**
2442 <     * thenAcceptAsync result completes normally after normal
2443 <     * completion of source
2444 <     */
2445 <    public void testThenAcceptAsyncE() {
2446 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2447 <        IncAction r = new IncAction();
2448 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2449 <        f.complete(one);
2450 <        checkCompletedNormally(g, null);
2451 <        assertEquals(r.value, 2);
2452 <    }
2453 <
2454 <    /**
2455 <     * thenAcceptAsync result completes exceptionally after exceptional
2456 <     * completion of source
2457 <     */
2458 <    public void testThenAcceptAsync2E() {
2459 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2460 <        IncAction r = new IncAction();
2461 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2462 <        f.completeExceptionally(new CFException());
2463 <        checkCompletedWithWrappedCFException(g);
2464 <    }
2465 <
2466 <    /**
2467 <     * thenAcceptAsync result completes exceptionally if action does
2468 <     */
2469 <    public void testThenAcceptAsync3E() {
2470 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2471 <        FailingConsumer r = new FailingConsumer();
2472 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2473 <        f.complete(null);
2474 <        checkCompletedWithWrappedCFException(g);
2475 <    }
2476 <
2477 <    /**
2478 <     * thenAcceptAsync result completes exceptionally if source cancelled
2479 <     */
2480 <    public void testThenAcceptAsync4E() {
2481 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2482 <        IncAction r = new IncAction();
2483 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2484 <        assertTrue(f.cancel(true));
2485 <        checkCompletedWithWrappedCancellationException(g);
2486 <    }
2671 >    public void testRunAfterEither_normalCompletion() {
2672 >        for (ExecutionMode m : ExecutionMode.values())
2673 >        for (Integer v1 : new Integer[] { 1, null })
2674 >        for (Integer v2 : new Integer[] { 2, null })
2675 >    {
2676 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2677 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2678 >        final Noop[] rs = new Noop[6];
2679 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2680  
2681 <    /**
2682 <     * thenCombineAsync result completes normally after normal
2683 <     * completion of sources
2684 <     */
2685 <    public void testThenCombineAsyncE() {
2686 <        CompletableFuture<Integer> f, g, h;
2687 <        ThreadExecutor e = new ThreadExecutor();
2688 <        int count = 0;
2681 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2682 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2683 >        checkIncomplete(h0);
2684 >        checkIncomplete(h1);
2685 >        rs[0].assertNotInvoked();
2686 >        rs[1].assertNotInvoked();
2687 >        f.complete(v1);
2688 >        checkCompletedNormally(h0, null);
2689 >        checkCompletedNormally(h1, null);
2690 >        rs[0].assertInvoked();
2691 >        rs[1].assertInvoked();
2692 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2693 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2694 >        checkCompletedNormally(h2, null);
2695 >        checkCompletedNormally(h3, null);
2696 >        rs[2].assertInvoked();
2697 >        rs[3].assertInvoked();
2698  
2699 <        f = new CompletableFuture<>();
2498 <        g = new CompletableFuture<>();
2499 <        h = f.thenCombineAsync(g, subtract, e);
2500 <        f.complete(3);
2501 <        checkIncomplete(h);
2502 <        g.complete(1);
2503 <        checkCompletedNormally(h, 2);
2504 <        assertEquals(++count, e.count.get());
2699 >        g.complete(v2);
2700  
2701 <        f = new CompletableFuture<>();
2702 <        g = new CompletableFuture<>();
2508 <        h = f.thenCombineAsync(g, subtract, e);
2509 <        g.complete(1);
2510 <        checkIncomplete(h);
2511 <        f.complete(3);
2512 <        checkCompletedNormally(h, 2);
2513 <        assertEquals(++count, e.count.get());
2701 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2702 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2703  
2704 <        f = new CompletableFuture<>();
2705 <        g = new CompletableFuture<>();
2706 <        g.complete(1);
2707 <        f.complete(3);
2708 <        h = f.thenCombineAsync(g, subtract, e);
2709 <        checkCompletedNormally(h, 2);
2710 <        assertEquals(++count, e.count.get());
2711 <    }
2704 >        checkCompletedNormally(f, v1);
2705 >        checkCompletedNormally(g, v2);
2706 >        checkCompletedNormally(h0, null);
2707 >        checkCompletedNormally(h1, null);
2708 >        checkCompletedNormally(h2, null);
2709 >        checkCompletedNormally(h3, null);
2710 >        checkCompletedNormally(h4, null);
2711 >        checkCompletedNormally(h5, null);
2712 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2713 >    }}
2714  
2715      /**
2716 <     * thenCombineAsync result completes exceptionally after exceptional
2716 >     * runAfterEither result completes exceptionally after exceptional
2717       * completion of either source
2718       */
2719 <    public void testThenCombineAsync2E() {
2720 <        CompletableFuture<Integer> f, g, h;
2721 <        ThreadExecutor e = new ThreadExecutor();
2722 <        int count = 0;
2723 <
2724 <        f = new CompletableFuture<>();
2725 <        g = new CompletableFuture<>();
2726 <        h = f.thenCombineAsync(g, subtract, e);
2727 <        f.completeExceptionally(new CFException());
2537 <        checkIncomplete(h);
2538 <        g.complete(1);
2539 <        checkCompletedWithWrappedCFException(h);
2540 <
2541 <        f = new CompletableFuture<>();
2542 <        g = new CompletableFuture<>();
2543 <        h = f.thenCombineAsync(g, subtract, e);
2544 <        g.completeExceptionally(new CFException());
2545 <        checkIncomplete(h);
2546 <        f.complete(3);
2547 <        checkCompletedWithWrappedCFException(h);
2548 <
2549 <        f = new CompletableFuture<>();
2550 <        g = new CompletableFuture<>();
2551 <        g.completeExceptionally(new CFException());
2552 <        h = f.thenCombineAsync(g, subtract, e);
2553 <        checkIncomplete(h);
2554 <        f.complete(3);
2555 <        checkCompletedWithWrappedCFException(h);
2556 <
2557 <        assertEquals(0, e.count.get());
2558 <    }
2559 <
2560 <    /**
2561 <     * thenCombineAsync result completes exceptionally if action does
2562 <     */
2563 <    public void testThenCombineAsync3E() {
2564 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2565 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2566 <        FailingBiFunction r = new FailingBiFunction();
2567 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2568 <        f.complete(one);
2569 <        checkIncomplete(g);
2570 <        assertFalse(r.ran);
2571 <        f2.complete(two);
2572 <        checkCompletedWithWrappedCFException(g);
2573 <        assertTrue(r.ran);
2574 <    }
2575 <
2576 <    /**
2577 <     * thenCombineAsync result completes exceptionally if either source cancelled
2578 <     */
2579 <    public void testThenCombineAsync4E() {
2580 <        CompletableFuture<Integer> f, g, h;
2581 <        ThreadExecutor e = new ThreadExecutor();
2719 >    public void testRunAfterEither_exceptionalCompletion() {
2720 >        for (ExecutionMode m : ExecutionMode.values())
2721 >        for (Integer v1 : new Integer[] { 1, null })
2722 >    {
2723 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2724 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2725 >        final CFException ex = new CFException();
2726 >        final Noop[] rs = new Noop[6];
2727 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2728  
2729 <        f = new CompletableFuture<>();
2730 <        g = new CompletableFuture<>();
2731 <        h = f.thenCombineAsync(g, subtract, e);
2732 <        assertTrue(f.cancel(true));
2733 <        checkIncomplete(h);
2734 <        g.complete(1);
2735 <        checkCompletedWithWrappedCancellationException(h);
2729 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2730 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2731 >        checkIncomplete(h0);
2732 >        checkIncomplete(h1);
2733 >        rs[0].assertNotInvoked();
2734 >        rs[1].assertNotInvoked();
2735 >        assertTrue(f.completeExceptionally(ex));
2736 >        checkCompletedWithWrappedException(h0, ex);
2737 >        checkCompletedWithWrappedException(h1, ex);
2738 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2739 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2740 >        checkCompletedWithWrappedException(h2, ex);
2741 >        checkCompletedWithWrappedException(h3, ex);
2742 >
2743 >        assertTrue(g.complete(v1));
2744 >
2745 >        // unspecified behavior - both source completions available
2746 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2747 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2748 >        try {
2749 >            assertNull(h4.join());
2750 >            rs[4].assertInvoked();
2751 >        } catch (CompletionException ok) {
2752 >            checkCompletedWithWrappedException(h4, ex);
2753 >            rs[4].assertNotInvoked();
2754 >        }
2755 >        try {
2756 >            assertNull(h5.join());
2757 >            rs[5].assertInvoked();
2758 >        } catch (CompletionException ok) {
2759 >            checkCompletedWithWrappedException(h5, ex);
2760 >            rs[5].assertNotInvoked();
2761 >        }
2762  
2763 <        f = new CompletableFuture<>();
2764 <        g = new CompletableFuture<>();
2765 <        h = f.thenCombineAsync(g, subtract, e);
2766 <        assertTrue(g.cancel(true));
2767 <        checkIncomplete(h);
2768 <        f.complete(3);
2769 <        checkCompletedWithWrappedCancellationException(h);
2763 >        checkCompletedExceptionally(f, ex);
2764 >        checkCompletedNormally(g, v1);
2765 >        checkCompletedWithWrappedException(h0, ex);
2766 >        checkCompletedWithWrappedException(h1, ex);
2767 >        checkCompletedWithWrappedException(h2, ex);
2768 >        checkCompletedWithWrappedException(h3, ex);
2769 >        checkCompletedWithWrappedException(h4, ex);
2770 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2771 >    }}
2772  
2773 <        f = new CompletableFuture<>();
2774 <        g = new CompletableFuture<>();
2775 <        assertTrue(g.cancel(true));
2776 <        h = f.thenCombineAsync(g, subtract, e);
2777 <        checkIncomplete(h);
2778 <        f.complete(3);
2779 <        checkCompletedWithWrappedCancellationException(h);
2773 >    public void testRunAfterEither_exceptionalCompletion2() {
2774 >        for (ExecutionMode m : ExecutionMode.values())
2775 >        for (boolean fFirst : new boolean[] { true, false })
2776 >        for (Integer v1 : new Integer[] { 1, null })
2777 >    {
2778 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2779 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2780 >        final CFException ex = new CFException();
2781 >        final Noop[] rs = new Noop[6];
2782 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2783  
2784 <        f = new CompletableFuture<>();
2785 <        g = new CompletableFuture<>();
2786 <        assertTrue(f.cancel(true));
2787 <        assertTrue(g.cancel(true));
2788 <        h = f.thenCombineAsync(g, subtract, e);
2789 <        checkCompletedWithWrappedCancellationException(h);
2784 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2785 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2786 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2787 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2788 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2789 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2790 >
2791 >        // unspecified behavior - both source completions available
2792 >        try {
2793 >            assertEquals(null, h0.join());
2794 >            rs[0].assertInvoked();
2795 >        } catch (CompletionException ok) {
2796 >            checkCompletedWithWrappedException(h0, ex);
2797 >            rs[0].assertNotInvoked();
2798 >        }
2799 >        try {
2800 >            assertEquals(null, h1.join());
2801 >            rs[1].assertInvoked();
2802 >        } catch (CompletionException ok) {
2803 >            checkCompletedWithWrappedException(h1, ex);
2804 >            rs[1].assertNotInvoked();
2805 >        }
2806 >        try {
2807 >            assertEquals(null, h2.join());
2808 >            rs[2].assertInvoked();
2809 >        } catch (CompletionException ok) {
2810 >            checkCompletedWithWrappedException(h2, ex);
2811 >            rs[2].assertNotInvoked();
2812 >        }
2813 >        try {
2814 >            assertEquals(null, h3.join());
2815 >            rs[3].assertInvoked();
2816 >        } catch (CompletionException ok) {
2817 >            checkCompletedWithWrappedException(h3, ex);
2818 >            rs[3].assertNotInvoked();
2819 >        }
2820  
2821 <        assertEquals(0, e.count.get());
2822 <    }
2821 >        checkCompletedNormally(f, v1);
2822 >        checkCompletedExceptionally(g, ex);
2823 >    }}
2824  
2825      /**
2826 <     * applyToEitherAsync result completes normally after normal
2619 <     * completion of sources
2826 >     * runAfterEither result completes exceptionally if either source cancelled
2827       */
2828 <    public void testApplyToEitherAsyncE() {
2829 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2830 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2831 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2832 <        f.complete(one);
2833 <        checkCompletedNormally(g, two);
2834 <
2835 <        f = new CompletableFuture<>();
2836 <        f.complete(one);
2630 <        f2 = new CompletableFuture<>();
2631 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2632 <        checkCompletedNormally(g, two);
2633 <    }
2828 >    public void testRunAfterEither_sourceCancelled() {
2829 >        for (ExecutionMode m : ExecutionMode.values())
2830 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2831 >        for (Integer v1 : new Integer[] { 1, null })
2832 >    {
2833 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2834 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2835 >        final Noop[] rs = new Noop[6];
2836 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2837  
2838 <    /**
2839 <     * applyToEitherAsync result completes exceptionally after exceptional
2840 <     * completion of source
2841 <     */
2842 <    public void testApplyToEitherAsync2E() {
2843 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2844 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2845 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2846 <        f.completeExceptionally(new CFException());
2847 <        checkCompletedWithWrappedCFException(g);
2838 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2839 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2840 >        checkIncomplete(h0);
2841 >        checkIncomplete(h1);
2842 >        rs[0].assertNotInvoked();
2843 >        rs[1].assertNotInvoked();
2844 >        f.cancel(mayInterruptIfRunning);
2845 >        checkCompletedWithWrappedCancellationException(h0);
2846 >        checkCompletedWithWrappedCancellationException(h1);
2847 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2848 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2849 >        checkCompletedWithWrappedCancellationException(h2);
2850 >        checkCompletedWithWrappedCancellationException(h3);
2851 >
2852 >        assertTrue(g.complete(v1));
2853 >
2854 >        // unspecified behavior - both source completions available
2855 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2856 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2857 >        try {
2858 >            assertNull(h4.join());
2859 >            rs[4].assertInvoked();
2860 >        } catch (CompletionException ok) {
2861 >            checkCompletedWithWrappedCancellationException(h4);
2862 >            rs[4].assertNotInvoked();
2863 >        }
2864 >        try {
2865 >            assertNull(h5.join());
2866 >            rs[5].assertInvoked();
2867 >        } catch (CompletionException ok) {
2868 >            checkCompletedWithWrappedCancellationException(h5);
2869 >            rs[5].assertNotInvoked();
2870 >        }
2871  
2872 <        f = new CompletableFuture<>();
2873 <        f2 = new CompletableFuture<>();
2874 <        f2.completeExceptionally(new CFException());
2875 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2876 <        f.complete(one);
2877 <        checkCompletedWithWrappedCFException(g);
2878 <    }
2872 >        checkCancelled(f);
2873 >        checkCompletedNormally(g, v1);
2874 >        checkCompletedWithWrappedCancellationException(h0);
2875 >        checkCompletedWithWrappedCancellationException(h1);
2876 >        checkCompletedWithWrappedCancellationException(h2);
2877 >        checkCompletedWithWrappedCancellationException(h3);
2878 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2879 >    }}
2880  
2881      /**
2882 <     * applyToEitherAsync result completes exceptionally if action does
2882 >     * runAfterEither result completes exceptionally if action does
2883       */
2884 <    public void testApplyToEitherAsync3E() {
2885 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2886 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2887 <        FailingFunction r = new FailingFunction();
2888 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2889 <        f.complete(one);
2890 <        checkCompletedWithWrappedCFException(g);
2891 <    }
2884 >    public void testRunAfterEither_actionFailed() {
2885 >        for (ExecutionMode m : ExecutionMode.values())
2886 >        for (Integer v1 : new Integer[] { 1, null })
2887 >        for (Integer v2 : new Integer[] { 2, null })
2888 >    {
2889 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2890 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2891 >        final FailingRunnable[] rs = new FailingRunnable[6];
2892 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2893  
2894 <    /**
2895 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2896 <     */
2897 <    public void testApplyToEitherAsync4E() {
2898 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2899 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2900 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2901 <        assertTrue(f.cancel(true));
2902 <        checkCompletedWithWrappedCancellationException(g);
2894 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2895 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2896 >        assertTrue(f.complete(v1));
2897 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2898 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2899 >        checkCompletedWithWrappedCFException(h0);
2900 >        checkCompletedWithWrappedCFException(h1);
2901 >        checkCompletedWithWrappedCFException(h2);
2902 >        checkCompletedWithWrappedCFException(h3);
2903 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2904 >        assertTrue(g.complete(v2));
2905 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2906 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2907 >        checkCompletedWithWrappedCFException(h4);
2908 >        checkCompletedWithWrappedCFException(h5);
2909  
2910 <        f = new CompletableFuture<>();
2911 <        f2 = new CompletableFuture<>();
2912 <        assertTrue(f2.cancel(true));
2913 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2680 <        checkCompletedWithWrappedCancellationException(g);
2681 <    }
2910 >        checkCompletedNormally(f, v1);
2911 >        checkCompletedNormally(g, v2);
2912 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2913 >    }}
2914  
2915      /**
2916 <     * acceptEitherAsync result completes normally after normal
2685 <     * completion of sources
2916 >     * thenCompose result completes normally after normal completion of source
2917       */
2918 <    public void testAcceptEitherAsyncE() {
2919 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2920 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2921 <        IncAction r = new IncAction();
2922 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2923 <        f.complete(one);
2924 <        checkCompletedNormally(g, null);
2925 <        assertEquals(r.value, 2);
2918 >    public void testThenCompose_normalCompletion() {
2919 >        for (ExecutionMode m : ExecutionMode.values())
2920 >        for (boolean createIncomplete : new boolean[] { true, false })
2921 >        for (Integer v1 : new Integer[] { 1, null })
2922 >    {
2923 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2924 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2925 >        if (!createIncomplete) assertTrue(f.complete(v1));
2926 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2927 >        if (createIncomplete) assertTrue(f.complete(v1));
2928  
2929 <        r = new IncAction();
2930 <        f = new CompletableFuture<>();
2931 <        f.complete(one);
2932 <        f2 = new CompletableFuture<>();
2700 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2701 <        checkCompletedNormally(g, null);
2702 <        assertEquals(r.value, 2);
2703 <    }
2929 >        checkCompletedNormally(g, inc(v1));
2930 >        checkCompletedNormally(f, v1);
2931 >        r.assertValue(v1);
2932 >    }}
2933  
2934      /**
2935 <     * acceptEitherAsync result completes exceptionally after exceptional
2935 >     * thenCompose result completes exceptionally after exceptional
2936       * completion of source
2937       */
2938 <    public void testAcceptEitherAsync2E() {
2939 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2940 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2941 <        IncAction r = new IncAction();
2942 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2943 <        f.completeExceptionally(new CFException());
2944 <        checkCompletedWithWrappedCFException(g);
2945 <
2946 <        r = new IncAction();
2947 <        f = new CompletableFuture<>();
2948 <        f2 = new CompletableFuture<>();
2949 <        f2.completeExceptionally(new CFException());
2950 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2951 <        f.complete(one);
2952 <        checkCompletedWithWrappedCFException(g);
2724 <    }
2725 <
2726 <    /**
2727 <     * acceptEitherAsync result completes exceptionally if action does
2728 <     */
2729 <    public void testAcceptEitherAsync3E() {
2730 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2731 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2732 <        FailingConsumer r = new FailingConsumer();
2733 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2734 <        f.complete(one);
2735 <        checkCompletedWithWrappedCFException(g);
2736 <    }
2737 <
2738 <    /**
2739 <     * acceptEitherAsync result completes exceptionally if either
2740 <     * source cancelled
2741 <     */
2742 <    public void testAcceptEitherAsync4E() {
2743 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2744 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2745 <        IncAction r = new IncAction();
2746 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2747 <        assertTrue(f.cancel(true));
2748 <        checkCompletedWithWrappedCancellationException(g);
2749 <
2750 <        r = new IncAction();
2751 <        f = new CompletableFuture<>();
2752 <        f2 = new CompletableFuture<>();
2753 <        assertTrue(f2.cancel(true));
2754 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2755 <        checkCompletedWithWrappedCancellationException(g);
2756 <    }
2757 <
2758 <    /**
2759 <     * runAfterEitherAsync result completes normally after normal
2760 <     * completion of sources
2761 <     */
2762 <    public void testRunAfterEitherAsyncE() {
2763 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2764 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2765 <        Noop r = new Noop();
2766 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2767 <        f.complete(one);
2768 <        checkCompletedNormally(g, null);
2769 <        assertTrue(r.ran);
2770 <
2771 <        r = new Noop();
2772 <        f = new CompletableFuture<>();
2773 <        f.complete(one);
2774 <        f2 = new CompletableFuture<>();
2775 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2776 <        checkCompletedNormally(g, null);
2777 <        assertTrue(r.ran);
2778 <    }
2938 >    public void testThenCompose_exceptionalCompletion() {
2939 >        for (ExecutionMode m : ExecutionMode.values())
2940 >        for (boolean createIncomplete : new boolean[] { true, false })
2941 >    {
2942 >        final CFException ex = new CFException();
2943 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2944 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2945 >        if (!createIncomplete) f.completeExceptionally(ex);
2946 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2947 >        if (createIncomplete) f.completeExceptionally(ex);
2948 >
2949 >        checkCompletedWithWrappedException(g, ex);
2950 >        checkCompletedExceptionally(f, ex);
2951 >        r.assertNotInvoked();
2952 >    }}
2953  
2954      /**
2955 <     * runAfterEitherAsync result completes exceptionally after exceptional
2782 <     * completion of source
2955 >     * thenCompose result completes exceptionally if action does
2956       */
2957 <    public void testRunAfterEitherAsync2E() {
2958 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2959 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2960 <        Noop r = new Noop();
2961 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2962 <        f.completeExceptionally(new CFException());
2963 <        checkCompletedWithWrappedCFException(g);
2964 <
2965 <        r = new Noop();
2966 <        f = new CompletableFuture<>();
2967 <        f2 = new CompletableFuture<>();
2795 <        f2.completeExceptionally(new CFException());
2796 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2797 <        f.complete(one);
2798 <        checkCompletedWithWrappedCFException(g);
2799 <    }
2957 >    public void testThenCompose_actionFailed() {
2958 >        for (ExecutionMode m : ExecutionMode.values())
2959 >        for (boolean createIncomplete : new boolean[] { true, false })
2960 >        for (Integer v1 : new Integer[] { 1, null })
2961 >    {
2962 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2963 >        final FailingCompletableFutureFunction r
2964 >            = new FailingCompletableFutureFunction(m);
2965 >        if (!createIncomplete) assertTrue(f.complete(v1));
2966 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2967 >        if (createIncomplete) assertTrue(f.complete(v1));
2968  
2801    /**
2802     * runAfterEitherAsync result completes exceptionally if action does
2803     */
2804    public void testRunAfterEitherAsync3E() {
2805        CompletableFuture<Integer> f = new CompletableFuture<>();
2806        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2807        FailingNoop r = new FailingNoop();
2808        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2809        f.complete(one);
2969          checkCompletedWithWrappedCFException(g);
2970 <    }
2970 >        checkCompletedNormally(f, v1);
2971 >    }}
2972  
2973      /**
2974 <     * runAfterEitherAsync result completes exceptionally if either
2815 <     * source cancelled
2974 >     * thenCompose result completes exceptionally if source cancelled
2975       */
2976 <    public void testRunAfterEitherAsync4E() {
2977 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2978 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2979 <        Noop r = new Noop();
2980 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2981 <        assertTrue(f.cancel(true));
2982 <        checkCompletedWithWrappedCancellationException(g);
2976 >    public void testThenCompose_sourceCancelled() {
2977 >        for (ExecutionMode m : ExecutionMode.values())
2978 >        for (boolean createIncomplete : new boolean[] { true, false })
2979 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2980 >    {
2981 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2982 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2983 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2984 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2985 >        if (createIncomplete) {
2986 >            checkIncomplete(g);
2987 >            assertTrue(f.cancel(mayInterruptIfRunning));
2988 >        }
2989  
2825        r = new Noop();
2826        f = new CompletableFuture<>();
2827        f2 = new CompletableFuture<>();
2828        assertTrue(f2.cancel(true));
2829        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2990          checkCompletedWithWrappedCancellationException(g);
2991 <    }
2992 <
2833 <    /**
2834 <     * thenComposeAsync result completes normally after normal
2835 <     * completion of source
2836 <     */
2837 <    public void testThenComposeAsyncE() {
2838 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2839 <        CompletableFutureInc r = new CompletableFutureInc();
2840 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2841 <        f.complete(one);
2842 <        checkCompletedNormally(g, two);
2843 <    }
2844 <
2845 <    /**
2846 <     * thenComposeAsync result completes exceptionally after
2847 <     * exceptional completion of source
2848 <     */
2849 <    public void testThenComposeAsync2E() {
2850 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2851 <        CompletableFutureInc r = new CompletableFutureInc();
2852 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2853 <        f.completeExceptionally(new CFException());
2854 <        checkCompletedWithWrappedCFException(g);
2855 <    }
2991 >        checkCancelled(f);
2992 >    }}
2993  
2994      /**
2995 <     * thenComposeAsync result completes exceptionally if action does
2995 >     * thenCompose result completes exceptionally if the result of the action does
2996       */
2997 <    public void testThenComposeAsync3E() {
2998 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2999 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3000 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3001 <        f.complete(one);
3002 <        checkCompletedWithWrappedCFException(g);
3003 <    }
2997 >    public void testThenCompose_actionReturnsFailingFuture() {
2998 >        for (ExecutionMode m : ExecutionMode.values())
2999 >        for (int order = 0; order < 6; order++)
3000 >        for (Integer v1 : new Integer[] { 1, null })
3001 >    {
3002 >        final CFException ex = new CFException();
3003 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3004 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3005 >        final CompletableFuture<Integer> h;
3006 >        // Test all permutations of orders
3007 >        switch (order) {
3008 >        case 0:
3009 >            assertTrue(f.complete(v1));
3010 >            assertTrue(g.completeExceptionally(ex));
3011 >            h = m.thenCompose(f, (x -> g));
3012 >            break;
3013 >        case 1:
3014 >            assertTrue(f.complete(v1));
3015 >            h = m.thenCompose(f, (x -> g));
3016 >            assertTrue(g.completeExceptionally(ex));
3017 >            break;
3018 >        case 2:
3019 >            assertTrue(g.completeExceptionally(ex));
3020 >            assertTrue(f.complete(v1));
3021 >            h = m.thenCompose(f, (x -> g));
3022 >            break;
3023 >        case 3:
3024 >            assertTrue(g.completeExceptionally(ex));
3025 >            h = m.thenCompose(f, (x -> g));
3026 >            assertTrue(f.complete(v1));
3027 >            break;
3028 >        case 4:
3029 >            h = m.thenCompose(f, (x -> g));
3030 >            assertTrue(f.complete(v1));
3031 >            assertTrue(g.completeExceptionally(ex));
3032 >            break;
3033 >        case 5:
3034 >            h = m.thenCompose(f, (x -> g));
3035 >            assertTrue(f.complete(v1));
3036 >            assertTrue(g.completeExceptionally(ex));
3037 >            break;
3038 >        default: throw new AssertionError();
3039 >        }
3040  
3041 <    /**
3042 <     * thenComposeAsync result completes exceptionally if source cancelled
3043 <     */
3044 <    public void testThenComposeAsync4E() {
2872 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2873 <        CompletableFutureInc r = new CompletableFutureInc();
2874 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2875 <        assertTrue(f.cancel(true));
2876 <        checkCompletedWithWrappedCancellationException(g);
2877 <    }
3041 >        checkCompletedExceptionally(g, ex);
3042 >        checkCompletedWithWrappedException(h, ex);
3043 >        checkCompletedNormally(f, v1);
3044 >    }}
3045  
3046      // other static methods
3047  
# Line 2892 | Line 3059 | public class CompletableFutureTest exten
3059       * when all components complete normally
3060       */
3061      public void testAllOf_normal() throws Exception {
3062 <        for (int k = 1; k < 20; ++k) {
3063 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3064 <            for (int i = 0; i < k; ++i)
3062 >        for (int k = 1; k < 10; k++) {
3063 >            CompletableFuture<Integer>[] fs
3064 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3065 >            for (int i = 0; i < k; i++)
3066                  fs[i] = new CompletableFuture<>();
3067              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3068 <            for (int i = 0; i < k; ++i) {
3068 >            for (int i = 0; i < k; i++) {
3069                  checkIncomplete(f);
3070                  checkIncomplete(CompletableFuture.allOf(fs));
3071                  fs[i].complete(one);
# Line 2907 | Line 3075 | public class CompletableFutureTest exten
3075          }
3076      }
3077  
3078 +    public void testAllOf_backwards() throws Exception {
3079 +        for (int k = 1; k < 10; k++) {
3080 +            CompletableFuture<Integer>[] fs
3081 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3082 +            for (int i = 0; i < k; i++)
3083 +                fs[i] = new CompletableFuture<>();
3084 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3085 +            for (int i = k - 1; i >= 0; i--) {
3086 +                checkIncomplete(f);
3087 +                checkIncomplete(CompletableFuture.allOf(fs));
3088 +                fs[i].complete(one);
3089 +            }
3090 +            checkCompletedNormally(f, null);
3091 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3092 +        }
3093 +    }
3094 +
3095 +    public void testAllOf_exceptional() throws Exception {
3096 +        for (int k = 1; k < 10; k++) {
3097 +            CompletableFuture<Integer>[] fs
3098 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3099 +            CFException ex = new CFException();
3100 +            for (int i = 0; i < k; i++)
3101 +                fs[i] = new CompletableFuture<>();
3102 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3103 +            for (int i = 0; i < k; i++) {
3104 +                checkIncomplete(f);
3105 +                checkIncomplete(CompletableFuture.allOf(fs));
3106 +                if (i != k/2) {
3107 +                    fs[i].complete(i);
3108 +                    checkCompletedNormally(fs[i], i);
3109 +                } else {
3110 +                    fs[i].completeExceptionally(ex);
3111 +                    checkCompletedExceptionally(fs[i], ex);
3112 +                }
3113 +            }
3114 +            checkCompletedWithWrappedException(f, ex);
3115 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3116 +        }
3117 +    }
3118 +
3119      /**
3120       * anyOf(no component futures) returns an incomplete future
3121       */
3122      public void testAnyOf_empty() throws Exception {
3123 +        for (Integer v1 : new Integer[] { 1, null })
3124 +    {
3125          CompletableFuture<Object> f = CompletableFuture.anyOf();
3126          checkIncomplete(f);
3127 <    }
3127 >
3128 >        f.complete(v1);
3129 >        checkCompletedNormally(f, v1);
3130 >    }}
3131  
3132      /**
3133       * anyOf returns a future completed normally with a value when
3134       * a component future does
3135       */
3136      public void testAnyOf_normal() throws Exception {
3137 <        for (int k = 0; k < 10; ++k) {
3137 >        for (int k = 0; k < 10; k++) {
3138              CompletableFuture[] fs = new CompletableFuture[k];
3139 <            for (int i = 0; i < k; ++i)
3139 >            for (int i = 0; i < k; i++)
3140                  fs[i] = new CompletableFuture<>();
3141              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3142              checkIncomplete(f);
3143 <            for (int i = 0; i < k; ++i) {
3144 <                fs[i].complete(one);
3145 <                checkCompletedNormally(f, one);
3146 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3143 >            for (int i = 0; i < k; i++) {
3144 >                fs[i].complete(i);
3145 >                checkCompletedNormally(f, 0);
3146 >                int x = (int) CompletableFuture.anyOf(fs).join();
3147 >                assertTrue(0 <= x && x <= i);
3148 >            }
3149 >        }
3150 >    }
3151 >    public void testAnyOf_normal_backwards() throws Exception {
3152 >        for (int k = 0; k < 10; k++) {
3153 >            CompletableFuture[] fs = new CompletableFuture[k];
3154 >            for (int i = 0; i < k; i++)
3155 >                fs[i] = new CompletableFuture<>();
3156 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3157 >            checkIncomplete(f);
3158 >            for (int i = k - 1; i >= 0; i--) {
3159 >                fs[i].complete(i);
3160 >                checkCompletedNormally(f, k - 1);
3161 >                int x = (int) CompletableFuture.anyOf(fs).join();
3162 >                assertTrue(i <= x && x <= k - 1);
3163              }
3164          }
3165      }
# Line 2938 | Line 3168 | public class CompletableFutureTest exten
3168       * anyOf result completes exceptionally when any component does.
3169       */
3170      public void testAnyOf_exceptional() throws Exception {
3171 <        for (int k = 0; k < 10; ++k) {
3171 >        for (int k = 0; k < 10; k++) {
3172              CompletableFuture[] fs = new CompletableFuture[k];
3173 <            for (int i = 0; i < k; ++i)
3173 >            CFException[] exs = new CFException[k];
3174 >            for (int i = 0; i < k; i++) {
3175                  fs[i] = new CompletableFuture<>();
3176 +                exs[i] = new CFException();
3177 +            }
3178              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3179              checkIncomplete(f);
3180 <            for (int i = 0; i < k; ++i) {
3181 <                fs[i].completeExceptionally(new CFException());
3182 <                checkCompletedWithWrappedCFException(f);
3180 >            for (int i = 0; i < k; i++) {
3181 >                fs[i].completeExceptionally(exs[i]);
3182 >                checkCompletedWithWrappedException(f, exs[0]);
3183 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3184 >            }
3185 >        }
3186 >    }
3187 >
3188 >    public void testAnyOf_exceptional_backwards() throws Exception {
3189 >        for (int k = 0; k < 10; k++) {
3190 >            CompletableFuture[] fs = new CompletableFuture[k];
3191 >            CFException[] exs = new CFException[k];
3192 >            for (int i = 0; i < k; i++) {
3193 >                fs[i] = new CompletableFuture<>();
3194 >                exs[i] = new CFException();
3195 >            }
3196 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3197 >            checkIncomplete(f);
3198 >            for (int i = k - 1; i >= 0; i--) {
3199 >                fs[i].completeExceptionally(exs[i]);
3200 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3201                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3202              }
3203          }
# Line 2959 | Line 3210 | public class CompletableFutureTest exten
3210          CompletableFuture<Integer> f = new CompletableFuture<>();
3211          CompletableFuture<Integer> g = new CompletableFuture<>();
3212          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2962        CompletableFuture<?> h;
3213          ThreadExecutor exec = new ThreadExecutor();
3214  
3215          Runnable[] throwingActions = {
3216              () -> CompletableFuture.supplyAsync(null),
3217              () -> CompletableFuture.supplyAsync(null, exec),
3218 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3218 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3219  
3220              () -> CompletableFuture.runAsync(null),
3221              () -> CompletableFuture.runAsync(null, exec),
# Line 3038 | Line 3288 | public class CompletableFutureTest exten
3288  
3289              () -> f.thenCompose(null),
3290              () -> f.thenComposeAsync(null),
3291 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3291 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3292              () -> f.thenComposeAsync(null, exec),
3293  
3294              () -> f.exceptionally(null),
# Line 3070 | Line 3320 | public class CompletableFutureTest exten
3320          assertSame(f, f.toCompletableFuture());
3321      }
3322  
3323 <    /**
3074 <     * whenComplete action executes on normal completion, propagating
3075 <     * source result.
3076 <     */
3077 <    public void testWhenComplete1() {
3078 <        final AtomicInteger a = new AtomicInteger();
3079 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3080 <        CompletableFuture<Integer> g =
3081 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3082 <        f.complete(three);
3083 <        checkCompletedNormally(f, three);
3084 <        checkCompletedNormally(g, three);
3085 <        assertEquals(a.get(), 1);
3086 <    }
3087 <
3088 <    /**
3089 <     * whenComplete action executes on exceptional completion, propagating
3090 <     * source result.
3091 <     */
3092 <    public void testWhenComplete2() {
3093 <        final AtomicInteger a = new AtomicInteger();
3094 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3095 <        CompletableFuture<Integer> g =
3096 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3097 <        f.completeExceptionally(new CFException());
3098 <        assertTrue(f.isCompletedExceptionally());
3099 <        assertTrue(g.isCompletedExceptionally());
3100 <        assertEquals(a.get(), 1);
3101 <    }
3102 <
3103 <    /**
3104 <     * If a whenComplete action throws an exception when triggered by
3105 <     * a normal completion, it completes exceptionally
3106 <     */
3107 <    public void testWhenComplete3() {
3108 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3109 <        CompletableFuture<Integer> g =
3110 <            f.whenComplete((Integer x, Throwable t) ->
3111 <                           { throw new CFException(); } );
3112 <        f.complete(three);
3113 <        checkCompletedNormally(f, three);
3114 <        assertTrue(g.isCompletedExceptionally());
3115 <        checkCompletedWithWrappedCFException(g);
3116 <    }
3117 <
3118 <    /**
3119 <     * whenCompleteAsync action executes on normal completion, propagating
3120 <     * source result.
3121 <     */
3122 <    public void testWhenCompleteAsync1() {
3123 <        final AtomicInteger a = new AtomicInteger();
3124 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3125 <        CompletableFuture<Integer> g =
3126 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3127 <        f.complete(three);
3128 <        checkCompletedNormally(f, three);
3129 <        checkCompletedNormally(g, three);
3130 <        assertEquals(a.get(), 1);
3131 <    }
3132 <
3133 <    /**
3134 <     * whenCompleteAsync action executes on exceptional completion, propagating
3135 <     * source result.
3136 <     */
3137 <    public void testWhenCompleteAsync2() {
3138 <        final AtomicInteger a = new AtomicInteger();
3139 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3140 <        CompletableFuture<Integer> g =
3141 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3142 <        f.completeExceptionally(new CFException());
3143 <        checkCompletedWithWrappedCFException(f);
3144 <        checkCompletedWithWrappedCFException(g);
3145 <    }
3146 <
3147 <    /**
3148 <     * If a whenCompleteAsync action throws an exception when
3149 <     * triggered by a normal completion, it completes exceptionally
3150 <     */
3151 <    public void testWhenCompleteAsync3() {
3152 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3153 <        CompletableFuture<Integer> g =
3154 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3155 <                           { throw new CFException(); } );
3156 <        f.complete(three);
3157 <        checkCompletedNormally(f, three);
3158 <        checkCompletedWithWrappedCFException(g);
3159 <    }
3323 >    //--- tests of implementation details; not part of official tck ---
3324  
3325 <    /**
3326 <     * whenCompleteAsync action executes on normal completion, propagating
3327 <     * source result.
3328 <     */
3329 <    public void testWhenCompleteAsync1e() {
3330 <        final AtomicInteger a = new AtomicInteger();
3331 <        ThreadExecutor exec = new ThreadExecutor();
3168 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3169 <        CompletableFuture<Integer> g =
3170 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3171 <                                exec);
3172 <        f.complete(three);
3173 <        checkCompletedNormally(f, three);
3174 <        checkCompletedNormally(g, three);
3175 <        assertEquals(a.get(), 1);
3325 >    Object resultOf(CompletableFuture<?> f) {
3326 >        try {
3327 >            java.lang.reflect.Field resultField
3328 >                = CompletableFuture.class.getDeclaredField("result");
3329 >            resultField.setAccessible(true);
3330 >            return resultField.get(f);
3331 >        } catch (Throwable t) { throw new AssertionError(t); }
3332      }
3333  
3334 <    /**
3335 <     * whenCompleteAsync action executes on exceptional completion, propagating
3336 <     * source result.
3337 <     */
3338 <    public void testWhenCompleteAsync2e() {
3339 <        final AtomicInteger a = new AtomicInteger();
3340 <        ThreadExecutor exec = new ThreadExecutor();
3185 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3186 <        CompletableFuture<Integer> g =
3187 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3188 <                                exec);
3189 <        f.completeExceptionally(new CFException());
3190 <        checkCompletedWithWrappedCFException(f);
3191 <        checkCompletedWithWrappedCFException(g);
3192 <    }
3334 >    public void testExceptionPropagationReusesResultObject() {
3335 >        if (!testImplementationDetails) return;
3336 >        for (ExecutionMode m : ExecutionMode.values())
3337 >    {
3338 >        final CFException ex = new CFException();
3339 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3340 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3341  
3342 <    /**
3343 <     * If a whenCompleteAsync action throws an exception when triggered
3196 <     * by a normal completion, it completes exceptionally
3197 <     */
3198 <    public void testWhenCompleteAsync3e() {
3199 <        ThreadExecutor exec = new ThreadExecutor();
3200 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3201 <        CompletableFuture<Integer> g =
3202 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3203 <                                { throw new CFException(); },
3204 <                                exec);
3205 <        f.complete(three);
3206 <        checkCompletedNormally(f, three);
3207 <        checkCompletedWithWrappedCFException(g);
3208 <    }
3342 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3343 >            = new ArrayList<>();
3344  
3345 <    /**
3346 <     * handleAsync action completes normally with function value on
3347 <     * either normal or exceptional completion of source
3213 <     */
3214 <    public void testHandleAsync() {
3215 <        CompletableFuture<Integer> f, g;
3216 <        IntegerHandler r;
3345 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3346 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3347 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3348  
3349 <        f = new CompletableFuture<>();
3350 <        g = f.handleAsync(r = new IntegerHandler());
3351 <        assertFalse(r.ran);
3221 <        f.completeExceptionally(new CFException());
3222 <        checkCompletedWithWrappedCFException(f);
3223 <        checkCompletedNormally(g, three);
3224 <        assertTrue(r.ran);
3349 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3350 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3351 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3352  
3353 <        f = new CompletableFuture<>();
3354 <        g = f.handleAsync(r = new IntegerHandler());
3355 <        assertFalse(r.ran);
3229 <        f.completeExceptionally(new CFException());
3230 <        checkCompletedWithWrappedCFException(f);
3231 <        checkCompletedNormally(g, three);
3232 <        assertTrue(r.ran);
3353 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3354 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3355 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3356  
3357 <        f = new CompletableFuture<>();
3235 <        g = f.handleAsync(r = new IntegerHandler());
3236 <        assertFalse(r.ran);
3237 <        f.complete(one);
3238 <        checkCompletedNormally(f, one);
3239 <        checkCompletedNormally(g, two);
3240 <        assertTrue(r.ran);
3357 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3358  
3359 <        f = new CompletableFuture<>();
3243 <        g = f.handleAsync(r = new IntegerHandler());
3244 <        assertFalse(r.ran);
3245 <        f.complete(one);
3246 <        checkCompletedNormally(f, one);
3247 <        checkCompletedNormally(g, two);
3248 <        assertTrue(r.ran);
3249 <    }
3359 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3360  
3361 <    /**
3362 <     * handleAsync action with Executor completes normally with
3253 <     * function value on either normal or exceptional completion of
3254 <     * source
3255 <     */
3256 <    public void testHandleAsync2() {
3257 <        CompletableFuture<Integer> f, g;
3258 <        ThreadExecutor exec = new ThreadExecutor();
3259 <        IntegerHandler r;
3361 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3362 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3363  
3364 <        f = new CompletableFuture<>();
3365 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3366 <        assertFalse(r.ran);
3367 <        f.completeExceptionally(new CFException());
3368 <        checkCompletedWithWrappedCFException(f);
3369 <        checkCompletedNormally(g, three);
3370 <        assertTrue(r.ran);
3364 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3365 >                 fun : funs) {
3366 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3367 >            f.completeExceptionally(ex);
3368 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3369 >            checkCompletedWithWrappedException(src, ex);
3370 >            CompletableFuture<?> dep = fun.apply(src);
3371 >            checkCompletedWithWrappedException(dep, ex);
3372 >            assertSame(resultOf(src), resultOf(dep));
3373 >        }
3374  
3375 <        f = new CompletableFuture<>();
3376 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3377 <        assertFalse(r.ran);
3378 <        f.completeExceptionally(new CFException());
3379 <        checkCompletedWithWrappedCFException(f);
3380 <        checkCompletedNormally(g, three);
3381 <        assertTrue(r.ran);
3375 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3376 >                 fun : funs) {
3377 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3378 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3379 >            CompletableFuture<?> dep = fun.apply(src);
3380 >            f.completeExceptionally(ex);
3381 >            checkCompletedWithWrappedException(src, ex);
3382 >            checkCompletedWithWrappedException(dep, ex);
3383 >            assertSame(resultOf(src), resultOf(dep));
3384 >        }
3385  
3386 <        f = new CompletableFuture<>();
3387 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3388 <        assertFalse(r.ran);
3389 <        f.complete(one);
3390 <        checkCompletedNormally(f, one);
3391 <        checkCompletedNormally(g, two);
3392 <        assertTrue(r.ran);
3386 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3387 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3388 >                 fun : funs) {
3389 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3390 >            f.cancel(mayInterruptIfRunning);
3391 >            checkCancelled(f);
3392 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3393 >            checkCompletedWithWrappedCancellationException(src);
3394 >            CompletableFuture<?> dep = fun.apply(src);
3395 >            checkCompletedWithWrappedCancellationException(dep);
3396 >            assertSame(resultOf(src), resultOf(dep));
3397 >        }
3398  
3399 <        f = new CompletableFuture<>();
3400 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3401 <        assertFalse(r.ran);
3402 <        f.complete(one);
3403 <        checkCompletedNormally(f, one);
3404 <        checkCompletedNormally(g, two);
3405 <        assertTrue(r.ran);
3406 <    }
3399 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3400 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3401 >                 fun : funs) {
3402 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3403 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3404 >            CompletableFuture<?> dep = fun.apply(src);
3405 >            f.cancel(mayInterruptIfRunning);
3406 >            checkCancelled(f);
3407 >            checkCompletedWithWrappedCancellationException(src);
3408 >            checkCompletedWithWrappedCancellationException(dep);
3409 >            assertSame(resultOf(src), resultOf(dep));
3410 >        }
3411 >    }}
3412  
3413   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines