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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines