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.48 by jsr166, Mon Jun 2 19:07:14 2014 UTC vs.
Revision 1.100 by jsr166, Thu Jan 15 18:34:19 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;
24 import static java.util.concurrent.TimeUnit.MILLISECONDS;
25 import static java.util.concurrent.TimeUnit.SECONDS;
26 import java.util.*;
27 import java.util.function.Supplier;
28 import java.util.function.Consumer;
25   import java.util.function.BiConsumer;
30 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 57 | 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));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
61 >        checkTimedGet(f, value);
62 >
63          try {
64              assertEquals(value, f.join());
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 76 | 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 105 | 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 131 | 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 162 | 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 206 | 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 218 | 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 228 | 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 240 | 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 261 | 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());
269 <        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);
279 <    }
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(0, f.getNumberOfDependents());
347 <        CompletableFuture g = f.thenRun(new Noop());
347 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
348          assertEquals(1, f.getNumberOfDependents());
349          assertEquals(0, g.getNumberOfDependents());
350 <        CompletableFuture h = f.thenRun(new Noop());
350 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
351          assertEquals(2, f.getNumberOfDependents());
352 <        f.complete(1);
352 >        assertEquals(0, h.getNumberOfDependents());
353 >        assertTrue(f.complete(v1));
354          checkCompletedNormally(g, null);
355 +        checkCompletedNormally(h, null);
356          assertEquals(0, f.getNumberOfDependents());
357          assertEquals(0, g.getNumberOfDependents());
358 <    }
358 >        assertEquals(0, h.getNumberOfDependents());
359 >    }}
360  
361      /**
362       * toString indicates current completion state
# Line 304 | 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 320 | 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 334 | 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);
341 <    static final BiFunction<Integer, Integer, Integer> subtract =
342 <        (Integer x, Integer y) -> subtract(x, y);
343 <    static final class IncAction implements Consumer<Integer> {
344 <        int invocationCount = 0;
345 <        Integer value;
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;
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.
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.
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;
479 >
480 >    class Noop extends CheckedAction implements Runnable {
481 >        Noop(ExecutionMode m) { super(m); }
482          public void run() {
483 <            invocationCount++;
483 >            invoked();
484          }
485      }
486  
487 <    static final class FailingSupplier implements Supplier<Integer> {
488 <        int invocationCount = 0;
487 >    class FailingSupplier extends CheckedAction
488 >        implements Supplier<Integer>
489 >    {
490 >        FailingSupplier(ExecutionMode m) { super(m); }
491          public Integer get() {
492 <            invocationCount++;
492 >            invoked();
493              throw new CFException();
494          }
495      }
496 <    static final class FailingConsumer implements Consumer<Integer> {
497 <        int invocationCount = 0;
496 >
497 >    class FailingConsumer extends CheckedIntegerAction
498 >        implements Consumer<Integer>
499 >    {
500 >        FailingConsumer(ExecutionMode m) { super(m); }
501          public void accept(Integer x) {
502 <            invocationCount++;
502 >            invoked();
503 >            value = x;
504              throw new CFException();
505          }
506      }
507 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
508 <        int invocationCount = 0;
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 <            invocationCount++;
513 >            invoked();
514 >            value = subtract(x, y);
515              throw new CFException();
516          }
517      }
518 <    static final class FailingFunction implements Function<Integer, Integer> {
519 <        int invocationCount = 0;
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 <            invocationCount++;
524 >            invoked();
525 >            value = x;
526              throw new CFException();
527          }
528      }
529 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
530 <        int invocationCount = 0;
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 <            invocationCount++;
535 >            invoked();
536 >            value = subtract(x, y);
537              throw new CFException();
538          }
539      }
540 <    static final class FailingNoop implements Runnable {
541 <        int invocationCount = 0;
540 >
541 >    class FailingRunnable extends CheckedAction implements Runnable {
542 >        FailingRunnable(ExecutionMode m) { super(m); }
543          public void run() {
544 <            invocationCount++;
544 >            invoked();
545              throw new CFException();
546          }
547      }
548  
549 <    static final class CompletableFutureInc
550 <        implements Function<Integer, CompletableFuture<Integer>> {
551 <        int invocationCount = 0;
549 >    class CompletableFutureInc extends CheckedIntegerAction
550 >        implements Function<Integer, CompletableFuture<Integer>>
551 >    {
552 >        CompletableFutureInc(ExecutionMode m) { super(m); }
553          public CompletableFuture<Integer> apply(Integer x) {
554 <            invocationCount++;
554 >            invoked();
555 >            value = x;
556              CompletableFuture<Integer> f = new CompletableFuture<>();
557 <            f.complete(inc(x));
557 >            assertTrue(f.complete(inc(x)));
558              return f;
559          }
560      }
561  
562 <    static final class FailingCompletableFutureFunction
563 <        implements Function<Integer, CompletableFuture<Integer>> {
564 <        int invocationCount = 0;
562 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
563 >        implements Function<Integer, CompletableFuture<Integer>>
564 >    {
565 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
566          public CompletableFuture<Integer> apply(Integer x) {
567 <            invocationCount++;
567 >            invoked();
568 >            value = x;
569              throw new CFException();
570          }
571      }
572  
573      // Used for explicit executor tests
574      static final class ThreadExecutor implements Executor {
575 <        AtomicInteger count = new AtomicInteger(0);
575 >        final AtomicInteger count = new AtomicInteger(0);
576 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
577 >        static boolean startedCurrentThread() {
578 >            return Thread.currentThread().getThreadGroup() == tg;
579 >        }
580  
581          public void execute(Runnable r) {
582              count.getAndIncrement();
583 <            new Thread(r).start();
583 >            new Thread(tg, r).start();
584          }
585      }
586  
587 +    static final boolean defaultExecutorIsCommonPool
588 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
589 +
590      /**
591       * Permits the testing of parallel code for the 3 different
592 <     * execution modes without repeating all the testing code.
592 >     * execution modes without copy/pasting all the test methods.
593       */
594      enum ExecutionMode {
595 <        DEFAULT {
595 >        SYNC {
596              public void checkExecutionMode() {
597 +                assertFalse(ThreadExecutor.startedCurrentThread());
598                  assertNull(ForkJoinTask.getPool());
599              }
600 +            public CompletableFuture<Void> runAsync(Runnable a) {
601 +                throw new UnsupportedOperationException();
602 +            }
603 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
604 +                throw new UnsupportedOperationException();
605 +            }
606              public <T> CompletableFuture<Void> thenRun
607                  (CompletableFuture<T> f, Runnable a) {
608                  return f.thenRun(a);
# Line 528 | Line 668 | public class CompletableFutureTest exten
668  
669          ASYNC {
670              public void checkExecutionMode() {
671 <                assertSame(ForkJoinPool.commonPool(),
672 <                           ForkJoinTask.getPool());
671 >                assertEquals(defaultExecutorIsCommonPool,
672 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
673 >            }
674 >            public CompletableFuture<Void> runAsync(Runnable a) {
675 >                return CompletableFuture.runAsync(a);
676 >            }
677 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
678 >                return CompletableFuture.supplyAsync(a);
679              }
680              public <T> CompletableFuture<Void> thenRun
681                  (CompletableFuture<T> f, Runnable a) {
# Line 596 | Line 742 | public class CompletableFutureTest exten
742  
743          EXECUTOR {
744              public void checkExecutionMode() {
745 <                //TODO
745 >                assertTrue(ThreadExecutor.startedCurrentThread());
746 >            }
747 >            public CompletableFuture<Void> runAsync(Runnable a) {
748 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
749 >            }
750 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
751 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
752              }
753              public <T> CompletableFuture<Void> thenRun
754                  (CompletableFuture<T> f, Runnable a) {
# Line 662 | Line 814 | public class CompletableFutureTest exten
814          };
815  
816          public abstract void checkExecutionMode();
817 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
818 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
819          public abstract <T> CompletableFuture<Void> thenRun
820              (CompletableFuture<T> f, Runnable a);
821          public abstract <T> CompletableFuture<Void> thenAccept
# Line 711 | Line 865 | public class CompletableFutureTest exten
865      {
866          final AtomicInteger a = new AtomicInteger(0);
867          final CompletableFuture<Integer> f = new CompletableFuture<>();
868 <        if (!createIncomplete) f.complete(v1);
868 >        if (!createIncomplete) assertTrue(f.complete(v1));
869          final CompletableFuture<Integer> g = f.exceptionally
870              ((Throwable t) -> {
871                  // Should not be called
872                  a.getAndIncrement();
873                  throw new AssertionError();
874              });
875 <        if (createIncomplete) f.complete(v1);
875 >        if (createIncomplete) assertTrue(f.complete(v1));
876  
877          checkCompletedNormally(g, v1);
878          checkCompletedNormally(f, v1);
879          assertEquals(0, a.get());
880      }}
881  
728
882      /**
883       * exceptionally action completes with function value on source
884       * exception
# Line 740 | Line 893 | public class CompletableFutureTest exten
893          if (!createIncomplete) f.completeExceptionally(ex);
894          final CompletableFuture<Integer> g = f.exceptionally
895              ((Throwable t) -> {
896 +                ExecutionMode.SYNC.checkExecutionMode();
897                  threadAssertSame(t, ex);
898                  a.getAndIncrement();
899                  return v1;
# Line 761 | Line 915 | public class CompletableFutureTest exten
915          if (!createIncomplete) f.completeExceptionally(ex1);
916          final CompletableFuture<Integer> g = f.exceptionally
917              ((Throwable t) -> {
918 +                ExecutionMode.SYNC.checkExecutionMode();
919 +                threadAssertSame(t, ex1);
920 +                a.getAndIncrement();
921 +                throw ex2;
922 +            });
923 +        if (createIncomplete) f.completeExceptionally(ex1);
924 +
925 +        checkCompletedWithWrappedException(g, ex2);
926 +        assertEquals(1, a.get());
927 +    }}
928 +
929 +    /**
930 +     * whenComplete action executes on normal completion, propagating
931 +     * source result.
932 +     */
933 +    public void testWhenComplete_normalCompletion1() {
934 +        for (ExecutionMode m : ExecutionMode.values())
935 +        for (boolean createIncomplete : new boolean[] { true, false })
936 +        for (Integer v1 : new Integer[] { 1, null })
937 +    {
938 +        final AtomicInteger a = new AtomicInteger(0);
939 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
940 +        if (!createIncomplete) assertTrue(f.complete(v1));
941 +        final CompletableFuture<Integer> g = m.whenComplete
942 +            (f,
943 +             (Integer x, Throwable t) -> {
944 +                m.checkExecutionMode();
945 +                threadAssertSame(x, v1);
946 +                threadAssertNull(t);
947 +                a.getAndIncrement();
948 +            });
949 +        if (createIncomplete) assertTrue(f.complete(v1));
950 +
951 +        checkCompletedNormally(g, v1);
952 +        checkCompletedNormally(f, v1);
953 +        assertEquals(1, a.get());
954 +    }}
955 +
956 +    /**
957 +     * whenComplete action executes on exceptional completion, propagating
958 +     * source result.
959 +     */
960 +    public void testWhenComplete_exceptionalCompletion() {
961 +        for (ExecutionMode m : ExecutionMode.values())
962 +        for (boolean createIncomplete : new boolean[] { true, false })
963 +        for (Integer v1 : new Integer[] { 1, null })
964 +    {
965 +        final AtomicInteger a = new AtomicInteger(0);
966 +        final CFException ex = new CFException();
967 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
968 +        if (!createIncomplete) f.completeExceptionally(ex);
969 +        final CompletableFuture<Integer> g = m.whenComplete
970 +            (f,
971 +             (Integer x, Throwable t) -> {
972 +                m.checkExecutionMode();
973 +                threadAssertNull(x);
974 +                threadAssertSame(t, ex);
975 +                a.getAndIncrement();
976 +            });
977 +        if (createIncomplete) f.completeExceptionally(ex);
978 +
979 +        checkCompletedWithWrappedException(g, ex);
980 +        checkCompletedExceptionally(f, ex);
981 +        assertEquals(1, a.get());
982 +    }}
983 +
984 +    /**
985 +     * whenComplete action executes on cancelled source, propagating
986 +     * CancellationException.
987 +     */
988 +    public void testWhenComplete_sourceCancelled() {
989 +        for (ExecutionMode m : ExecutionMode.values())
990 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
991 +        for (boolean createIncomplete : new boolean[] { true, false })
992 +    {
993 +        final AtomicInteger a = new AtomicInteger(0);
994 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
995 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
996 +        final CompletableFuture<Integer> g = m.whenComplete
997 +            (f,
998 +             (Integer x, Throwable t) -> {
999 +                m.checkExecutionMode();
1000 +                threadAssertNull(x);
1001 +                threadAssertTrue(t instanceof CancellationException);
1002 +                a.getAndIncrement();
1003 +            });
1004 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1005 +
1006 +        checkCompletedWithWrappedCancellationException(g);
1007 +        checkCancelled(f);
1008 +        assertEquals(1, a.get());
1009 +    }}
1010 +
1011 +    /**
1012 +     * If a whenComplete action throws an exception when triggered by
1013 +     * a normal completion, it completes exceptionally
1014 +     */
1015 +    public void testWhenComplete_actionFailed() {
1016 +        for (boolean createIncomplete : new boolean[] { true, false })
1017 +        for (ExecutionMode m : ExecutionMode.values())
1018 +        for (Integer v1 : new Integer[] { 1, null })
1019 +    {
1020 +        final AtomicInteger a = new AtomicInteger(0);
1021 +        final CFException ex = new CFException();
1022 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1023 +        if (!createIncomplete) assertTrue(f.complete(v1));
1024 +        final CompletableFuture<Integer> g = m.whenComplete
1025 +            (f,
1026 +             (Integer x, Throwable t) -> {
1027 +                m.checkExecutionMode();
1028 +                threadAssertSame(x, v1);
1029 +                threadAssertNull(t);
1030 +                a.getAndIncrement();
1031 +                throw ex;
1032 +            });
1033 +        if (createIncomplete) assertTrue(f.complete(v1));
1034 +
1035 +        checkCompletedWithWrappedException(g, ex);
1036 +        checkCompletedNormally(f, v1);
1037 +        assertEquals(1, a.get());
1038 +    }}
1039 +
1040 +    /**
1041 +     * If a whenComplete action throws an exception when triggered by
1042 +     * a source completion that also throws an exception, the source
1043 +     * exception takes precedence.
1044 +     */
1045 +    public void testWhenComplete_actionFailedSourceFailed() {
1046 +        for (boolean createIncomplete : new boolean[] { true, false })
1047 +        for (ExecutionMode m : ExecutionMode.values())
1048 +        for (Integer v1 : new Integer[] { 1, null })
1049 +    {
1050 +        final AtomicInteger a = new AtomicInteger(0);
1051 +        final CFException ex1 = new CFException();
1052 +        final CFException ex2 = new CFException();
1053 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1054 +
1055 +        if (!createIncomplete) f.completeExceptionally(ex1);
1056 +        final CompletableFuture<Integer> g = m.whenComplete
1057 +            (f,
1058 +             (Integer x, Throwable t) -> {
1059 +                m.checkExecutionMode();
1060                  threadAssertSame(t, ex1);
1061 +                threadAssertNull(x);
1062                  a.getAndIncrement();
1063                  throw ex2;
1064              });
1065          if (createIncomplete) f.completeExceptionally(ex1);
1066  
1067 <        checkCompletedWithWrappedCFException(g, ex2);
1067 >        checkCompletedWithWrappedException(g, ex1);
1068 >        checkCompletedExceptionally(f, ex1);
1069          assertEquals(1, a.get());
1070      }}
1071  
# Line 782 | Line 1080 | public class CompletableFutureTest exten
1080      {
1081          final CompletableFuture<Integer> f = new CompletableFuture<>();
1082          final AtomicInteger a = new AtomicInteger(0);
1083 <        if (!createIncomplete) f.complete(v1);
1083 >        if (!createIncomplete) assertTrue(f.complete(v1));
1084          final CompletableFuture<Integer> g = m.handle
1085              (f,
1086               (Integer x, Throwable t) -> {
1087 +                m.checkExecutionMode();
1088                  threadAssertSame(x, v1);
1089                  threadAssertNull(t);
1090                  a.getAndIncrement();
1091                  return inc(v1);
1092              });
1093 <        if (createIncomplete) f.complete(v1);
1093 >        if (createIncomplete) assertTrue(f.complete(v1));
1094  
1095          checkCompletedNormally(g, inc(v1));
1096          checkCompletedNormally(f, v1);
# Line 814 | Line 1113 | public class CompletableFutureTest exten
1113          final CompletableFuture<Integer> g = m.handle
1114              (f,
1115               (Integer x, Throwable t) -> {
1116 +                m.checkExecutionMode();
1117                  threadAssertNull(x);
1118                  threadAssertSame(t, ex);
1119                  a.getAndIncrement();
# Line 822 | Line 1122 | public class CompletableFutureTest exten
1122          if (createIncomplete) f.completeExceptionally(ex);
1123  
1124          checkCompletedNormally(g, v1);
1125 <        checkCompletedWithWrappedCFException(f, ex);
1125 >        checkCompletedExceptionally(f, ex);
1126          assertEquals(1, a.get());
1127      }}
1128  
# Line 842 | Line 1142 | public class CompletableFutureTest exten
1142          final CompletableFuture<Integer> g = m.handle
1143              (f,
1144               (Integer x, Throwable t) -> {
1145 +                m.checkExecutionMode();
1146                  threadAssertNull(x);
1147                  threadAssertTrue(t instanceof CancellationException);
1148                  a.getAndIncrement();
# Line 869 | Line 1170 | public class CompletableFutureTest exten
1170          final CompletableFuture<Integer> g = m.handle
1171              (f,
1172               (Integer x, Throwable t) -> {
1173 +                m.checkExecutionMode();
1174                  threadAssertNull(x);
1175                  threadAssertSame(ex1, t);
1176                  a.getAndIncrement();
# Line 876 | Line 1178 | public class CompletableFutureTest exten
1178              });
1179          if (createIncomplete) f.completeExceptionally(ex1);
1180  
1181 <        checkCompletedWithWrappedCFException(g, ex2);
1182 <        checkCompletedWithWrappedCFException(f, ex1);
1181 >        checkCompletedWithWrappedException(g, ex2);
1182 >        checkCompletedExceptionally(f, ex1);
1183          assertEquals(1, a.get());
1184      }}
1185  
# Line 889 | Line 1191 | public class CompletableFutureTest exten
1191          final CompletableFuture<Integer> f = new CompletableFuture<>();
1192          final AtomicInteger a = new AtomicInteger(0);
1193          final CFException ex = new CFException();
1194 <        if (!createIncomplete) f.complete(v1);
1194 >        if (!createIncomplete) assertTrue(f.complete(v1));
1195          final CompletableFuture<Integer> g = m.handle
1196              (f,
1197               (Integer x, Throwable t) -> {
1198 +                m.checkExecutionMode();
1199                  threadAssertSame(x, v1);
1200                  threadAssertNull(t);
1201                  a.getAndIncrement();
1202                  throw ex;
1203              });
1204 <        if (createIncomplete) f.complete(v1);
1204 >        if (createIncomplete) assertTrue(f.complete(v1));
1205  
1206 <        checkCompletedWithWrappedCFException(g, ex);
1206 >        checkCompletedWithWrappedException(g, ex);
1207          checkCompletedNormally(f, v1);
1208          assertEquals(1, a.get());
1209      }}
# Line 908 | Line 1211 | public class CompletableFutureTest exten
1211      /**
1212       * runAsync completes after running Runnable
1213       */
1214 <    public void testRunAsync() {
1215 <        Noop r = new Noop();
1216 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1217 <        assertNull(f.join());
1218 <        assertEquals(1, r.invocationCount);
1219 <        checkCompletedNormally(f, null);
1220 <    }
1221 <
1222 <    /**
920 <     * runAsync with executor completes after running Runnable
921 <     */
922 <    public void testRunAsync2() {
923 <        Noop r = new Noop();
924 <        ThreadExecutor exec = new ThreadExecutor();
925 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
1214 >    public void testRunAsync_normalCompletion() {
1215 >        ExecutionMode[] executionModes = {
1216 >            ExecutionMode.ASYNC,
1217 >            ExecutionMode.EXECUTOR,
1218 >        };
1219 >        for (ExecutionMode m : executionModes)
1220 >    {
1221 >        final Noop r = new Noop(m);
1222 >        final CompletableFuture<Void> f = m.runAsync(r);
1223          assertNull(f.join());
927        assertEquals(1, r.invocationCount);
1224          checkCompletedNormally(f, null);
1225 <        assertEquals(1, exec.count.get());
1226 <    }
1225 >        r.assertInvoked();
1226 >    }}
1227  
1228      /**
1229       * failing runAsync completes exceptionally after running Runnable
1230       */
1231 <    public void testRunAsync3() {
1232 <        FailingNoop r = new FailingNoop();
1233 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1231 >    public void testRunAsync_exceptionalCompletion() {
1232 >        ExecutionMode[] executionModes = {
1233 >            ExecutionMode.ASYNC,
1234 >            ExecutionMode.EXECUTOR,
1235 >        };
1236 >        for (ExecutionMode m : executionModes)
1237 >    {
1238 >        final FailingRunnable r = new FailingRunnable(m);
1239 >        final CompletableFuture<Void> f = m.runAsync(r);
1240          checkCompletedWithWrappedCFException(f);
1241 <        assertEquals(1, r.invocationCount);
1242 <    }
1241 >        r.assertInvoked();
1242 >    }}
1243  
1244      /**
1245       * supplyAsync completes with result of supplier
1246       */
1247 <    public void testSupplyAsync() {
1248 <        CompletableFuture<Integer> f;
1249 <        f = CompletableFuture.supplyAsync(supplyOne);
1250 <        assertEquals(f.join(), one);
1251 <        checkCompletedNormally(f, one);
1252 <    }
1253 <
1254 <    /**
1255 <     * supplyAsync with executor completes with result of supplier
1256 <     */
1257 <    public void testSupplyAsync2() {
1258 <        CompletableFuture<Integer> f;
1259 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1260 <        assertEquals(f.join(), one);
959 <        checkCompletedNormally(f, one);
960 <    }
1247 >    public void testSupplyAsync_normalCompletion() {
1248 >        ExecutionMode[] executionModes = {
1249 >            ExecutionMode.ASYNC,
1250 >            ExecutionMode.EXECUTOR,
1251 >        };
1252 >        for (ExecutionMode m : executionModes)
1253 >        for (Integer v1 : new Integer[] { 1, null })
1254 >    {
1255 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1256 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1257 >        assertSame(v1, f.join());
1258 >        checkCompletedNormally(f, v1);
1259 >        r.assertInvoked();
1260 >    }}
1261  
1262      /**
1263       * Failing supplyAsync completes exceptionally
1264       */
1265 <    public void testSupplyAsync3() {
1266 <        FailingSupplier r = new FailingSupplier();
1267 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1265 >    public void testSupplyAsync_exceptionalCompletion() {
1266 >        ExecutionMode[] executionModes = {
1267 >            ExecutionMode.ASYNC,
1268 >            ExecutionMode.EXECUTOR,
1269 >        };
1270 >        for (ExecutionMode m : executionModes)
1271 >    {
1272 >        FailingSupplier r = new FailingSupplier(m);
1273 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1274          checkCompletedWithWrappedCFException(f);
1275 <        assertEquals(1, r.invocationCount);
1276 <    }
1275 >        r.assertInvoked();
1276 >    }}
1277  
1278      // seq completion methods
1279  
# Line 976 | Line 1282 | public class CompletableFutureTest exten
1282       */
1283      public void testThenRun_normalCompletion() {
1284          for (ExecutionMode m : ExecutionMode.values())
979        for (boolean createIncomplete : new boolean[] { true, false })
1285          for (Integer v1 : new Integer[] { 1, null })
1286      {
1287          final CompletableFuture<Integer> f = new CompletableFuture<>();
1288 <        final Noop r = new Noop();
1289 <        if (!createIncomplete) f.complete(v1);
985 <        final CompletableFuture<Void> g = m.thenRun(f, r);
986 <        if (createIncomplete) f.complete(v1);
1288 >        final Noop[] rs = new Noop[6];
1289 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1290  
1291 <        checkCompletedNormally(g, null);
1291 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1292 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1293 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1294 >        checkIncomplete(h0);
1295 >        checkIncomplete(h1);
1296 >        checkIncomplete(h2);
1297 >        assertTrue(f.complete(v1));
1298 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1299 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1300 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1301 >
1302 >        checkCompletedNormally(h0, null);
1303 >        checkCompletedNormally(h1, null);
1304 >        checkCompletedNormally(h2, null);
1305 >        checkCompletedNormally(h3, null);
1306 >        checkCompletedNormally(h4, null);
1307 >        checkCompletedNormally(h5, null);
1308          checkCompletedNormally(f, v1);
1309 <        assertEquals(1, r.invocationCount);
1309 >        for (Noop r : rs) r.assertInvoked();
1310      }}
1311  
1312      /**
# Line 996 | Line 1315 | public class CompletableFutureTest exten
1315       */
1316      public void testThenRun_exceptionalCompletion() {
1317          for (ExecutionMode m : ExecutionMode.values())
999        for (boolean createIncomplete : new boolean[] { true, false })
1318      {
1319          final CFException ex = new CFException();
1320          final CompletableFuture<Integer> f = new CompletableFuture<>();
1321 <        final Noop r = new Noop();
1322 <        if (!createIncomplete) f.completeExceptionally(ex);
1005 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1006 <        if (createIncomplete) f.completeExceptionally(ex);
1321 >        final Noop[] rs = new Noop[6];
1322 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1323  
1324 <        checkCompletedWithWrappedCFException(g, ex);
1325 <        checkCompletedWithWrappedCFException(f, ex);
1326 <        assertEquals(0, r.invocationCount);
1324 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1325 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1326 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1327 >        checkIncomplete(h0);
1328 >        checkIncomplete(h1);
1329 >        checkIncomplete(h2);
1330 >        assertTrue(f.completeExceptionally(ex));
1331 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1332 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1333 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1334 >
1335 >        checkCompletedWithWrappedException(h0, ex);
1336 >        checkCompletedWithWrappedException(h1, ex);
1337 >        checkCompletedWithWrappedException(h2, ex);
1338 >        checkCompletedWithWrappedException(h3, ex);
1339 >        checkCompletedWithWrappedException(h4, ex);
1340 >        checkCompletedWithWrappedException(h5, ex);
1341 >        checkCompletedExceptionally(f, ex);
1342 >        for (Noop r : rs) r.assertNotInvoked();
1343      }}
1344  
1345      /**
# Line 1015 | Line 1347 | public class CompletableFutureTest exten
1347       */
1348      public void testThenRun_sourceCancelled() {
1349          for (ExecutionMode m : ExecutionMode.values())
1018        for (boolean createIncomplete : new boolean[] { true, false })
1350          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1351      {
1352          final CompletableFuture<Integer> f = new CompletableFuture<>();
1353 <        final Noop r = new Noop();
1354 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1024 <        final CompletableFuture<Void> g = f.thenRun(r);
1025 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1353 >        final Noop[] rs = new Noop[6];
1354 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1355  
1356 <        checkCompletedWithWrappedCancellationException(g);
1356 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1357 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1358 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1359 >        checkIncomplete(h0);
1360 >        checkIncomplete(h1);
1361 >        checkIncomplete(h2);
1362 >        assertTrue(f.cancel(mayInterruptIfRunning));
1363 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1364 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1365 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1366 >
1367 >        checkCompletedWithWrappedCancellationException(h0);
1368 >        checkCompletedWithWrappedCancellationException(h1);
1369 >        checkCompletedWithWrappedCancellationException(h2);
1370 >        checkCompletedWithWrappedCancellationException(h3);
1371 >        checkCompletedWithWrappedCancellationException(h4);
1372 >        checkCompletedWithWrappedCancellationException(h5);
1373          checkCancelled(f);
1374 <        assertEquals(0, r.invocationCount);
1374 >        for (Noop r : rs) r.assertNotInvoked();
1375      }}
1376  
1377      /**
# Line 1034 | Line 1379 | public class CompletableFutureTest exten
1379       */
1380      public void testThenRun_actionFailed() {
1381          for (ExecutionMode m : ExecutionMode.values())
1037        for (boolean createIncomplete : new boolean[] { true, false })
1382          for (Integer v1 : new Integer[] { 1, null })
1383      {
1384          final CompletableFuture<Integer> f = new CompletableFuture<>();
1385 <        final FailingNoop r = new FailingNoop();
1386 <        if (!createIncomplete) f.complete(v1);
1043 <        final CompletableFuture<Void> g = f.thenRun(r);
1044 <        if (createIncomplete) f.complete(v1);
1385 >        final FailingRunnable[] rs = new FailingRunnable[6];
1386 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1387  
1388 <        checkCompletedWithWrappedCFException(g);
1388 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1389 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1390 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1391 >        assertTrue(f.complete(v1));
1392 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1393 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1394 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1395 >
1396 >        checkCompletedWithWrappedCFException(h0);
1397 >        checkCompletedWithWrappedCFException(h1);
1398 >        checkCompletedWithWrappedCFException(h2);
1399 >        checkCompletedWithWrappedCFException(h3);
1400 >        checkCompletedWithWrappedCFException(h4);
1401 >        checkCompletedWithWrappedCFException(h5);
1402          checkCompletedNormally(f, v1);
1403      }}
1404  
1405      /**
1406       * thenApply result completes normally after normal completion of source
1407       */
1408 <    public void testThenApply() {
1054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1055 <        CompletableFuture<Integer> g = f.thenApply(inc);
1056 <        f.complete(one);
1057 <        checkCompletedNormally(g, two);
1058 <    }
1059 <
1060 <    /**
1061 <     * thenApply result completes exceptionally after exceptional
1062 <     * completion of source
1063 <     */
1064 <    public void testThenApply2() {
1065 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1066 <        CompletableFuture<Integer> g = f.thenApply(inc);
1067 <        f.completeExceptionally(new CFException());
1068 <        checkCompletedWithWrappedCFException(g);
1069 <    }
1070 <
1071 <    /**
1072 <     * thenApply result completes exceptionally if action does
1073 <     */
1074 <    public void testThenApply3() {
1075 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1076 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1077 <        f.complete(one);
1078 <        checkCompletedWithWrappedCFException(g);
1079 <    }
1080 <
1081 <    /**
1082 <     * thenApply result completes exceptionally if source cancelled
1083 <     */
1084 <    public void testThenApply4() {
1085 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1086 <        CompletableFuture<Integer> g = f.thenApply(inc);
1087 <        assertTrue(f.cancel(true));
1088 <        checkCompletedWithWrappedCancellationException(g);
1089 <    }
1090 <
1091 <    /**
1092 <     * thenAccept result completes normally after normal completion of source
1093 <     */
1094 <    public void testThenAccept() {
1095 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1096 <        IncAction r = new IncAction();
1097 <        CompletableFuture<Void> g = f.thenAccept(r);
1098 <        f.complete(one);
1099 <        checkCompletedNormally(g, null);
1100 <        assertEquals(r.value, (Integer) 2);
1101 <    }
1102 <
1103 <    /**
1104 <     * thenAccept result completes exceptionally after exceptional
1105 <     * completion of source
1106 <     */
1107 <    public void testThenAccept2() {
1108 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1109 <        IncAction r = new IncAction();
1110 <        CompletableFuture<Void> g = f.thenAccept(r);
1111 <        f.completeExceptionally(new CFException());
1112 <        checkCompletedWithWrappedCFException(g);
1113 <    }
1114 <
1115 <    /**
1116 <     * thenAccept result completes exceptionally if action does
1117 <     */
1118 <    public void testThenAccept3() {
1119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1120 <        FailingConsumer r = new FailingConsumer();
1121 <        CompletableFuture<Void> g = f.thenAccept(r);
1122 <        f.complete(one);
1123 <        checkCompletedWithWrappedCFException(g);
1124 <        assertEquals(1, r.invocationCount);
1125 <    }
1126 <
1127 <    /**
1128 <     * thenAccept result completes exceptionally if source cancelled
1129 <     */
1130 <    public void testThenAccept4() {
1131 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1132 <        IncAction r = new IncAction();
1133 <        CompletableFuture<Void> g = f.thenAccept(r);
1134 <        assertTrue(f.cancel(true));
1135 <        checkCompletedWithWrappedCancellationException(g);
1136 <    }
1137 <
1138 <    /**
1139 <     * thenCombine result completes normally after normal completion
1140 <     * of sources
1141 <     */
1142 <    public void testThenCombine_normalCompletion1() {
1143 <        for (boolean createIncomplete : new boolean[] { true, false })
1144 <        for (boolean fFirst : new boolean[] { true, false })
1408 >    public void testThenApply_normalCompletion() {
1409          for (ExecutionMode m : ExecutionMode.values())
1410          for (Integer v1 : new Integer[] { 1, null })
1147        for (Integer v2 : new Integer[] { 2, null })
1411      {
1412          final CompletableFuture<Integer> f = new CompletableFuture<>();
1413 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1414 <        final SubtractFunction r = new SubtractFunction();
1152 <        CompletableFuture<Integer> h = null;
1153 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1154 <
1155 <        if (fFirst)
1156 <            f.complete(v1);
1157 <        else
1158 <            g.complete(v2);
1159 <        if (createIncomplete) checkIncomplete(h);
1160 <        assertEquals(0, r.invocationCount);
1161 <        if (!fFirst)
1162 <            f.complete(v1);
1163 <        else
1164 <            g.complete(v2);
1165 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1413 >        final IncFunction[] rs = new IncFunction[4];
1414 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1415  
1416 <        checkCompletedNormally(h, subtract(v1, v2));
1416 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1417 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1418 >        checkIncomplete(h0);
1419 >        checkIncomplete(h1);
1420 >        assertTrue(f.complete(v1));
1421 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1422 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1423 >
1424 >        checkCompletedNormally(h0, inc(v1));
1425 >        checkCompletedNormally(h1, inc(v1));
1426 >        checkCompletedNormally(h2, inc(v1));
1427 >        checkCompletedNormally(h3, inc(v1));
1428          checkCompletedNormally(f, v1);
1429 <        checkCompletedNormally(g, v2);
1170 <        assertEquals(1, r.invocationCount);
1429 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1430      }}
1431  
1432      /**
1433 <     * thenCombine result completes exceptionally after exceptional
1434 <     * completion of either source
1433 >     * thenApply result completes exceptionally after exceptional
1434 >     * completion of source
1435       */
1436 <    public void testThenCombine_exceptionalCompletion1() {
1436 >    public void testThenApply_exceptionalCompletion() {
1437          for (ExecutionMode m : ExecutionMode.values())
1179        for (Integer v1 : new Integer[] { 1, null })
1438      {
1181        final CompletableFuture<Integer> f = new CompletableFuture<>();
1182        final CompletableFuture<Integer> g = new CompletableFuture<>();
1183        final SubtractFunction r = new SubtractFunction();
1184        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1439          final CFException ex = new CFException();
1186
1187        f.completeExceptionally(ex);
1188        checkIncomplete(h);
1189        g.complete(v1);
1190
1191        checkCompletedWithWrappedCFException(h, ex);
1192        checkCompletedWithWrappedCFException(f, ex);
1193        assertEquals(0, r.invocationCount);
1194        checkCompletedNormally(g, v1);
1195    }}
1196
1197    public void testThenCombine_exceptionalCompletion2() {
1198        for (ExecutionMode m : ExecutionMode.values())
1199        for (Integer v1 : new Integer[] { 1, null })
1200    {
1440          final CompletableFuture<Integer> f = new CompletableFuture<>();
1441 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1442 <        final SubtractFunction r = new SubtractFunction();
1204 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1205 <        final CFException ex = new CFException();
1441 >        final IncFunction[] rs = new IncFunction[4];
1442 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1443  
1444 <        g.completeExceptionally(ex);
1445 <        checkIncomplete(h);
1446 <        f.complete(v1);
1444 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1445 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1446 >        assertTrue(f.completeExceptionally(ex));
1447 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1448 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1449  
1450 <        checkCompletedWithWrappedCFException(h, ex);
1451 <        checkCompletedWithWrappedCFException(g, ex);
1452 <        assertEquals(0, r.invocationCount);
1453 <        checkCompletedNormally(f, v1);
1450 >        checkCompletedWithWrappedException(h0, ex);
1451 >        checkCompletedWithWrappedException(h1, ex);
1452 >        checkCompletedWithWrappedException(h2, ex);
1453 >        checkCompletedWithWrappedException(h3, ex);
1454 >        checkCompletedExceptionally(f, ex);
1455 >        for (IncFunction r : rs) r.assertNotInvoked();
1456      }}
1457  
1458 <    public void testThenCombine_exceptionalCompletion3() {
1459 <        for (ExecutionMode m : ExecutionMode.values())
1460 <        for (Integer v1 : new Integer[] { 1, null })
1461 <    {
1221 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1222 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1223 <        final SubtractFunction r = new SubtractFunction();
1224 <        final CFException ex = new CFException();
1225 <
1226 <        g.completeExceptionally(ex);
1227 <        f.complete(v1);
1228 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1229 <
1230 <        checkCompletedWithWrappedCFException(h, ex);
1231 <        checkCompletedWithWrappedCFException(g, ex);
1232 <        assertEquals(0, r.invocationCount);
1233 <        checkCompletedNormally(f, v1);
1234 <    }}
1235 <
1236 <    public void testThenCombine_exceptionalCompletion4() {
1458 >    /**
1459 >     * thenApply result completes exceptionally if source cancelled
1460 >     */
1461 >    public void testThenApply_sourceCancelled() {
1462          for (ExecutionMode m : ExecutionMode.values())
1463 <        for (Integer v1 : new Integer[] { 1, null })
1463 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1464      {
1465          final CompletableFuture<Integer> f = new CompletableFuture<>();
1466 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1467 <        final SubtractFunction r = new SubtractFunction();
1243 <        final CFException ex = new CFException();
1466 >        final IncFunction[] rs = new IncFunction[4];
1467 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1468  
1469 <        f.completeExceptionally(ex);
1470 <        g.complete(v1);
1471 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1469 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1470 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1471 >        assertTrue(f.cancel(mayInterruptIfRunning));
1472 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1473 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1474  
1475 <        checkCompletedWithWrappedCFException(h, ex);
1476 <        checkCompletedWithWrappedCFException(f, ex);
1477 <        assertEquals(0, r.invocationCount);
1478 <        checkCompletedNormally(g, v1);
1475 >        checkCompletedWithWrappedCancellationException(h0);
1476 >        checkCompletedWithWrappedCancellationException(h1);
1477 >        checkCompletedWithWrappedCancellationException(h2);
1478 >        checkCompletedWithWrappedCancellationException(h3);
1479 >        checkCancelled(f);
1480 >        for (IncFunction r : rs) r.assertNotInvoked();
1481      }}
1482  
1483      /**
1484 <     * thenCombine result completes exceptionally if action does
1484 >     * thenApply result completes exceptionally if action does
1485       */
1486 <    public void testThenCombine_actionFailed1() {
1486 >    public void testThenApply_actionFailed() {
1487          for (ExecutionMode m : ExecutionMode.values())
1488          for (Integer v1 : new Integer[] { 1, null })
1261        for (Integer v2 : new Integer[] { 2, null })
1489      {
1490          final CompletableFuture<Integer> f = new CompletableFuture<>();
1491 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1492 <        final FailingBiFunction r = new FailingBiFunction();
1266 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1491 >        final FailingFunction[] rs = new FailingFunction[4];
1492 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1493  
1494 <        f.complete(v1);
1495 <        checkIncomplete(h);
1496 <        g.complete(v2);
1494 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1495 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1496 >        assertTrue(f.complete(v1));
1497 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1498 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1499  
1500 <        checkCompletedWithWrappedCFException(h);
1500 >        checkCompletedWithWrappedCFException(h0);
1501 >        checkCompletedWithWrappedCFException(h1);
1502 >        checkCompletedWithWrappedCFException(h2);
1503 >        checkCompletedWithWrappedCFException(h3);
1504          checkCompletedNormally(f, v1);
1274        checkCompletedNormally(g, v2);
1505      }}
1506  
1507 <    public void testThenCombine_actionFailed2() {
1507 >    /**
1508 >     * thenAccept result completes normally after normal completion of source
1509 >     */
1510 >    public void testThenAccept_normalCompletion() {
1511          for (ExecutionMode m : ExecutionMode.values())
1512          for (Integer v1 : new Integer[] { 1, null })
1280        for (Integer v2 : new Integer[] { 2, null })
1513      {
1514          final CompletableFuture<Integer> f = new CompletableFuture<>();
1515 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1516 <        final FailingBiFunction r = new FailingBiFunction();
1285 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1515 >        final NoopConsumer[] rs = new NoopConsumer[4];
1516 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1517  
1518 <        g.complete(v2);
1519 <        checkIncomplete(h);
1520 <        f.complete(v1);
1518 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1519 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1520 >        checkIncomplete(h0);
1521 >        checkIncomplete(h1);
1522 >        assertTrue(f.complete(v1));
1523 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1524 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1525  
1526 <        checkCompletedWithWrappedCFException(h);
1526 >        checkCompletedNormally(h0, null);
1527 >        checkCompletedNormally(h1, null);
1528 >        checkCompletedNormally(h2, null);
1529 >        checkCompletedNormally(h3, null);
1530          checkCompletedNormally(f, v1);
1531 <        checkCompletedNormally(g, v2);
1531 >        for (NoopConsumer r : rs) r.assertValue(v1);
1532      }}
1533  
1534      /**
1535 <     * thenCombine result completes exceptionally if either source cancelled
1535 >     * thenAccept result completes exceptionally after exceptional
1536 >     * completion of source
1537       */
1538 <    public void testThenCombine_sourceCancelled1() {
1300 <        for (ExecutionMode m : ExecutionMode.values())
1301 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1302 <        for (Integer v1 : new Integer[] { 1, null })
1303 <    {
1304 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1305 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1306 <        final SubtractFunction r = new SubtractFunction();
1307 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1308 <
1309 <        assertTrue(f.cancel(mayInterruptIfRunning));
1310 <        checkIncomplete(h);
1311 <        g.complete(v1);
1312 <
1313 <        checkCompletedWithWrappedCancellationException(h);
1314 <        checkCancelled(f);
1315 <        assertEquals(0, r.invocationCount);
1316 <        checkCompletedNormally(g, v1);
1317 <    }}
1318 <
1319 <    public void testThenCombine_sourceCancelled2() {
1538 >    public void testThenAccept_exceptionalCompletion() {
1539          for (ExecutionMode m : ExecutionMode.values())
1321        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1322        for (Integer v1 : new Integer[] { 1, null })
1540      {
1541 +        final CFException ex = new CFException();
1542          final CompletableFuture<Integer> f = new CompletableFuture<>();
1543 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1544 <        final SubtractFunction r = new SubtractFunction();
1327 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1543 >        final NoopConsumer[] rs = new NoopConsumer[4];
1544 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1545  
1546 <        assertTrue(g.cancel(mayInterruptIfRunning));
1547 <        checkIncomplete(h);
1548 <        f.complete(v1);
1546 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1547 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1548 >        assertTrue(f.completeExceptionally(ex));
1549 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1550 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1551  
1552 <        checkCompletedWithWrappedCancellationException(h);
1553 <        checkCancelled(g);
1554 <        assertEquals(0, r.invocationCount);
1555 <        checkCompletedNormally(f, v1);
1552 >        checkCompletedWithWrappedException(h0, ex);
1553 >        checkCompletedWithWrappedException(h1, ex);
1554 >        checkCompletedWithWrappedException(h2, ex);
1555 >        checkCompletedWithWrappedException(h3, ex);
1556 >        checkCompletedExceptionally(f, ex);
1557 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1558      }}
1559  
1560 <    public void testThenCombine_sourceCancelled3() {
1561 <        for (ExecutionMode m : ExecutionMode.values())
1562 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1563 <        for (Integer v1 : new Integer[] { 1, null })
1343 <    {
1344 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1345 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1346 <        final SubtractFunction r = new SubtractFunction();
1347 <
1348 <        assertTrue(g.cancel(mayInterruptIfRunning));
1349 <        f.complete(v1);
1350 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1351 <
1352 <        checkCompletedWithWrappedCancellationException(h);
1353 <        checkCancelled(g);
1354 <        assertEquals(0, r.invocationCount);
1355 <        checkCompletedNormally(f, v1);
1356 <    }}
1357 <
1358 <    public void testThenCombine_sourceCancelled4() {
1560 >    /**
1561 >     * thenAccept result completes exceptionally if source cancelled
1562 >     */
1563 >    public void testThenAccept_sourceCancelled() {
1564          for (ExecutionMode m : ExecutionMode.values())
1565          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1361        for (Integer v1 : new Integer[] { 1, null })
1566      {
1567          final CompletableFuture<Integer> f = new CompletableFuture<>();
1568 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1569 <        final SubtractFunction r = new SubtractFunction();
1568 >        final NoopConsumer[] rs = new NoopConsumer[4];
1569 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1570  
1571 +        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1572 +        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1573          assertTrue(f.cancel(mayInterruptIfRunning));
1574 <        g.complete(v1);
1575 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1574 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1575 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1576  
1577 <        checkCompletedWithWrappedCancellationException(h);
1577 >        checkCompletedWithWrappedCancellationException(h0);
1578 >        checkCompletedWithWrappedCancellationException(h1);
1579 >        checkCompletedWithWrappedCancellationException(h2);
1580 >        checkCompletedWithWrappedCancellationException(h3);
1581          checkCancelled(f);
1582 <        assertEquals(0, r.invocationCount);
1374 <        checkCompletedNormally(g, v1);
1582 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1583      }}
1584  
1585      /**
1586 <     * thenAcceptBoth result completes normally after normal
1379 <     * completion of sources
1586 >     * thenAccept result completes exceptionally if action does
1587       */
1588 <    public void testThenAcceptBoth_normalCompletion1() {
1382 <        for (ExecutionMode m : ExecutionMode.values())
1383 <        for (Integer v1 : new Integer[] { 1, null })
1384 <        for (Integer v2 : new Integer[] { 2, null })
1385 <    {
1386 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1387 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1388 <        final SubtractAction r = new SubtractAction();
1389 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1390 <
1391 <        f.complete(v1);
1392 <        checkIncomplete(h);
1393 <        assertEquals(0, r.invocationCount);
1394 <        g.complete(v2);
1395 <
1396 <        checkCompletedNormally(h, null);
1397 <        assertEquals(subtract(v1, v2), r.value);
1398 <        checkCompletedNormally(f, v1);
1399 <        checkCompletedNormally(g, v2);
1400 <    }}
1401 <
1402 <    public void testThenAcceptBoth_normalCompletion2() {
1403 <        for (ExecutionMode m : ExecutionMode.values())
1404 <        for (Integer v1 : new Integer[] { 1, null })
1405 <        for (Integer v2 : new Integer[] { 2, null })
1406 <    {
1407 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1408 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1409 <        final SubtractAction r = new SubtractAction();
1410 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1411 <
1412 <        g.complete(v2);
1413 <        checkIncomplete(h);
1414 <        assertEquals(0, r.invocationCount);
1415 <        f.complete(v1);
1416 <
1417 <        checkCompletedNormally(h, null);
1418 <        assertEquals(subtract(v1, v2), r.value);
1419 <        checkCompletedNormally(f, v1);
1420 <        checkCompletedNormally(g, v2);
1421 <    }}
1422 <
1423 <    public void testThenAcceptBoth_normalCompletion3() {
1588 >    public void testThenAccept_actionFailed() {
1589          for (ExecutionMode m : ExecutionMode.values())
1590          for (Integer v1 : new Integer[] { 1, null })
1426        for (Integer v2 : new Integer[] { 2, null })
1591      {
1592          final CompletableFuture<Integer> f = new CompletableFuture<>();
1593 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1594 <        final SubtractAction r = new SubtractAction();
1593 >        final FailingConsumer[] rs = new FailingConsumer[4];
1594 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1595  
1596 <        g.complete(v2);
1597 <        f.complete(v1);
1598 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1596 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1597 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1598 >        assertTrue(f.complete(v1));
1599 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1600 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1601  
1602 <        checkCompletedNormally(h, null);
1603 <        assertEquals(subtract(v1, v2), r.value);
1602 >        checkCompletedWithWrappedCFException(h0);
1603 >        checkCompletedWithWrappedCFException(h1);
1604 >        checkCompletedWithWrappedCFException(h2);
1605 >        checkCompletedWithWrappedCFException(h3);
1606          checkCompletedNormally(f, v1);
1439        checkCompletedNormally(g, v2);
1607      }}
1608  
1609 <    public void testThenAcceptBoth_normalCompletion4() {
1609 >    /**
1610 >     * thenCombine result completes normally after normal completion
1611 >     * of sources
1612 >     */
1613 >    public void testThenCombine_normalCompletion() {
1614          for (ExecutionMode m : ExecutionMode.values())
1615 +        for (boolean fFirst : new boolean[] { true, false })
1616          for (Integer v1 : new Integer[] { 1, null })
1617          for (Integer v2 : new Integer[] { 2, null })
1618      {
1619          final CompletableFuture<Integer> f = new CompletableFuture<>();
1620          final CompletableFuture<Integer> g = new CompletableFuture<>();
1621 <        final SubtractAction r = new SubtractAction();
1621 >        final SubtractFunction[] rs = new SubtractFunction[6];
1622 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1623  
1624 <        f.complete(v1);
1625 <        g.complete(v2);
1626 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1624 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1625 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1626 >        final Integer w1 =  fFirst ? v1 : v2;
1627 >        final Integer w2 = !fFirst ? v1 : v2;
1628 >
1629 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1630 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1631 >        assertTrue(fst.complete(w1));
1632 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1633 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1634 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1635 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1636 >        checkCompletedNormally(h1, subtract(w1, w1));
1637 >        checkCompletedNormally(h3, subtract(w1, w1));
1638 >        rs[1].assertValue(subtract(w1, w1));
1639 >        rs[3].assertValue(subtract(w1, w1));
1640 >        assertTrue(snd.complete(w2));
1641 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1642 >
1643 >        checkCompletedNormally(h0, subtract(v1, v2));
1644 >        checkCompletedNormally(h2, subtract(v1, v2));
1645 >        checkCompletedNormally(h4, subtract(v1, v2));
1646 >        rs[0].assertValue(subtract(v1, v2));
1647 >        rs[2].assertValue(subtract(v1, v2));
1648 >        rs[4].assertValue(subtract(v1, v2));
1649  
1455        checkCompletedNormally(h, null);
1456        assertEquals(subtract(v1, v2), r.value);
1650          checkCompletedNormally(f, v1);
1651          checkCompletedNormally(g, v2);
1652      }}
1653  
1654      /**
1655 <     * thenAcceptBoth result completes exceptionally after exceptional
1655 >     * thenCombine result completes exceptionally after exceptional
1656       * completion of either source
1657       */
1658 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1466 <        for (ExecutionMode m : ExecutionMode.values())
1467 <        for (Integer v1 : new Integer[] { 1, null })
1468 <    {
1469 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1471 <        final SubtractAction r = new SubtractAction();
1472 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1473 <        final CFException ex = new CFException();
1474 <
1475 <        f.completeExceptionally(ex);
1476 <        checkIncomplete(h);
1477 <        g.complete(v1);
1478 <
1479 <        checkCompletedWithWrappedCFException(h, ex);
1480 <        checkCompletedWithWrappedCFException(f, ex);
1481 <        assertEquals(0, r.invocationCount);
1482 <        checkCompletedNormally(g, v1);
1483 <    }}
1484 <
1485 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1658 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1659          for (ExecutionMode m : ExecutionMode.values())
1660 +        for (boolean fFirst : new boolean[] { true, false })
1661 +        for (boolean failFirst : new boolean[] { true, false })
1662          for (Integer v1 : new Integer[] { 1, null })
1663      {
1664          final CompletableFuture<Integer> f = new CompletableFuture<>();
1665          final CompletableFuture<Integer> g = new CompletableFuture<>();
1491        final SubtractAction r = new SubtractAction();
1492        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1666          final CFException ex = new CFException();
1667 <
1668 <        g.completeExceptionally(ex);
1669 <        checkIncomplete(h);
1670 <        f.complete(v1);
1671 <
1672 <        checkCompletedWithWrappedCFException(h, ex);
1673 <        checkCompletedWithWrappedCFException(g, ex);
1674 <        assertEquals(0, r.invocationCount);
1675 <        checkCompletedNormally(f, v1);
1667 >        final SubtractFunction r1 = new SubtractFunction(m);
1668 >        final SubtractFunction r2 = new SubtractFunction(m);
1669 >        final SubtractFunction r3 = new SubtractFunction(m);
1670 >
1671 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1672 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1673 >        final Callable<Boolean> complete1 = failFirst ?
1674 >            () -> fst.completeExceptionally(ex) :
1675 >            () -> fst.complete(v1);
1676 >        final Callable<Boolean> complete2 = failFirst ?
1677 >            () -> snd.complete(v1) :
1678 >            () -> snd.completeExceptionally(ex);
1679 >
1680 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1681 >        assertTrue(complete1.call());
1682 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1683 >        checkIncomplete(h1);
1684 >        checkIncomplete(h2);
1685 >        assertTrue(complete2.call());
1686 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1687 >
1688 >        checkCompletedWithWrappedException(h1, ex);
1689 >        checkCompletedWithWrappedException(h2, ex);
1690 >        checkCompletedWithWrappedException(h3, ex);
1691 >        r1.assertNotInvoked();
1692 >        r2.assertNotInvoked();
1693 >        r3.assertNotInvoked();
1694 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1695 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1696      }}
1697  
1698 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1698 >    /**
1699 >     * thenCombine result completes exceptionally if either source cancelled
1700 >     */
1701 >    public void testThenCombine_sourceCancelled() throws Throwable {
1702          for (ExecutionMode m : ExecutionMode.values())
1703 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1704 +        for (boolean fFirst : new boolean[] { true, false })
1705 +        for (boolean failFirst : new boolean[] { true, false })
1706          for (Integer v1 : new Integer[] { 1, null })
1707      {
1708          final CompletableFuture<Integer> f = new CompletableFuture<>();
1709          final CompletableFuture<Integer> g = new CompletableFuture<>();
1710 <        final SubtractAction r = new SubtractAction();
1711 <        final CFException ex = new CFException();
1712 <
1713 <        g.completeExceptionally(ex);
1714 <        f.complete(v1);
1715 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1716 <
1717 <        checkCompletedWithWrappedCFException(h, ex);
1718 <        checkCompletedWithWrappedCFException(g, ex);
1719 <        assertEquals(0, r.invocationCount);
1720 <        checkCompletedNormally(f, v1);
1721 <    }}
1722 <
1723 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1724 <        for (ExecutionMode m : ExecutionMode.values())
1725 <        for (Integer v1 : new Integer[] { 1, null })
1726 <    {
1727 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1728 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1729 <        final SubtractAction r = new SubtractAction();
1730 <        final CFException ex = new CFException();
1731 <
1732 <        f.completeExceptionally(ex);
1733 <        g.complete(v1);
1734 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1735 <
1736 <        checkCompletedWithWrappedCFException(h, ex);
1737 <        checkCompletedWithWrappedCFException(f, ex);
1738 <        assertEquals(0, r.invocationCount);
1540 <        checkCompletedNormally(g, v1);
1710 >        final SubtractFunction r1 = new SubtractFunction(m);
1711 >        final SubtractFunction r2 = new SubtractFunction(m);
1712 >        final SubtractFunction r3 = new SubtractFunction(m);
1713 >
1714 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1715 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1716 >        final Callable<Boolean> complete1 = failFirst ?
1717 >            () -> fst.cancel(mayInterruptIfRunning) :
1718 >            () -> fst.complete(v1);
1719 >        final Callable<Boolean> complete2 = failFirst ?
1720 >            () -> snd.complete(v1) :
1721 >            () -> snd.cancel(mayInterruptIfRunning);
1722 >
1723 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1724 >        assertTrue(complete1.call());
1725 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1726 >        checkIncomplete(h1);
1727 >        checkIncomplete(h2);
1728 >        assertTrue(complete2.call());
1729 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1730 >
1731 >        checkCompletedWithWrappedCancellationException(h1);
1732 >        checkCompletedWithWrappedCancellationException(h2);
1733 >        checkCompletedWithWrappedCancellationException(h3);
1734 >        r1.assertNotInvoked();
1735 >        r2.assertNotInvoked();
1736 >        r3.assertNotInvoked();
1737 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1738 >        checkCancelled(failFirst ? fst : snd);
1739      }}
1740  
1741      /**
1742 <     * thenAcceptBoth result completes exceptionally if action does
1742 >     * thenCombine result completes exceptionally if action does
1743       */
1744 <    public void testThenAcceptBoth_actionFailed1() {
1744 >    public void testThenCombine_actionFailed() {
1745          for (ExecutionMode m : ExecutionMode.values())
1746 +        for (boolean fFirst : new boolean[] { true, false })
1747          for (Integer v1 : new Integer[] { 1, null })
1748          for (Integer v2 : new Integer[] { 2, null })
1749      {
1750          final CompletableFuture<Integer> f = new CompletableFuture<>();
1751          final CompletableFuture<Integer> g = new CompletableFuture<>();
1752 <        final FailingBiConsumer r = new FailingBiConsumer();
1753 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1754 <
1755 <        f.complete(v1);
1756 <        checkIncomplete(h);
1757 <        g.complete(v2);
1758 <
1759 <        checkCompletedWithWrappedCFException(h);
1752 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1753 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1754 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1755 >
1756 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1757 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1758 >        final Integer w1 =  fFirst ? v1 : v2;
1759 >        final Integer w2 = !fFirst ? v1 : v2;
1760 >
1761 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1762 >        assertTrue(fst.complete(w1));
1763 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1764 >        assertTrue(snd.complete(w2));
1765 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1766 >
1767 >        checkCompletedWithWrappedCFException(h1);
1768 >        checkCompletedWithWrappedCFException(h2);
1769 >        checkCompletedWithWrappedCFException(h3);
1770 >        r1.assertInvoked();
1771 >        r2.assertInvoked();
1772 >        r3.assertInvoked();
1773          checkCompletedNormally(f, v1);
1774          checkCompletedNormally(g, v2);
1775      }}
1776  
1777 <    public void testThenAcceptBoth_actionFailed2() {
1777 >    /**
1778 >     * thenAcceptBoth result completes normally after normal
1779 >     * completion of sources
1780 >     */
1781 >    public void testThenAcceptBoth_normalCompletion() {
1782          for (ExecutionMode m : ExecutionMode.values())
1783 +        for (boolean fFirst : new boolean[] { true, false })
1784          for (Integer v1 : new Integer[] { 1, null })
1785          for (Integer v2 : new Integer[] { 2, null })
1786      {
1787          final CompletableFuture<Integer> f = new CompletableFuture<>();
1788          final CompletableFuture<Integer> g = new CompletableFuture<>();
1789 <        final FailingBiConsumer r = new FailingBiConsumer();
1790 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1791 <
1792 <        g.complete(v2);
1793 <        checkIncomplete(h);
1794 <        f.complete(v1);
1795 <
1796 <        checkCompletedWithWrappedCFException(h);
1789 >        final SubtractAction r1 = new SubtractAction(m);
1790 >        final SubtractAction r2 = new SubtractAction(m);
1791 >        final SubtractAction r3 = new SubtractAction(m);
1792 >
1793 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1794 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1795 >        final Integer w1 =  fFirst ? v1 : v2;
1796 >        final Integer w2 = !fFirst ? v1 : v2;
1797 >
1798 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1799 >        assertTrue(fst.complete(w1));
1800 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1801 >        checkIncomplete(h1);
1802 >        checkIncomplete(h2);
1803 >        r1.assertNotInvoked();
1804 >        r2.assertNotInvoked();
1805 >        assertTrue(snd.complete(w2));
1806 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1807 >
1808 >        checkCompletedNormally(h1, null);
1809 >        checkCompletedNormally(h2, null);
1810 >        checkCompletedNormally(h3, null);
1811 >        r1.assertValue(subtract(v1, v2));
1812 >        r2.assertValue(subtract(v1, v2));
1813 >        r3.assertValue(subtract(v1, v2));
1814          checkCompletedNormally(f, v1);
1815          checkCompletedNormally(g, v2);
1816      }}
1817  
1818      /**
1819 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1819 >     * thenAcceptBoth result completes exceptionally after exceptional
1820 >     * completion of either source
1821       */
1822 <    public void testThenAcceptBoth_sourceCancelled1() {
1588 <        for (ExecutionMode m : ExecutionMode.values())
1589 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1590 <        for (Integer v1 : new Integer[] { 1, null })
1591 <    {
1592 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1593 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1594 <        final SubtractAction r = new SubtractAction();
1595 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1596 <
1597 <        assertTrue(f.cancel(mayInterruptIfRunning));
1598 <        checkIncomplete(h);
1599 <        g.complete(v1);
1600 <
1601 <        checkCompletedWithWrappedCancellationException(h);
1602 <        checkCancelled(f);
1603 <        assertEquals(0, r.invocationCount);
1604 <        checkCompletedNormally(g, v1);
1605 <    }}
1606 <
1607 <    public void testThenAcceptBoth_sourceCancelled2() {
1608 <        for (ExecutionMode m : ExecutionMode.values())
1609 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1610 <        for (Integer v1 : new Integer[] { 1, null })
1611 <    {
1612 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1613 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1614 <        final SubtractAction r = new SubtractAction();
1615 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1616 <
1617 <        assertTrue(g.cancel(mayInterruptIfRunning));
1618 <        checkIncomplete(h);
1619 <        f.complete(v1);
1620 <
1621 <        checkCompletedWithWrappedCancellationException(h);
1622 <        checkCancelled(g);
1623 <        assertEquals(0, r.invocationCount);
1624 <        checkCompletedNormally(f, v1);
1625 <    }}
1626 <
1627 <    public void testThenAcceptBoth_sourceCancelled3() {
1822 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1823          for (ExecutionMode m : ExecutionMode.values())
1824 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1824 >        for (boolean fFirst : new boolean[] { true, false })
1825 >        for (boolean failFirst : new boolean[] { true, false })
1826          for (Integer v1 : new Integer[] { 1, null })
1827      {
1828          final CompletableFuture<Integer> f = new CompletableFuture<>();
1829          final CompletableFuture<Integer> g = new CompletableFuture<>();
1830 <        final SubtractAction r = new SubtractAction();
1831 <
1832 <        assertTrue(g.cancel(mayInterruptIfRunning));
1833 <        f.complete(v1);
1834 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1835 <
1836 <        checkCompletedWithWrappedCancellationException(h);
1837 <        checkCancelled(g);
1838 <        assertEquals(0, r.invocationCount);
1839 <        checkCompletedNormally(f, v1);
1830 >        final CFException ex = new CFException();
1831 >        final SubtractAction r1 = new SubtractAction(m);
1832 >        final SubtractAction r2 = new SubtractAction(m);
1833 >        final SubtractAction r3 = new SubtractAction(m);
1834 >
1835 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1836 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1837 >        final Callable<Boolean> complete1 = failFirst ?
1838 >            () -> fst.completeExceptionally(ex) :
1839 >            () -> fst.complete(v1);
1840 >        final Callable<Boolean> complete2 = failFirst ?
1841 >            () -> snd.complete(v1) :
1842 >            () -> snd.completeExceptionally(ex);
1843 >
1844 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1845 >        assertTrue(complete1.call());
1846 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1847 >        checkIncomplete(h1);
1848 >        checkIncomplete(h2);
1849 >        assertTrue(complete2.call());
1850 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1851 >
1852 >        checkCompletedWithWrappedException(h1, ex);
1853 >        checkCompletedWithWrappedException(h2, ex);
1854 >        checkCompletedWithWrappedException(h3, ex);
1855 >        r1.assertNotInvoked();
1856 >        r2.assertNotInvoked();
1857 >        r3.assertNotInvoked();
1858 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1859 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1860      }}
1861  
1862 <    public void testThenAcceptBoth_sourceCancelled4() {
1862 >    /**
1863 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1864 >     */
1865 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1866          for (ExecutionMode m : ExecutionMode.values())
1867          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1868 +        for (boolean fFirst : new boolean[] { true, false })
1869 +        for (boolean failFirst : new boolean[] { true, false })
1870          for (Integer v1 : new Integer[] { 1, null })
1871      {
1872          final CompletableFuture<Integer> f = new CompletableFuture<>();
1873          final CompletableFuture<Integer> g = new CompletableFuture<>();
1874 <        final SubtractAction r = new SubtractAction();
1875 <
1876 <        assertTrue(f.cancel(mayInterruptIfRunning));
1877 <        g.complete(v1);
1878 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1879 <
1880 <        checkCompletedWithWrappedCancellationException(h);
1881 <        checkCancelled(f);
1882 <        assertEquals(0, r.invocationCount);
1883 <        checkCompletedNormally(g, v1);
1874 >        final SubtractAction r1 = new SubtractAction(m);
1875 >        final SubtractAction r2 = new SubtractAction(m);
1876 >        final SubtractAction r3 = new SubtractAction(m);
1877 >
1878 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1879 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1880 >        final Callable<Boolean> complete1 = failFirst ?
1881 >            () -> fst.cancel(mayInterruptIfRunning) :
1882 >            () -> fst.complete(v1);
1883 >        final Callable<Boolean> complete2 = failFirst ?
1884 >            () -> snd.complete(v1) :
1885 >            () -> snd.cancel(mayInterruptIfRunning);
1886 >
1887 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1888 >        assertTrue(complete1.call());
1889 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1890 >        checkIncomplete(h1);
1891 >        checkIncomplete(h2);
1892 >        assertTrue(complete2.call());
1893 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1894 >
1895 >        checkCompletedWithWrappedCancellationException(h1);
1896 >        checkCompletedWithWrappedCancellationException(h2);
1897 >        checkCompletedWithWrappedCancellationException(h3);
1898 >        r1.assertNotInvoked();
1899 >        r2.assertNotInvoked();
1900 >        r3.assertNotInvoked();
1901 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1902 >        checkCancelled(failFirst ? fst : snd);
1903      }}
1904  
1905      /**
1906 <     * runAfterBoth result completes normally after normal
1667 <     * completion of sources
1906 >     * thenAcceptBoth result completes exceptionally if action does
1907       */
1908 <    public void testRunAfterBoth_normalCompletion1() {
1670 <        for (ExecutionMode m : ExecutionMode.values())
1671 <        for (Integer v1 : new Integer[] { 1, null })
1672 <        for (Integer v2 : new Integer[] { 2, null })
1673 <    {
1674 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1675 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1676 <        final Noop r = new Noop();
1677 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1678 <
1679 <        f.complete(v1);
1680 <        checkIncomplete(h);
1681 <        assertEquals(0, r.invocationCount);
1682 <        g.complete(v2);
1683 <
1684 <        checkCompletedNormally(h, null);
1685 <        assertEquals(1, r.invocationCount);
1686 <        checkCompletedNormally(f, v1);
1687 <        checkCompletedNormally(g, v2);
1688 <    }}
1689 <
1690 <    public void testRunAfterBoth_normalCompletion2() {
1691 <        for (ExecutionMode m : ExecutionMode.values())
1692 <        for (Integer v1 : new Integer[] { 1, null })
1693 <        for (Integer v2 : new Integer[] { 2, null })
1694 <    {
1695 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1696 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 <        final Noop r = new Noop();
1698 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1699 <
1700 <        g.complete(v2);
1701 <        checkIncomplete(h);
1702 <        assertEquals(0, r.invocationCount);
1703 <        f.complete(v1);
1704 <
1705 <        checkCompletedNormally(h, null);
1706 <        assertEquals(1, r.invocationCount);
1707 <        checkCompletedNormally(f, v1);
1708 <        checkCompletedNormally(g, v2);
1709 <    }}
1710 <
1711 <    public void testRunAfterBoth_normalCompletion3() {
1908 >    public void testThenAcceptBoth_actionFailed() {
1909          for (ExecutionMode m : ExecutionMode.values())
1910 +        for (boolean fFirst : new boolean[] { true, false })
1911          for (Integer v1 : new Integer[] { 1, null })
1912          for (Integer v2 : new Integer[] { 2, null })
1913      {
1914          final CompletableFuture<Integer> f = new CompletableFuture<>();
1915          final CompletableFuture<Integer> g = new CompletableFuture<>();
1916 <        final Noop r = new Noop();
1917 <
1918 <        g.complete(v2);
1919 <        f.complete(v1);
1920 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1921 <
1922 <        checkCompletedNormally(h, null);
1923 <        assertEquals(1, r.invocationCount);
1916 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1917 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1918 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1919 >
1920 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1921 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1922 >        final Integer w1 =  fFirst ? v1 : v2;
1923 >        final Integer w2 = !fFirst ? v1 : v2;
1924 >
1925 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1926 >        assertTrue(fst.complete(w1));
1927 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1928 >        assertTrue(snd.complete(w2));
1929 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1930 >
1931 >        checkCompletedWithWrappedCFException(h1);
1932 >        checkCompletedWithWrappedCFException(h2);
1933 >        checkCompletedWithWrappedCFException(h3);
1934 >        r1.assertInvoked();
1935 >        r2.assertInvoked();
1936 >        r3.assertInvoked();
1937          checkCompletedNormally(f, v1);
1938          checkCompletedNormally(g, v2);
1939      }}
1940  
1941 <    public void testRunAfterBoth_normalCompletion4() {
1941 >    /**
1942 >     * runAfterBoth result completes normally after normal
1943 >     * completion of sources
1944 >     */
1945 >    public void testRunAfterBoth_normalCompletion() {
1946          for (ExecutionMode m : ExecutionMode.values())
1947 +        for (boolean fFirst : new boolean[] { true, false })
1948          for (Integer v1 : new Integer[] { 1, null })
1949          for (Integer v2 : new Integer[] { 2, null })
1950      {
1951          final CompletableFuture<Integer> f = new CompletableFuture<>();
1952          final CompletableFuture<Integer> g = new CompletableFuture<>();
1953 <        final Noop r = new Noop();
1954 <
1955 <        f.complete(v1);
1956 <        g.complete(v2);
1957 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1958 <
1959 <        checkCompletedNormally(h, null);
1960 <        assertEquals(1, r.invocationCount);
1953 >        final Noop r1 = new Noop(m);
1954 >        final Noop r2 = new Noop(m);
1955 >        final Noop r3 = new Noop(m);
1956 >
1957 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1958 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1959 >        final Integer w1 =  fFirst ? v1 : v2;
1960 >        final Integer w2 = !fFirst ? v1 : v2;
1961 >
1962 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1963 >        assertTrue(fst.complete(w1));
1964 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1965 >        checkIncomplete(h1);
1966 >        checkIncomplete(h2);
1967 >        r1.assertNotInvoked();
1968 >        r2.assertNotInvoked();
1969 >        assertTrue(snd.complete(w2));
1970 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1971 >
1972 >        checkCompletedNormally(h1, null);
1973 >        checkCompletedNormally(h2, null);
1974 >        checkCompletedNormally(h3, null);
1975 >        r1.assertInvoked();
1976 >        r2.assertInvoked();
1977 >        r3.assertInvoked();
1978          checkCompletedNormally(f, v1);
1979          checkCompletedNormally(g, v2);
1980      }}
# Line 1750 | Line 1983 | public class CompletableFutureTest exten
1983       * runAfterBoth result completes exceptionally after exceptional
1984       * completion of either source
1985       */
1986 <    public void testRunAfterBoth_exceptionalCompletion1() {
1754 <        for (ExecutionMode m : ExecutionMode.values())
1755 <        for (Integer v1 : new Integer[] { 1, null })
1756 <    {
1757 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1758 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1759 <        final Noop r = new Noop();
1760 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1761 <        final CFException ex = new CFException();
1762 <
1763 <        f.completeExceptionally(ex);
1764 <        checkIncomplete(h);
1765 <        g.complete(v1);
1766 <
1767 <        checkCompletedWithWrappedCFException(h, ex);
1768 <        checkCompletedWithWrappedCFException(f, ex);
1769 <        assertEquals(0, r.invocationCount);
1770 <        checkCompletedNormally(g, v1);
1771 <    }}
1772 <
1773 <    public void testRunAfterBoth_exceptionalCompletion2() {
1774 <        for (ExecutionMode m : ExecutionMode.values())
1775 <        for (Integer v1 : new Integer[] { 1, null })
1776 <    {
1777 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1778 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1779 <        final Noop r = new Noop();
1780 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1781 <        final CFException ex = new CFException();
1782 <
1783 <        g.completeExceptionally(ex);
1784 <        checkIncomplete(h);
1785 <        f.complete(v1);
1786 <
1787 <        checkCompletedWithWrappedCFException(h, ex);
1788 <        checkCompletedWithWrappedCFException(g, ex);
1789 <        assertEquals(0, r.invocationCount);
1790 <        checkCompletedNormally(f, v1);
1791 <    }}
1792 <
1793 <    public void testRunAfterBoth_exceptionalCompletion3() {
1986 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1987          for (ExecutionMode m : ExecutionMode.values())
1988 +        for (boolean fFirst : new boolean[] { true, false })
1989 +        for (boolean failFirst : new boolean[] { true, false })
1990          for (Integer v1 : new Integer[] { 1, null })
1991      {
1992          final CompletableFuture<Integer> f = new CompletableFuture<>();
1993          final CompletableFuture<Integer> g = new CompletableFuture<>();
1799        final Noop r = new Noop();
1994          final CFException ex = new CFException();
1995 <
1996 <        g.completeExceptionally(ex);
1997 <        f.complete(v1);
1998 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1999 <
2000 <        checkCompletedWithWrappedCFException(h, ex);
2001 <        checkCompletedWithWrappedCFException(g, ex);
2002 <        assertEquals(0, r.invocationCount);
2003 <        checkCompletedNormally(f, v1);
1995 >        final Noop r1 = new Noop(m);
1996 >        final Noop r2 = new Noop(m);
1997 >        final Noop r3 = new Noop(m);
1998 >
1999 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2000 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2001 >        final Callable<Boolean> complete1 = failFirst ?
2002 >            () -> fst.completeExceptionally(ex) :
2003 >            () -> fst.complete(v1);
2004 >        final Callable<Boolean> complete2 = failFirst ?
2005 >            () -> snd.complete(v1) :
2006 >            () -> snd.completeExceptionally(ex);
2007 >
2008 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2009 >        assertTrue(complete1.call());
2010 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2011 >        checkIncomplete(h1);
2012 >        checkIncomplete(h2);
2013 >        assertTrue(complete2.call());
2014 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2015 >
2016 >        checkCompletedWithWrappedException(h1, ex);
2017 >        checkCompletedWithWrappedException(h2, ex);
2018 >        checkCompletedWithWrappedException(h3, ex);
2019 >        r1.assertNotInvoked();
2020 >        r2.assertNotInvoked();
2021 >        r3.assertNotInvoked();
2022 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2023 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2024      }}
2025  
2026 <    public void testRunAfterBoth_exceptionalCompletion4() {
2026 >    /**
2027 >     * runAfterBoth result completes exceptionally if either source cancelled
2028 >     */
2029 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2030          for (ExecutionMode m : ExecutionMode.values())
2031 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2032 +        for (boolean fFirst : new boolean[] { true, false })
2033 +        for (boolean failFirst : new boolean[] { true, false })
2034          for (Integer v1 : new Integer[] { 1, null })
2035      {
2036          final CompletableFuture<Integer> f = new CompletableFuture<>();
2037          final CompletableFuture<Integer> g = new CompletableFuture<>();
2038 <        final Noop r = new Noop();
2039 <        final CFException ex = new CFException();
2040 <
2041 <        f.completeExceptionally(ex);
2042 <        g.complete(v1);
2043 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2044 <
2045 <        checkCompletedWithWrappedCFException(h, ex);
2046 <        checkCompletedWithWrappedCFException(f, ex);
2047 <        assertEquals(0, r.invocationCount);
2048 <        checkCompletedNormally(g, v1);
2038 >        final Noop r1 = new Noop(m);
2039 >        final Noop r2 = new Noop(m);
2040 >        final Noop r3 = new Noop(m);
2041 >
2042 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2043 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2044 >        final Callable<Boolean> complete1 = failFirst ?
2045 >            () -> fst.cancel(mayInterruptIfRunning) :
2046 >            () -> fst.complete(v1);
2047 >        final Callable<Boolean> complete2 = failFirst ?
2048 >            () -> snd.complete(v1) :
2049 >            () -> snd.cancel(mayInterruptIfRunning);
2050 >
2051 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2052 >        assertTrue(complete1.call());
2053 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2054 >        checkIncomplete(h1);
2055 >        checkIncomplete(h2);
2056 >        assertTrue(complete2.call());
2057 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2058 >
2059 >        checkCompletedWithWrappedCancellationException(h1);
2060 >        checkCompletedWithWrappedCancellationException(h2);
2061 >        checkCompletedWithWrappedCancellationException(h3);
2062 >        r1.assertNotInvoked();
2063 >        r2.assertNotInvoked();
2064 >        r3.assertNotInvoked();
2065 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2066 >        checkCancelled(failFirst ? fst : snd);
2067      }}
2068  
2069      /**
2070       * runAfterBoth result completes exceptionally if action does
2071       */
2072 <    public void testRunAfterBoth_actionFailed1() {
1835 <        for (ExecutionMode m : ExecutionMode.values())
1836 <        for (Integer v1 : new Integer[] { 1, null })
1837 <        for (Integer v2 : new Integer[] { 2, null })
1838 <    {
1839 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1840 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1841 <        final FailingNoop r = new FailingNoop();
1842 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1843 <
1844 <        f.complete(v1);
1845 <        checkIncomplete(h);
1846 <        g.complete(v2);
1847 <
1848 <        checkCompletedWithWrappedCFException(h);
1849 <        checkCompletedNormally(f, v1);
1850 <        checkCompletedNormally(g, v2);
1851 <    }}
1852 <
1853 <    public void testRunAfterBoth_actionFailed2() {
2072 >    public void testRunAfterBoth_actionFailed() {
2073          for (ExecutionMode m : ExecutionMode.values())
2074 +        for (boolean fFirst : new boolean[] { true, false })
2075          for (Integer v1 : new Integer[] { 1, null })
2076          for (Integer v2 : new Integer[] { 2, null })
2077      {
2078          final CompletableFuture<Integer> f = new CompletableFuture<>();
2079          final CompletableFuture<Integer> g = new CompletableFuture<>();
2080 <        final FailingNoop r = new FailingNoop();
2081 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2082 <
2083 <        g.complete(v2);
2084 <        checkIncomplete(h);
2085 <        f.complete(v1);
2086 <
2087 <        checkCompletedWithWrappedCFException(h);
2080 >        final FailingRunnable r1 = new FailingRunnable(m);
2081 >        final FailingRunnable r2 = new FailingRunnable(m);
2082 >        final FailingRunnable r3 = new FailingRunnable(m);
2083 >
2084 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2085 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2086 >        final Integer w1 =  fFirst ? v1 : v2;
2087 >        final Integer w2 = !fFirst ? v1 : v2;
2088 >
2089 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2090 >        assertTrue(fst.complete(w1));
2091 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2092 >        assertTrue(snd.complete(w2));
2093 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2094 >
2095 >        checkCompletedWithWrappedCFException(h1);
2096 >        checkCompletedWithWrappedCFException(h2);
2097 >        checkCompletedWithWrappedCFException(h3);
2098 >        r1.assertInvoked();
2099 >        r2.assertInvoked();
2100 >        r3.assertInvoked();
2101          checkCompletedNormally(f, v1);
2102          checkCompletedNormally(g, v2);
2103      }}
2104  
2105      /**
1873     * runAfterBoth result completes exceptionally if either source cancelled
1874     */
1875    public void testRunAfterBoth_sourceCancelled1() {
1876        for (ExecutionMode m : ExecutionMode.values())
1877        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1878        for (Integer v1 : new Integer[] { 1, null })
1879    {
1880        final CompletableFuture<Integer> f = new CompletableFuture<>();
1881        final CompletableFuture<Integer> g = new CompletableFuture<>();
1882        final Noop r = new Noop();
1883        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1884
1885        assertTrue(f.cancel(mayInterruptIfRunning));
1886        checkIncomplete(h);
1887        g.complete(v1);
1888
1889        checkCompletedWithWrappedCancellationException(h);
1890        checkCancelled(f);
1891        assertEquals(0, r.invocationCount);
1892        checkCompletedNormally(g, v1);
1893    }}
1894
1895    public void testRunAfterBoth_sourceCancelled2() {
1896        for (ExecutionMode m : ExecutionMode.values())
1897        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1898        for (Integer v1 : new Integer[] { 1, null })
1899    {
1900        final CompletableFuture<Integer> f = new CompletableFuture<>();
1901        final CompletableFuture<Integer> g = new CompletableFuture<>();
1902        final Noop r = new Noop();
1903        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1904
1905        assertTrue(g.cancel(mayInterruptIfRunning));
1906        checkIncomplete(h);
1907        f.complete(v1);
1908
1909        checkCompletedWithWrappedCancellationException(h);
1910        checkCancelled(g);
1911        assertEquals(0, r.invocationCount);
1912        checkCompletedNormally(f, v1);
1913    }}
1914
1915    public void testRunAfterBoth_sourceCancelled3() {
1916        for (ExecutionMode m : ExecutionMode.values())
1917        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1918        for (Integer v1 : new Integer[] { 1, null })
1919    {
1920        final CompletableFuture<Integer> f = new CompletableFuture<>();
1921        final CompletableFuture<Integer> g = new CompletableFuture<>();
1922        final Noop r = new Noop();
1923
1924        assertTrue(g.cancel(mayInterruptIfRunning));
1925        f.complete(v1);
1926        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1927
1928        checkCompletedWithWrappedCancellationException(h);
1929        checkCancelled(g);
1930        assertEquals(0, r.invocationCount);
1931        checkCompletedNormally(f, v1);
1932    }}
1933
1934    public void testRunAfterBoth_sourceCancelled4() {
1935        for (ExecutionMode m : ExecutionMode.values())
1936        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1937        for (Integer v1 : new Integer[] { 1, null })
1938    {
1939        final CompletableFuture<Integer> f = new CompletableFuture<>();
1940        final CompletableFuture<Integer> g = new CompletableFuture<>();
1941        final Noop r = new Noop();
1942
1943        assertTrue(f.cancel(mayInterruptIfRunning));
1944        g.complete(v1);
1945        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1946
1947        checkCompletedWithWrappedCancellationException(h);
1948        checkCancelled(f);
1949        assertEquals(0, r.invocationCount);
1950        checkCompletedNormally(g, v1);
1951    }}
1952
1953    /**
2106       * applyToEither result completes normally after normal completion
2107       * of either source
2108       */
2109 <    public void testApplyToEither_normalCompletion1() {
2109 >    public void testApplyToEither_normalCompletion() {
2110          for (ExecutionMode m : ExecutionMode.values())
2111          for (Integer v1 : new Integer[] { 1, null })
2112          for (Integer v2 : new Integer[] { 2, null })
2113      {
2114          final CompletableFuture<Integer> f = new CompletableFuture<>();
2115          final CompletableFuture<Integer> g = new CompletableFuture<>();
2116 <        final IncFunction r = new IncFunction();
2117 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2116 >        final IncFunction[] rs = new IncFunction[6];
2117 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2118  
2119 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2120 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2121 +        checkIncomplete(h0);
2122 +        checkIncomplete(h1);
2123 +        rs[0].assertNotInvoked();
2124 +        rs[1].assertNotInvoked();
2125          f.complete(v1);
2126 <        checkCompletedNormally(h, inc(v1));
2126 >        checkCompletedNormally(h0, inc(v1));
2127 >        checkCompletedNormally(h1, inc(v1));
2128 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2129 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2130 >        checkCompletedNormally(h2, inc(v1));
2131 >        checkCompletedNormally(h3, inc(v1));
2132          g.complete(v2);
2133  
2134 <        checkCompletedNormally(f, v1);
2135 <        checkCompletedNormally(g, v2);
2136 <        checkCompletedNormally(h, inc(v1));
2137 <    }}
2138 <
2139 <    public void testApplyToEither_normalCompletion2() {
2140 <        for (ExecutionMode m : ExecutionMode.values())
2141 <        for (Integer v1 : new Integer[] { 1, null })
2142 <        for (Integer v2 : new Integer[] { 2, null })
1980 <    {
1981 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1982 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1983 <        final IncFunction r = new IncFunction();
1984 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1985 <
1986 <        g.complete(v2);
1987 <        checkCompletedNormally(h, inc(v2));
1988 <        f.complete(v1);
1989 <
1990 <        checkCompletedNormally(f, v1);
1991 <        checkCompletedNormally(g, v2);
1992 <        checkCompletedNormally(h, inc(v2));
1993 <        }}
1994 <
1995 <    public void testApplyToEither_normalCompletion3() {
1996 <        for (ExecutionMode m : ExecutionMode.values())
1997 <        for (Integer v1 : new Integer[] { 1, null })
1998 <        for (Integer v2 : new Integer[] { 2, null })
1999 <    {
2000 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2001 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 <        final IncFunction r = new IncFunction();
2003 <
2004 <        f.complete(v1);
2005 <        g.complete(v2);
2006 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2134 >        // unspecified behavior - both source completions available
2135 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2136 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2137 >        rs[4].assertValue(h4.join());
2138 >        rs[5].assertValue(h5.join());
2139 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2140 >                   Objects.equals(inc(v2), h4.join()));
2141 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2142 >                   Objects.equals(inc(v2), h5.join()));
2143  
2144          checkCompletedNormally(f, v1);
2145          checkCompletedNormally(g, v2);
2146 <
2147 <        // unspecified behavior
2148 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2149 <                   Objects.equals(h.join(), inc(v2)));
2150 <        assertEquals(1, r.invocationCount);
2146 >        checkCompletedNormally(h0, inc(v1));
2147 >        checkCompletedNormally(h1, inc(v1));
2148 >        checkCompletedNormally(h2, inc(v1));
2149 >        checkCompletedNormally(h3, inc(v1));
2150 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2151      }}
2152  
2153      /**
2154       * applyToEither result completes exceptionally after exceptional
2155       * completion of either source
2156       */
2157 <    public void testApplyToEither_exceptionalCompletion1() {
2157 >    public void testApplyToEither_exceptionalCompletion() {
2158          for (ExecutionMode m : ExecutionMode.values())
2159          for (Integer v1 : new Integer[] { 1, null })
2160      {
2161          final CompletableFuture<Integer> f = new CompletableFuture<>();
2162          final CompletableFuture<Integer> g = new CompletableFuture<>();
2027        final IncFunction r = new IncFunction();
2028        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2163          final CFException ex = new CFException();
2164 +        final IncFunction[] rs = new IncFunction[6];
2165 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2166  
2167 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2168 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2169 +        checkIncomplete(h0);
2170 +        checkIncomplete(h1);
2171 +        rs[0].assertNotInvoked();
2172 +        rs[1].assertNotInvoked();
2173          f.completeExceptionally(ex);
2174 <        checkCompletedWithWrappedCFException(h, ex);
2174 >        checkCompletedWithWrappedException(h0, ex);
2175 >        checkCompletedWithWrappedException(h1, ex);
2176 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2177 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2178 >        checkCompletedWithWrappedException(h2, ex);
2179 >        checkCompletedWithWrappedException(h3, ex);
2180          g.complete(v1);
2181  
2182 <        assertEquals(0, r.invocationCount);
2182 >        // unspecified behavior - both source completions available
2183 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2184 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2185 >        try {
2186 >            assertEquals(inc(v1), h4.join());
2187 >            rs[4].assertValue(inc(v1));
2188 >        } catch (CompletionException ok) {
2189 >            checkCompletedWithWrappedException(h4, ex);
2190 >            rs[4].assertNotInvoked();
2191 >        }
2192 >        try {
2193 >            assertEquals(inc(v1), h5.join());
2194 >            rs[5].assertValue(inc(v1));
2195 >        } catch (CompletionException ok) {
2196 >            checkCompletedWithWrappedException(h5, ex);
2197 >            rs[5].assertNotInvoked();
2198 >        }
2199 >
2200 >        checkCompletedExceptionally(f, ex);
2201          checkCompletedNormally(g, v1);
2202 <        checkCompletedWithWrappedCFException(f, ex);
2203 <        checkCompletedWithWrappedCFException(h, ex);
2202 >        checkCompletedWithWrappedException(h0, ex);
2203 >        checkCompletedWithWrappedException(h1, ex);
2204 >        checkCompletedWithWrappedException(h2, ex);
2205 >        checkCompletedWithWrappedException(h3, ex);
2206 >        checkCompletedWithWrappedException(h4, ex);
2207 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2208      }}
2209  
2210      public void testApplyToEither_exceptionalCompletion2() {
2211          for (ExecutionMode m : ExecutionMode.values())
2212 +        for (boolean fFirst : new boolean[] { true, false })
2213          for (Integer v1 : new Integer[] { 1, null })
2214      {
2215          final CompletableFuture<Integer> f = new CompletableFuture<>();
2216          final CompletableFuture<Integer> g = new CompletableFuture<>();
2047        final IncFunction r = new IncFunction();
2048        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2049        final CFException ex = new CFException();
2050
2051        g.completeExceptionally(ex);
2052        checkCompletedWithWrappedCFException(h, ex);
2053        f.complete(v1);
2054
2055        assertEquals(0, r.invocationCount);
2056        checkCompletedNormally(f, v1);
2057        checkCompletedWithWrappedCFException(g, ex);
2058        checkCompletedWithWrappedCFException(h, ex);
2059    }}
2060
2061    public void testApplyToEither_exceptionalCompletion3() {
2062        for (ExecutionMode m : ExecutionMode.values())
2063        for (Integer v1 : new Integer[] { 1, null })
2064    {
2065        final CompletableFuture<Integer> f = new CompletableFuture<>();
2066        final CompletableFuture<Integer> g = new CompletableFuture<>();
2067        final IncFunction r = new IncFunction();
2217          final CFException ex = new CFException();
2218 +        final IncFunction[] rs = new IncFunction[6];
2219 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2220  
2221 <        g.completeExceptionally(ex);
2222 <        f.complete(v1);
2223 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2221 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2222 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2223 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2224 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2225 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2226 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2227  
2228 <        // unspecified behavior
2075 <        Integer v;
2228 >        // unspecified behavior - both source completions available
2229          try {
2230 <            assertEquals(inc(v1), h.join());
2231 <            assertEquals(1, r.invocationCount);
2230 >            assertEquals(inc(v1), h0.join());
2231 >            rs[0].assertValue(inc(v1));
2232          } catch (CompletionException ok) {
2233 <            checkCompletedWithWrappedCFException(h, ex);
2234 <            assertEquals(0, r.invocationCount);
2233 >            checkCompletedWithWrappedException(h0, ex);
2234 >            rs[0].assertNotInvoked();
2235          }
2083
2084        checkCompletedWithWrappedCFException(g, ex);
2085        checkCompletedNormally(f, v1);
2086    }}
2087
2088    public void testApplyToEither_exceptionalCompletion4() {
2089        for (ExecutionMode m : ExecutionMode.values())
2090        for (Integer v1 : new Integer[] { 1, null })
2091    {
2092        final CompletableFuture<Integer> f = new CompletableFuture<>();
2093        final CompletableFuture<Integer> g = new CompletableFuture<>();
2094        final IncFunction r = new IncFunction();
2095        final CFException ex = new CFException();
2096
2097        f.completeExceptionally(ex);
2098        g.complete(v1);
2099        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2100
2101        // unspecified behavior
2102        Integer v;
2236          try {
2237 <            assertEquals(inc(v1), h.join());
2238 <            assertEquals(1, r.invocationCount);
2237 >            assertEquals(inc(v1), h1.join());
2238 >            rs[1].assertValue(inc(v1));
2239          } catch (CompletionException ok) {
2240 <            checkCompletedWithWrappedCFException(h, ex);
2241 <            assertEquals(0, r.invocationCount);
2240 >            checkCompletedWithWrappedException(h1, ex);
2241 >            rs[1].assertNotInvoked();
2242 >        }
2243 >        try {
2244 >            assertEquals(inc(v1), h2.join());
2245 >            rs[2].assertValue(inc(v1));
2246 >        } catch (CompletionException ok) {
2247 >            checkCompletedWithWrappedException(h2, ex);
2248 >            rs[2].assertNotInvoked();
2249 >        }
2250 >        try {
2251 >            assertEquals(inc(v1), h3.join());
2252 >            rs[3].assertValue(inc(v1));
2253 >        } catch (CompletionException ok) {
2254 >            checkCompletedWithWrappedException(h3, ex);
2255 >            rs[3].assertNotInvoked();
2256          }
2257  
2111        checkCompletedWithWrappedCFException(f, ex);
2112        checkCompletedNormally(g, v1);
2113    }}
2114
2115    /**
2116     * applyToEither result completes exceptionally if action does
2117     */
2118    public void testApplyToEither_actionFailed1() {
2119        for (ExecutionMode m : ExecutionMode.values())
2120        for (Integer v1 : new Integer[] { 1, null })
2121        for (Integer v2 : new Integer[] { 2, null })
2122    {
2123        final CompletableFuture<Integer> f = new CompletableFuture<>();
2124        final CompletableFuture<Integer> g = new CompletableFuture<>();
2125        final FailingFunction r = new FailingFunction();
2126        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2127
2128        f.complete(v1);
2129        checkCompletedWithWrappedCFException(h);
2130        g.complete(v2);
2131        checkCompletedNormally(f, v1);
2132        checkCompletedNormally(g, v2);
2133    }}
2134
2135    public void testApplyToEither_actionFailed2() {
2136        for (ExecutionMode m : ExecutionMode.values())
2137        for (Integer v1 : new Integer[] { 1, null })
2138        for (Integer v2 : new Integer[] { 2, null })
2139    {
2140        final CompletableFuture<Integer> f = new CompletableFuture<>();
2141        final CompletableFuture<Integer> g = new CompletableFuture<>();
2142        final FailingFunction r = new FailingFunction();
2143        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2144
2145        g.complete(v2);
2146        checkCompletedWithWrappedCFException(h);
2147        f.complete(v1);
2258          checkCompletedNormally(f, v1);
2259 <        checkCompletedNormally(g, v2);
2259 >        checkCompletedExceptionally(g, ex);
2260      }}
2261  
2262      /**
2263       * applyToEither result completes exceptionally if either source cancelled
2264       */
2265 <    public void testApplyToEither_sourceCancelled1() {
2265 >    public void testApplyToEither_sourceCancelled() {
2266          for (ExecutionMode m : ExecutionMode.values())
2267          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2268          for (Integer v1 : new Integer[] { 1, null })
2269      {
2270          final CompletableFuture<Integer> f = new CompletableFuture<>();
2271          final CompletableFuture<Integer> g = new CompletableFuture<>();
2272 <        final IncFunction r = new IncFunction();
2273 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2272 >        final IncFunction[] rs = new IncFunction[6];
2273 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2274  
2275 <        assertTrue(f.cancel(mayInterruptIfRunning));
2276 <        checkCompletedWithWrappedCancellationException(h);
2275 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2276 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2277 >        checkIncomplete(h0);
2278 >        checkIncomplete(h1);
2279 >        rs[0].assertNotInvoked();
2280 >        rs[1].assertNotInvoked();
2281 >        f.cancel(mayInterruptIfRunning);
2282 >        checkCompletedWithWrappedCancellationException(h0);
2283 >        checkCompletedWithWrappedCancellationException(h1);
2284 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2285 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2286 >        checkCompletedWithWrappedCancellationException(h2);
2287 >        checkCompletedWithWrappedCancellationException(h3);
2288          g.complete(v1);
2289  
2290 +        // unspecified behavior - both source completions available
2291 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2292 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2293 +        try {
2294 +            assertEquals(inc(v1), h4.join());
2295 +            rs[4].assertValue(inc(v1));
2296 +        } catch (CompletionException ok) {
2297 +            checkCompletedWithWrappedCancellationException(h4);
2298 +            rs[4].assertNotInvoked();
2299 +        }
2300 +        try {
2301 +            assertEquals(inc(v1), h5.join());
2302 +            rs[5].assertValue(inc(v1));
2303 +        } catch (CompletionException ok) {
2304 +            checkCompletedWithWrappedCancellationException(h5);
2305 +            rs[5].assertNotInvoked();
2306 +        }
2307 +
2308          checkCancelled(f);
2170        assertEquals(0, r.invocationCount);
2309          checkCompletedNormally(g, v1);
2310 <        checkCompletedWithWrappedCancellationException(h);
2310 >        checkCompletedWithWrappedCancellationException(h0);
2311 >        checkCompletedWithWrappedCancellationException(h1);
2312 >        checkCompletedWithWrappedCancellationException(h2);
2313 >        checkCompletedWithWrappedCancellationException(h3);
2314 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2315      }}
2316  
2317      public void testApplyToEither_sourceCancelled2() {
2318          for (ExecutionMode m : ExecutionMode.values())
2319          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2320 +        for (boolean fFirst : new boolean[] { true, false })
2321          for (Integer v1 : new Integer[] { 1, null })
2322      {
2323          final CompletableFuture<Integer> f = new CompletableFuture<>();
2324          final CompletableFuture<Integer> g = new CompletableFuture<>();
2325 <        final IncFunction r = new IncFunction();
2326 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2184 <
2185 <        assertTrue(g.cancel(mayInterruptIfRunning));
2186 <        checkCompletedWithWrappedCancellationException(h);
2187 <        f.complete(v1);
2188 <
2189 <        checkCancelled(g);
2190 <        assertEquals(0, r.invocationCount);
2191 <        checkCompletedNormally(f, v1);
2192 <        checkCompletedWithWrappedCancellationException(h);
2193 <    }}
2194 <
2195 <    public void testApplyToEither_sourceCancelled3() {
2196 <        for (ExecutionMode m : ExecutionMode.values())
2197 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2198 <        for (Integer v1 : new Integer[] { 1, null })
2199 <    {
2200 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2201 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2202 <        final IncFunction r = new IncFunction();
2325 >        final IncFunction[] rs = new IncFunction[6];
2326 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2327  
2328 <        assertTrue(g.cancel(mayInterruptIfRunning));
2329 <        f.complete(v1);
2330 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2328 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2329 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2330 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2331 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2332 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2333 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2334  
2335 <        // unspecified behavior
2209 <        Integer v;
2335 >        // unspecified behavior - both source completions available
2336          try {
2337 <            assertEquals(inc(v1), h.join());
2338 <            assertEquals(1, r.invocationCount);
2337 >            assertEquals(inc(v1), h0.join());
2338 >            rs[0].assertValue(inc(v1));
2339          } catch (CompletionException ok) {
2340 <            checkCompletedWithWrappedCancellationException(h);
2341 <            assertEquals(0, r.invocationCount);
2340 >            checkCompletedWithWrappedCancellationException(h0);
2341 >            rs[0].assertNotInvoked();
2342 >        }
2343 >        try {
2344 >            assertEquals(inc(v1), h1.join());
2345 >            rs[1].assertValue(inc(v1));
2346 >        } catch (CompletionException ok) {
2347 >            checkCompletedWithWrappedCancellationException(h1);
2348 >            rs[1].assertNotInvoked();
2349 >        }
2350 >        try {
2351 >            assertEquals(inc(v1), h2.join());
2352 >            rs[2].assertValue(inc(v1));
2353 >        } catch (CompletionException ok) {
2354 >            checkCompletedWithWrappedCancellationException(h2);
2355 >            rs[2].assertNotInvoked();
2356          }
2217
2218        checkCancelled(g);
2219        checkCompletedNormally(f, v1);
2220    }}
2221
2222    public void testApplyToEither_sourceCancelled4() {
2223        for (ExecutionMode m : ExecutionMode.values())
2224        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2225        for (Integer v1 : new Integer[] { 1, null })
2226    {
2227        final CompletableFuture<Integer> f = new CompletableFuture<>();
2228        final CompletableFuture<Integer> g = new CompletableFuture<>();
2229        final IncFunction r = new IncFunction();
2230
2231        assertTrue(f.cancel(mayInterruptIfRunning));
2232        g.complete(v1);
2233        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2234
2235        // unspecified behavior
2236        Integer v;
2357          try {
2358 <            assertEquals(inc(v1), h.join());
2359 <            assertEquals(1, r.invocationCount);
2358 >            assertEquals(inc(v1), h3.join());
2359 >            rs[3].assertValue(inc(v1));
2360          } catch (CompletionException ok) {
2361 <            checkCompletedWithWrappedCancellationException(h);
2362 <            assertEquals(0, r.invocationCount);
2361 >            checkCompletedWithWrappedCancellationException(h3);
2362 >            rs[3].assertNotInvoked();
2363          }
2364  
2365 <        checkCancelled(f);
2366 <        checkCompletedNormally(g, v1);
2365 >        checkCompletedNormally(f, v1);
2366 >        checkCancelled(g);
2367      }}
2368  
2369      /**
2370 <     * acceptEither result completes normally after normal completion
2251 <     * of either source
2370 >     * applyToEither result completes exceptionally if action does
2371       */
2372 <    public void testAcceptEither_normalCompletion1() {
2372 >    public void testApplyToEither_actionFailed() {
2373          for (ExecutionMode m : ExecutionMode.values())
2374          for (Integer v1 : new Integer[] { 1, null })
2375          for (Integer v2 : new Integer[] { 2, null })
2376      {
2377          final CompletableFuture<Integer> f = new CompletableFuture<>();
2378          final CompletableFuture<Integer> g = new CompletableFuture<>();
2379 <        final IncAction r = new IncAction();
2380 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2379 >        final FailingFunction[] rs = new FailingFunction[6];
2380 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2381  
2382 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2383 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2384          f.complete(v1);
2385 <        checkCompletedNormally(h, null);
2386 <        assertEquals(inc(v1), r.value);
2387 <        g.complete(v2);
2385 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2386 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2387 >        checkCompletedWithWrappedCFException(h0);
2388 >        checkCompletedWithWrappedCFException(h1);
2389 >        checkCompletedWithWrappedCFException(h2);
2390 >        checkCompletedWithWrappedCFException(h3);
2391 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2392  
2393 <        checkCompletedNormally(f, v1);
2269 <        checkCompletedNormally(g, v2);
2270 <        checkCompletedNormally(h, null);
2271 <    }}
2393 >        g.complete(v2);
2394  
2395 <    public void testAcceptEither_normalCompletion2() {
2396 <        for (ExecutionMode m : ExecutionMode.values())
2397 <        for (Integer v1 : new Integer[] { 1, null })
2276 <        for (Integer v2 : new Integer[] { 2, null })
2277 <    {
2278 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2279 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2280 <        final IncAction r = new IncAction();
2281 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2395 >        // unspecified behavior - both source completions available
2396 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2397 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2398  
2399 <        g.complete(v2);
2400 <        checkCompletedNormally(h, null);
2401 <        assertEquals(inc(v2), r.value);
2402 <        f.complete(v1);
2399 >        checkCompletedWithWrappedCFException(h4);
2400 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2401 >                   Objects.equals(v2, rs[4].value));
2402 >        checkCompletedWithWrappedCFException(h5);
2403 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2404 >                   Objects.equals(v2, rs[5].value));
2405  
2406          checkCompletedNormally(f, v1);
2407          checkCompletedNormally(g, v2);
2290        checkCompletedNormally(h, null);
2408      }}
2409  
2410 <    public void testAcceptEither_normalCompletion3() {
2410 >    /**
2411 >     * acceptEither result completes normally after normal completion
2412 >     * of either source
2413 >     */
2414 >    public void testAcceptEither_normalCompletion() {
2415          for (ExecutionMode m : ExecutionMode.values())
2416          for (Integer v1 : new Integer[] { 1, null })
2417          for (Integer v2 : new Integer[] { 2, null })
2418      {
2419          final CompletableFuture<Integer> f = new CompletableFuture<>();
2420          final CompletableFuture<Integer> g = new CompletableFuture<>();
2421 <        final IncAction r = new IncAction();
2421 >        final NoopConsumer[] rs = new NoopConsumer[6];
2422 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2423  
2424 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2425 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2426 +        checkIncomplete(h0);
2427 +        checkIncomplete(h1);
2428 +        rs[0].assertNotInvoked();
2429 +        rs[1].assertNotInvoked();
2430          f.complete(v1);
2431 +        checkCompletedNormally(h0, null);
2432 +        checkCompletedNormally(h1, null);
2433 +        rs[0].assertValue(v1);
2434 +        rs[1].assertValue(v1);
2435 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2436 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2437 +        checkCompletedNormally(h2, null);
2438 +        checkCompletedNormally(h3, null);
2439 +        rs[2].assertValue(v1);
2440 +        rs[3].assertValue(v1);
2441          g.complete(v2);
2304        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2442  
2443 <        checkCompletedNormally(h, null);
2443 >        // unspecified behavior - both source completions available
2444 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2445 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2446 >        checkCompletedNormally(h4, null);
2447 >        checkCompletedNormally(h5, null);
2448 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2449 >                   Objects.equals(v2, rs[4].value));
2450 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2451 >                   Objects.equals(v2, rs[5].value));
2452 >
2453          checkCompletedNormally(f, v1);
2454          checkCompletedNormally(g, v2);
2455 <
2456 <        // unspecified behavior
2457 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2458 <                   Objects.equals(r.value, inc(v2)));
2455 >        checkCompletedNormally(h0, null);
2456 >        checkCompletedNormally(h1, null);
2457 >        checkCompletedNormally(h2, null);
2458 >        checkCompletedNormally(h3, null);
2459 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2460      }}
2461  
2462      /**
2463       * acceptEither result completes exceptionally after exceptional
2464       * completion of either source
2465       */
2466 <    public void testAcceptEither_exceptionalCompletion1() {
2466 >    public void testAcceptEither_exceptionalCompletion() {
2467          for (ExecutionMode m : ExecutionMode.values())
2468          for (Integer v1 : new Integer[] { 1, null })
2469      {
2470          final CompletableFuture<Integer> f = new CompletableFuture<>();
2471          final CompletableFuture<Integer> g = new CompletableFuture<>();
2325        final IncAction r = new IncAction();
2326        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2472          final CFException ex = new CFException();
2473 +        final NoopConsumer[] rs = new NoopConsumer[6];
2474 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2475  
2476 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2477 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2478 +        checkIncomplete(h0);
2479 +        checkIncomplete(h1);
2480 +        rs[0].assertNotInvoked();
2481 +        rs[1].assertNotInvoked();
2482          f.completeExceptionally(ex);
2483 <        checkCompletedWithWrappedCFException(h, ex);
2483 >        checkCompletedWithWrappedException(h0, ex);
2484 >        checkCompletedWithWrappedException(h1, ex);
2485 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2486 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2487 >        checkCompletedWithWrappedException(h2, ex);
2488 >        checkCompletedWithWrappedException(h3, ex);
2489 >
2490          g.complete(v1);
2491  
2492 <        assertEquals(0, r.invocationCount);
2492 >        // unspecified behavior - both source completions available
2493 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2494 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2495 >        try {
2496 >            assertNull(h4.join());
2497 >            rs[4].assertValue(v1);
2498 >        } catch (CompletionException ok) {
2499 >            checkCompletedWithWrappedException(h4, ex);
2500 >            rs[4].assertNotInvoked();
2501 >        }
2502 >        try {
2503 >            assertNull(h5.join());
2504 >            rs[5].assertValue(v1);
2505 >        } catch (CompletionException ok) {
2506 >            checkCompletedWithWrappedException(h5, ex);
2507 >            rs[5].assertNotInvoked();
2508 >        }
2509 >
2510 >        checkCompletedExceptionally(f, ex);
2511          checkCompletedNormally(g, v1);
2512 <        checkCompletedWithWrappedCFException(f, ex);
2513 <        checkCompletedWithWrappedCFException(h, ex);
2512 >        checkCompletedWithWrappedException(h0, ex);
2513 >        checkCompletedWithWrappedException(h1, ex);
2514 >        checkCompletedWithWrappedException(h2, ex);
2515 >        checkCompletedWithWrappedException(h3, ex);
2516 >        checkCompletedWithWrappedException(h4, ex);
2517 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2518      }}
2519  
2520      public void testAcceptEither_exceptionalCompletion2() {
2521          for (ExecutionMode m : ExecutionMode.values())
2522 +        for (boolean fFirst : new boolean[] { true, false })
2523          for (Integer v1 : new Integer[] { 1, null })
2524      {
2525          final CompletableFuture<Integer> f = new CompletableFuture<>();
2526          final CompletableFuture<Integer> g = new CompletableFuture<>();
2345        final IncAction r = new IncAction();
2346        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2347        final CFException ex = new CFException();
2348
2349        g.completeExceptionally(ex);
2350        checkCompletedWithWrappedCFException(h, ex);
2351        f.complete(v1);
2352
2353        assertEquals(0, r.invocationCount);
2354        checkCompletedNormally(f, v1);
2355        checkCompletedWithWrappedCFException(g, ex);
2356        checkCompletedWithWrappedCFException(h, ex);
2357    }}
2358
2359    public void testAcceptEither_exceptionalCompletion3() {
2360        for (ExecutionMode m : ExecutionMode.values())
2361        for (Integer v1 : new Integer[] { 1, null })
2362    {
2363        final CompletableFuture<Integer> f = new CompletableFuture<>();
2364        final CompletableFuture<Integer> g = new CompletableFuture<>();
2365        final IncAction r = new IncAction();
2527          final CFException ex = new CFException();
2528 +        final NoopConsumer[] rs = new NoopConsumer[6];
2529 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2530  
2531 <        g.completeExceptionally(ex);
2532 <        f.complete(v1);
2533 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2531 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2532 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2533 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2534 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2535 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2536 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2537  
2538 <        // unspecified behavior
2373 <        Integer v;
2538 >        // unspecified behavior - both source completions available
2539          try {
2540 <            assertNull(h.join());
2541 <            assertEquals(1, r.invocationCount);
2377 <            assertEquals(inc(v1), r.value);
2540 >            assertEquals(null, h0.join());
2541 >            rs[0].assertValue(v1);
2542          } catch (CompletionException ok) {
2543 <            checkCompletedWithWrappedCFException(h, ex);
2544 <            assertEquals(0, r.invocationCount);
2543 >            checkCompletedWithWrappedException(h0, ex);
2544 >            rs[0].assertNotInvoked();
2545          }
2382
2383        checkCompletedWithWrappedCFException(g, ex);
2384        checkCompletedNormally(f, v1);
2385    }}
2386
2387    public void testAcceptEither_exceptionalCompletion4() {
2388        for (ExecutionMode m : ExecutionMode.values())
2389        for (Integer v1 : new Integer[] { 1, null })
2390    {
2391        final CompletableFuture<Integer> f = new CompletableFuture<>();
2392        final CompletableFuture<Integer> g = new CompletableFuture<>();
2393        final IncAction r = new IncAction();
2394        final CFException ex = new CFException();
2395
2396        f.completeExceptionally(ex);
2397        g.complete(v1);
2398        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2399
2400        // unspecified behavior
2401        Integer v;
2546          try {
2547 <            assertNull(h.join());
2548 <            assertEquals(1, r.invocationCount);
2405 <            assertEquals(inc(v1), r.value);
2547 >            assertEquals(null, h1.join());
2548 >            rs[1].assertValue(v1);
2549          } catch (CompletionException ok) {
2550 <            checkCompletedWithWrappedCFException(h, ex);
2551 <            assertEquals(0, r.invocationCount);
2550 >            checkCompletedWithWrappedException(h1, ex);
2551 >            rs[1].assertNotInvoked();
2552 >        }
2553 >        try {
2554 >            assertEquals(null, h2.join());
2555 >            rs[2].assertValue(v1);
2556 >        } catch (CompletionException ok) {
2557 >            checkCompletedWithWrappedException(h2, ex);
2558 >            rs[2].assertNotInvoked();
2559 >        }
2560 >        try {
2561 >            assertEquals(null, h3.join());
2562 >            rs[3].assertValue(v1);
2563 >        } catch (CompletionException ok) {
2564 >            checkCompletedWithWrappedException(h3, ex);
2565 >            rs[3].assertNotInvoked();
2566          }
2567  
2411        checkCompletedWithWrappedCFException(f, ex);
2412        checkCompletedNormally(g, v1);
2413    }}
2414
2415    /**
2416     * acceptEither result completes exceptionally if action does
2417     */
2418    public void testAcceptEither_actionFailed1() {
2419        for (ExecutionMode m : ExecutionMode.values())
2420        for (Integer v1 : new Integer[] { 1, null })
2421        for (Integer v2 : new Integer[] { 2, null })
2422    {
2423        final CompletableFuture<Integer> f = new CompletableFuture<>();
2424        final CompletableFuture<Integer> g = new CompletableFuture<>();
2425        final FailingConsumer r = new FailingConsumer();
2426        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2427
2428        f.complete(v1);
2429        checkCompletedWithWrappedCFException(h);
2430        g.complete(v2);
2431        checkCompletedNormally(f, v1);
2432        checkCompletedNormally(g, v2);
2433    }}
2434
2435    public void testAcceptEither_actionFailed2() {
2436        for (ExecutionMode m : ExecutionMode.values())
2437        for (Integer v1 : new Integer[] { 1, null })
2438        for (Integer v2 : new Integer[] { 2, null })
2439    {
2440        final CompletableFuture<Integer> f = new CompletableFuture<>();
2441        final CompletableFuture<Integer> g = new CompletableFuture<>();
2442        final FailingConsumer r = new FailingConsumer();
2443        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2444
2445        g.complete(v2);
2446        checkCompletedWithWrappedCFException(h);
2447        f.complete(v1);
2568          checkCompletedNormally(f, v1);
2569 <        checkCompletedNormally(g, v2);
2569 >        checkCompletedExceptionally(g, ex);
2570      }}
2571  
2572      /**
2573       * acceptEither result completes exceptionally if either source cancelled
2574       */
2575 <    public void testAcceptEither_sourceCancelled1() {
2456 <        for (ExecutionMode m : ExecutionMode.values())
2457 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2458 <        for (Integer v1 : new Integer[] { 1, null })
2459 <    {
2460 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2461 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2462 <        final IncAction r = new IncAction();
2463 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2464 <
2465 <        assertTrue(f.cancel(mayInterruptIfRunning));
2466 <        checkCompletedWithWrappedCancellationException(h);
2467 <        g.complete(v1);
2468 <
2469 <        checkCancelled(f);
2470 <        assertEquals(0, r.invocationCount);
2471 <        checkCompletedNormally(g, v1);
2472 <        checkCompletedWithWrappedCancellationException(h);
2473 <    }}
2474 <
2475 <    public void testAcceptEither_sourceCancelled2() {
2575 >    public void testAcceptEither_sourceCancelled() {
2576          for (ExecutionMode m : ExecutionMode.values())
2577          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2578          for (Integer v1 : new Integer[] { 1, null })
2579      {
2580          final CompletableFuture<Integer> f = new CompletableFuture<>();
2581          final CompletableFuture<Integer> g = new CompletableFuture<>();
2582 <        final IncAction r = new IncAction();
2583 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2484 <
2485 <        assertTrue(g.cancel(mayInterruptIfRunning));
2486 <        checkCompletedWithWrappedCancellationException(h);
2487 <        f.complete(v1);
2488 <
2489 <        checkCancelled(g);
2490 <        assertEquals(0, r.invocationCount);
2491 <        checkCompletedNormally(f, v1);
2492 <        checkCompletedWithWrappedCancellationException(h);
2493 <    }}
2582 >        final NoopConsumer[] rs = new NoopConsumer[6];
2583 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2584  
2585 <    public void testAcceptEither_sourceCancelled3() {
2586 <        for (ExecutionMode m : ExecutionMode.values())
2587 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 IncAction r = new IncAction();
2585 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2586 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2587 >        checkIncomplete(h0);
2588 >        checkIncomplete(h1);
2589 >        rs[0].assertNotInvoked();
2590 >        rs[1].assertNotInvoked();
2591 >        f.cancel(mayInterruptIfRunning);
2592 >        checkCompletedWithWrappedCancellationException(h0);
2593 >        checkCompletedWithWrappedCancellationException(h1);
2594 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2595 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2596 >        checkCompletedWithWrappedCancellationException(h2);
2597 >        checkCompletedWithWrappedCancellationException(h3);
2598  
2599 <        assertTrue(g.cancel(mayInterruptIfRunning));
2505 <        f.complete(v1);
2506 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2599 >        g.complete(v1);
2600  
2601 <        // unspecified behavior
2602 <        Integer v;
2601 >        // unspecified behavior - both source completions available
2602 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2603 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2604          try {
2605 <            assertNull(h.join());
2606 <            assertEquals(1, r.invocationCount);
2513 <            assertEquals(inc(v1), r.value);
2605 >            assertNull(h4.join());
2606 >            rs[4].assertValue(v1);
2607          } catch (CompletionException ok) {
2608 <            checkCompletedWithWrappedCancellationException(h);
2609 <            assertEquals(0, r.invocationCount);
2608 >            checkCompletedWithWrappedCancellationException(h4);
2609 >            rs[4].assertNotInvoked();
2610          }
2518
2519        checkCancelled(g);
2520        checkCompletedNormally(f, v1);
2521    }}
2522
2523    public void testAcceptEither_sourceCancelled4() {
2524        for (ExecutionMode m : ExecutionMode.values())
2525        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2526        for (Integer v1 : new Integer[] { 1, null })
2527    {
2528        final CompletableFuture<Integer> f = new CompletableFuture<>();
2529        final CompletableFuture<Integer> g = new CompletableFuture<>();
2530        final IncAction r = new IncAction();
2531
2532        assertTrue(f.cancel(mayInterruptIfRunning));
2533        g.complete(v1);
2534        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2535
2536        // unspecified behavior
2537        Integer v;
2611          try {
2612 <            assertNull(h.join());
2613 <            assertEquals(1, r.invocationCount);
2541 <            assertEquals(inc(v1), r.value);
2612 >            assertNull(h5.join());
2613 >            rs[5].assertValue(v1);
2614          } catch (CompletionException ok) {
2615 <            checkCompletedWithWrappedCancellationException(h);
2616 <            assertEquals(0, r.invocationCount);
2615 >            checkCompletedWithWrappedCancellationException(h5);
2616 >            rs[5].assertNotInvoked();
2617          }
2618  
2619          checkCancelled(f);
2620          checkCompletedNormally(g, v1);
2621 +        checkCompletedWithWrappedCancellationException(h0);
2622 +        checkCompletedWithWrappedCancellationException(h1);
2623 +        checkCompletedWithWrappedCancellationException(h2);
2624 +        checkCompletedWithWrappedCancellationException(h3);
2625 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2626      }}
2627  
2628      /**
2629 <     * runAfterEither result completes normally after normal completion
2553 <     * of either source
2629 >     * acceptEither result completes exceptionally if action does
2630       */
2631 <    public void testRunAfterEither_normalCompletion1() {
2631 >    public void testAcceptEither_actionFailed() {
2632          for (ExecutionMode m : ExecutionMode.values())
2633          for (Integer v1 : new Integer[] { 1, null })
2634          for (Integer v2 : new Integer[] { 2, null })
2635      {
2636          final CompletableFuture<Integer> f = new CompletableFuture<>();
2637          final CompletableFuture<Integer> g = new CompletableFuture<>();
2638 <        final Noop r = new Noop();
2639 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2638 >        final FailingConsumer[] rs = new FailingConsumer[6];
2639 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2640  
2641 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2642 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2643          f.complete(v1);
2644 <        checkCompletedNormally(h, null);
2645 <        assertEquals(1, r.invocationCount);
2646 <        g.complete(v2);
2644 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2645 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2646 >        checkCompletedWithWrappedCFException(h0);
2647 >        checkCompletedWithWrappedCFException(h1);
2648 >        checkCompletedWithWrappedCFException(h2);
2649 >        checkCompletedWithWrappedCFException(h3);
2650 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2651  
2652 <        checkCompletedNormally(f, v1);
2571 <        checkCompletedNormally(g, v2);
2572 <        checkCompletedNormally(h, null);
2573 <        assertEquals(1, r.invocationCount);
2574 <    }}
2652 >        g.complete(v2);
2653  
2654 <    public void testRunAfterEither_normalCompletion2() {
2655 <        for (ExecutionMode m : ExecutionMode.values())
2656 <        for (Integer v1 : new Integer[] { 1, null })
2579 <        for (Integer v2 : new Integer[] { 2, null })
2580 <    {
2581 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2582 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2583 <        final Noop r = new Noop();
2584 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2654 >        // unspecified behavior - both source completions available
2655 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2656 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2657  
2658 <        g.complete(v2);
2659 <        checkCompletedNormally(h, null);
2660 <        assertEquals(1, r.invocationCount);
2661 <        f.complete(v1);
2658 >        checkCompletedWithWrappedCFException(h4);
2659 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2660 >                   Objects.equals(v2, rs[4].value));
2661 >        checkCompletedWithWrappedCFException(h5);
2662 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2663 >                   Objects.equals(v2, rs[5].value));
2664  
2665          checkCompletedNormally(f, v1);
2666          checkCompletedNormally(g, v2);
2667 <        checkCompletedNormally(h, null);
2594 <        assertEquals(1, r.invocationCount);
2595 <        }}
2667 >    }}
2668  
2669 <    public void testRunAfterEither_normalCompletion3() {
2669 >    /**
2670 >     * runAfterEither result completes normally after normal completion
2671 >     * of either source
2672 >     */
2673 >    public void testRunAfterEither_normalCompletion() {
2674          for (ExecutionMode m : ExecutionMode.values())
2675          for (Integer v1 : new Integer[] { 1, null })
2676          for (Integer v2 : new Integer[] { 2, null })
2677      {
2678          final CompletableFuture<Integer> f = new CompletableFuture<>();
2679          final CompletableFuture<Integer> g = new CompletableFuture<>();
2680 <        final Noop r = new Noop();
2680 >        final Noop[] rs = new Noop[6];
2681 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2682  
2683 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2684 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2685 +        checkIncomplete(h0);
2686 +        checkIncomplete(h1);
2687 +        rs[0].assertNotInvoked();
2688 +        rs[1].assertNotInvoked();
2689          f.complete(v1);
2690 +        checkCompletedNormally(h0, null);
2691 +        checkCompletedNormally(h1, null);
2692 +        rs[0].assertInvoked();
2693 +        rs[1].assertInvoked();
2694 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2695 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2696 +        checkCompletedNormally(h2, null);
2697 +        checkCompletedNormally(h3, null);
2698 +        rs[2].assertInvoked();
2699 +        rs[3].assertInvoked();
2700 +
2701          g.complete(v2);
2608        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2702  
2703 <        checkCompletedNormally(h, null);
2703 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2704 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2705 >
2706          checkCompletedNormally(f, v1);
2707          checkCompletedNormally(g, v2);
2708 <        assertEquals(1, r.invocationCount);
2708 >        checkCompletedNormally(h0, null);
2709 >        checkCompletedNormally(h1, null);
2710 >        checkCompletedNormally(h2, null);
2711 >        checkCompletedNormally(h3, null);
2712 >        checkCompletedNormally(h4, null);
2713 >        checkCompletedNormally(h5, null);
2714 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2715      }}
2716  
2717      /**
2718       * runAfterEither result completes exceptionally after exceptional
2719       * completion of either source
2720       */
2721 <    public void testRunAfterEither_exceptionalCompletion1() {
2621 <        for (ExecutionMode m : ExecutionMode.values())
2622 <        for (Integer v1 : new Integer[] { 1, null })
2623 <    {
2624 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2625 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2626 <        final Noop r = new Noop();
2627 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2628 <        final CFException ex = new CFException();
2629 <
2630 <        f.completeExceptionally(ex);
2631 <        checkCompletedWithWrappedCFException(h, ex);
2632 <        g.complete(v1);
2633 <
2634 <        assertEquals(0, r.invocationCount);
2635 <        checkCompletedNormally(g, v1);
2636 <        checkCompletedWithWrappedCFException(f, ex);
2637 <        checkCompletedWithWrappedCFException(h, ex);
2638 <    }}
2639 <
2640 <    public void testRunAfterEither_exceptionalCompletion2() {
2721 >    public void testRunAfterEither_exceptionalCompletion() {
2722          for (ExecutionMode m : ExecutionMode.values())
2723          for (Integer v1 : new Integer[] { 1, null })
2724      {
2725          final CompletableFuture<Integer> f = new CompletableFuture<>();
2726          final CompletableFuture<Integer> g = new CompletableFuture<>();
2646        final Noop r = new Noop();
2647        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2727          final CFException ex = new CFException();
2728 +        final Noop[] rs = new Noop[6];
2729 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2730  
2731 <        g.completeExceptionally(ex);
2732 <        checkCompletedWithWrappedCFException(h, ex);
2733 <        f.complete(v1);
2734 <
2735 <        assertEquals(0, r.invocationCount);
2736 <        checkCompletedNormally(f, v1);
2737 <        checkCompletedWithWrappedCFException(g, ex);
2738 <        checkCompletedWithWrappedCFException(h, ex);
2739 <    }}
2740 <
2741 <    public void testRunAfterEither_exceptionalCompletion3() {
2742 <        for (ExecutionMode m : ExecutionMode.values())
2743 <        for (Integer v1 : new Integer[] { 1, null })
2663 <    {
2664 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2665 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2666 <        final Noop r = new Noop();
2667 <        final CFException ex = new CFException();
2731 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2732 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2733 >        checkIncomplete(h0);
2734 >        checkIncomplete(h1);
2735 >        rs[0].assertNotInvoked();
2736 >        rs[1].assertNotInvoked();
2737 >        assertTrue(f.completeExceptionally(ex));
2738 >        checkCompletedWithWrappedException(h0, ex);
2739 >        checkCompletedWithWrappedException(h1, ex);
2740 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2741 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2742 >        checkCompletedWithWrappedException(h2, ex);
2743 >        checkCompletedWithWrappedException(h3, ex);
2744  
2745 <        g.completeExceptionally(ex);
2670 <        f.complete(v1);
2671 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2745 >        assertTrue(g.complete(v1));
2746  
2747 <        // unspecified behavior
2748 <        Integer v;
2747 >        // unspecified behavior - both source completions available
2748 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2749 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2750          try {
2751 <            assertNull(h.join());
2752 <            assertEquals(1, r.invocationCount);
2751 >            assertNull(h4.join());
2752 >            rs[4].assertInvoked();
2753          } catch (CompletionException ok) {
2754 <            checkCompletedWithWrappedCFException(h, ex);
2755 <            assertEquals(0, r.invocationCount);
2754 >            checkCompletedWithWrappedException(h4, ex);
2755 >            rs[4].assertNotInvoked();
2756          }
2682
2683        checkCompletedWithWrappedCFException(g, ex);
2684        checkCompletedNormally(f, v1);
2685    }}
2686
2687    public void testRunAfterEither_exceptionalCompletion4() {
2688        for (ExecutionMode m : ExecutionMode.values())
2689        for (Integer v1 : new Integer[] { 1, null })
2690    {
2691        final CompletableFuture<Integer> f = new CompletableFuture<>();
2692        final CompletableFuture<Integer> g = new CompletableFuture<>();
2693        final Noop r = new Noop();
2694        final CFException ex = new CFException();
2695
2696        f.completeExceptionally(ex);
2697        g.complete(v1);
2698        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2699
2700        // unspecified behavior
2701        Integer v;
2757          try {
2758 <            assertNull(h.join());
2759 <            assertEquals(1, r.invocationCount);
2758 >            assertNull(h5.join());
2759 >            rs[5].assertInvoked();
2760          } catch (CompletionException ok) {
2761 <            checkCompletedWithWrappedCFException(h, ex);
2762 <            assertEquals(0, r.invocationCount);
2761 >            checkCompletedWithWrappedException(h5, ex);
2762 >            rs[5].assertNotInvoked();
2763          }
2764  
2765 <        checkCompletedWithWrappedCFException(f, ex);
2765 >        checkCompletedExceptionally(f, ex);
2766          checkCompletedNormally(g, v1);
2767 +        checkCompletedWithWrappedException(h0, ex);
2768 +        checkCompletedWithWrappedException(h1, ex);
2769 +        checkCompletedWithWrappedException(h2, ex);
2770 +        checkCompletedWithWrappedException(h3, ex);
2771 +        checkCompletedWithWrappedException(h4, ex);
2772 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2773      }}
2774  
2775 <    /**
2715 <     * runAfterEither result completes exceptionally if action does
2716 <     */
2717 <    public void testRunAfterEither_actionFailed1() {
2775 >    public void testRunAfterEither_exceptionalCompletion2() {
2776          for (ExecutionMode m : ExecutionMode.values())
2777 +        for (boolean fFirst : new boolean[] { true, false })
2778          for (Integer v1 : new Integer[] { 1, null })
2720        for (Integer v2 : new Integer[] { 2, null })
2779      {
2780          final CompletableFuture<Integer> f = new CompletableFuture<>();
2781          final CompletableFuture<Integer> g = new CompletableFuture<>();
2782 <        final FailingNoop r = new FailingNoop();
2783 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2782 >        final CFException ex = new CFException();
2783 >        final Noop[] rs = new Noop[6];
2784 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2785  
2786 <        f.complete(v1);
2787 <        checkCompletedWithWrappedCFException(h);
2788 <        g.complete(v2);
2789 <        checkCompletedNormally(f, v1);
2790 <        checkCompletedNormally(g, v2);
2791 <    }}
2786 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2787 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2788 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2789 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2790 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2791 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2792  
2793 <    public void testRunAfterEither_actionFailed2() {
2794 <        for (ExecutionMode m : ExecutionMode.values())
2795 <        for (Integer v1 : new Integer[] { 1, null })
2796 <        for (Integer v2 : new Integer[] { 2, null })
2797 <    {
2798 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2799 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2800 <        final FailingNoop r = new FailingNoop();
2801 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2793 >        // unspecified behavior - both source completions available
2794 >        try {
2795 >            assertEquals(null, h0.join());
2796 >            rs[0].assertInvoked();
2797 >        } catch (CompletionException ok) {
2798 >            checkCompletedWithWrappedException(h0, ex);
2799 >            rs[0].assertNotInvoked();
2800 >        }
2801 >        try {
2802 >            assertEquals(null, h1.join());
2803 >            rs[1].assertInvoked();
2804 >        } catch (CompletionException ok) {
2805 >            checkCompletedWithWrappedException(h1, ex);
2806 >            rs[1].assertNotInvoked();
2807 >        }
2808 >        try {
2809 >            assertEquals(null, h2.join());
2810 >            rs[2].assertInvoked();
2811 >        } catch (CompletionException ok) {
2812 >            checkCompletedWithWrappedException(h2, ex);
2813 >            rs[2].assertNotInvoked();
2814 >        }
2815 >        try {
2816 >            assertEquals(null, h3.join());
2817 >            rs[3].assertInvoked();
2818 >        } catch (CompletionException ok) {
2819 >            checkCompletedWithWrappedException(h3, ex);
2820 >            rs[3].assertNotInvoked();
2821 >        }
2822  
2744        g.complete(v2);
2745        checkCompletedWithWrappedCFException(h);
2746        f.complete(v1);
2823          checkCompletedNormally(f, v1);
2824 <        checkCompletedNormally(g, v2);
2824 >        checkCompletedExceptionally(g, ex);
2825      }}
2826  
2827      /**
2828       * runAfterEither result completes exceptionally if either source cancelled
2829       */
2830 <    public void testRunAfterEither_sourceCancelled1() {
2830 >    public void testRunAfterEither_sourceCancelled() {
2831          for (ExecutionMode m : ExecutionMode.values())
2832          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2833          for (Integer v1 : new Integer[] { 1, null })
2834      {
2835          final CompletableFuture<Integer> f = new CompletableFuture<>();
2836          final CompletableFuture<Integer> g = new CompletableFuture<>();
2837 <        final Noop r = new Noop();
2838 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2837 >        final Noop[] rs = new Noop[6];
2838 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2839  
2840 <        assertTrue(f.cancel(mayInterruptIfRunning));
2841 <        checkCompletedWithWrappedCancellationException(h);
2842 <        g.complete(v1);
2840 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2841 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2842 >        checkIncomplete(h0);
2843 >        checkIncomplete(h1);
2844 >        rs[0].assertNotInvoked();
2845 >        rs[1].assertNotInvoked();
2846 >        f.cancel(mayInterruptIfRunning);
2847 >        checkCompletedWithWrappedCancellationException(h0);
2848 >        checkCompletedWithWrappedCancellationException(h1);
2849 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2850 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2851 >        checkCompletedWithWrappedCancellationException(h2);
2852 >        checkCompletedWithWrappedCancellationException(h3);
2853  
2854 <        checkCancelled(f);
2769 <        assertEquals(0, r.invocationCount);
2770 <        checkCompletedNormally(g, v1);
2771 <        checkCompletedWithWrappedCancellationException(h);
2772 <    }}
2854 >        assertTrue(g.complete(v1));
2855  
2856 <    public void testRunAfterEither_sourceCancelled2() {
2857 <        for (ExecutionMode m : ExecutionMode.values())
2858 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2859 <        for (Integer v1 : new Integer[] { 1, null })
2860 <    {
2861 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2862 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2863 <        final Noop r = new Noop();
2864 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2865 <
2784 <        assertTrue(g.cancel(mayInterruptIfRunning));
2785 <        checkCompletedWithWrappedCancellationException(h);
2786 <        f.complete(v1);
2787 <
2788 <        checkCancelled(g);
2789 <        assertEquals(0, r.invocationCount);
2790 <        checkCompletedNormally(f, v1);
2791 <        checkCompletedWithWrappedCancellationException(h);
2792 <    }}
2793 <
2794 <    public void testRunAfterEither_sourceCancelled3() {
2795 <        for (ExecutionMode m : ExecutionMode.values())
2796 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2797 <        for (Integer v1 : new Integer[] { 1, null })
2798 <    {
2799 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2801 <        final Noop r = new Noop();
2802 <
2803 <        assertTrue(g.cancel(mayInterruptIfRunning));
2804 <        f.complete(v1);
2805 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2806 <
2807 <        // unspecified behavior
2808 <        Integer v;
2856 >        // unspecified behavior - both source completions available
2857 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2858 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2859 >        try {
2860 >            assertNull(h4.join());
2861 >            rs[4].assertInvoked();
2862 >        } catch (CompletionException ok) {
2863 >            checkCompletedWithWrappedCancellationException(h4);
2864 >            rs[4].assertNotInvoked();
2865 >        }
2866          try {
2867 <            assertNull(h.join());
2868 <            assertEquals(1, r.invocationCount);
2867 >            assertNull(h5.join());
2868 >            rs[5].assertInvoked();
2869          } catch (CompletionException ok) {
2870 <            checkCompletedWithWrappedCancellationException(h);
2871 <            assertEquals(0, r.invocationCount);
2870 >            checkCompletedWithWrappedCancellationException(h5);
2871 >            rs[5].assertNotInvoked();
2872          }
2873  
2874 <        checkCancelled(g);
2875 <        checkCompletedNormally(f, v1);
2874 >        checkCancelled(f);
2875 >        checkCompletedNormally(g, v1);
2876 >        checkCompletedWithWrappedCancellationException(h0);
2877 >        checkCompletedWithWrappedCancellationException(h1);
2878 >        checkCompletedWithWrappedCancellationException(h2);
2879 >        checkCompletedWithWrappedCancellationException(h3);
2880 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2881      }}
2882  
2883 <    public void testRunAfterEither_sourceCancelled4() {
2883 >    /**
2884 >     * runAfterEither result completes exceptionally if action does
2885 >     */
2886 >    public void testRunAfterEither_actionFailed() {
2887          for (ExecutionMode m : ExecutionMode.values())
2823        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2888          for (Integer v1 : new Integer[] { 1, null })
2889 +        for (Integer v2 : new Integer[] { 2, null })
2890      {
2891          final CompletableFuture<Integer> f = new CompletableFuture<>();
2892          final CompletableFuture<Integer> g = new CompletableFuture<>();
2893 <        final Noop r = new Noop();
2894 <
2830 <        assertTrue(f.cancel(mayInterruptIfRunning));
2831 <        g.complete(v1);
2832 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2893 >        final FailingRunnable[] rs = new FailingRunnable[6];
2894 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2895  
2896 <        // unspecified behavior
2897 <        Integer v;
2898 <        try {
2899 <            assertNull(h.join());
2900 <            assertEquals(1, r.invocationCount);
2901 <        } catch (CompletionException ok) {
2902 <            checkCompletedWithWrappedCancellationException(h);
2903 <            assertEquals(0, r.invocationCount);
2904 <        }
2896 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2897 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2898 >        assertTrue(f.complete(v1));
2899 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2900 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2901 >        checkCompletedWithWrappedCFException(h0);
2902 >        checkCompletedWithWrappedCFException(h1);
2903 >        checkCompletedWithWrappedCFException(h2);
2904 >        checkCompletedWithWrappedCFException(h3);
2905 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2906 >        assertTrue(g.complete(v2));
2907 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2908 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2909 >        checkCompletedWithWrappedCFException(h4);
2910 >        checkCompletedWithWrappedCFException(h5);
2911  
2912 <        checkCancelled(f);
2913 <        checkCompletedNormally(g, v1);
2912 >        checkCompletedNormally(f, v1);
2913 >        checkCompletedNormally(g, v2);
2914 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2915      }}
2916  
2917      /**
# Line 2854 | Line 2923 | public class CompletableFutureTest exten
2923          for (Integer v1 : new Integer[] { 1, null })
2924      {
2925          final CompletableFuture<Integer> f = new CompletableFuture<>();
2926 <        final CompletableFutureInc r = new CompletableFutureInc();
2927 <        if (!createIncomplete) f.complete(v1);
2928 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2929 <        if (createIncomplete) f.complete(v1);
2926 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2927 >        if (!createIncomplete) assertTrue(f.complete(v1));
2928 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2929 >        if (createIncomplete) assertTrue(f.complete(v1));
2930  
2931          checkCompletedNormally(g, inc(v1));
2932          checkCompletedNormally(f, v1);
2933 <        assertEquals(1, r.invocationCount);
2933 >        r.assertValue(v1);
2934      }}
2935  
2936      /**
# Line 2873 | Line 2942 | public class CompletableFutureTest exten
2942          for (boolean createIncomplete : new boolean[] { true, false })
2943      {
2944          final CFException ex = new CFException();
2945 <        final CompletableFutureInc r = new CompletableFutureInc();
2945 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2946          final CompletableFuture<Integer> f = new CompletableFuture<>();
2947          if (!createIncomplete) f.completeExceptionally(ex);
2948 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2948 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2949          if (createIncomplete) f.completeExceptionally(ex);
2950  
2951 <        checkCompletedWithWrappedCFException(g, ex);
2952 <        checkCompletedWithWrappedCFException(f, ex);
2953 <        assertEquals(0, r.invocationCount);
2951 >        checkCompletedWithWrappedException(g, ex);
2952 >        checkCompletedExceptionally(f, ex);
2953 >        r.assertNotInvoked();
2954      }}
2955  
2956      /**
# Line 2894 | Line 2963 | public class CompletableFutureTest exten
2963      {
2964          final CompletableFuture<Integer> f = new CompletableFuture<>();
2965          final FailingCompletableFutureFunction r
2966 <            = new FailingCompletableFutureFunction();
2967 <        if (!createIncomplete) f.complete(v1);
2968 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2969 <        if (createIncomplete) f.complete(v1);
2966 >            = new FailingCompletableFutureFunction(m);
2967 >        if (!createIncomplete) assertTrue(f.complete(v1));
2968 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2969 >        if (createIncomplete) assertTrue(f.complete(v1));
2970  
2971          checkCompletedWithWrappedCFException(g);
2972          checkCompletedNormally(f, v1);
# Line 2912 | Line 2981 | public class CompletableFutureTest exten
2981          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2982      {
2983          final CompletableFuture<Integer> f = new CompletableFuture<>();
2984 <        final CompletableFutureInc r = new CompletableFutureInc();
2984 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2985          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2986 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2987 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2986 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2987 >        if (createIncomplete) {
2988 >            checkIncomplete(g);
2989 >            assertTrue(f.cancel(mayInterruptIfRunning));
2990 >        }
2991  
2992          checkCompletedWithWrappedCancellationException(g);
2993          checkCancelled(f);
2994      }}
2995  
2924    // asyncs
2925
2996      /**
2997 <     * thenApplyAsync result completes normally after normal completion of source
2997 >     * thenCompose result completes exceptionally if the result of the action does
2998       */
2999 <    public void testThenApplyAsync() {
3000 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3001 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3002 <        f.complete(one);
3003 <        checkCompletedNormally(g, two);
3004 <    }
3005 <
3006 <    /**
3007 <     * thenApplyAsync result completes exceptionally after exceptional
3008 <     * completion of source
3009 <     */
3010 <    public void testThenApplyAsync2() {
3011 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3012 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3013 <        f.completeExceptionally(new CFException());
3014 <        checkCompletedWithWrappedCFException(g);
3015 <    }
3016 <
3017 <    /**
3018 <     * thenApplyAsync result completes exceptionally if action does
3019 <     */
3020 <    public void testThenApplyAsync3() {
3021 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3022 <        FailingFunction r = new FailingFunction();
3023 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3024 <        f.complete(null);
3025 <        checkCompletedWithWrappedCFException(g);
3026 <    }
3027 <
3028 <    /**
3029 <     * thenApplyAsync result completes exceptionally if source cancelled
3030 <     */
3031 <    public void testThenApplyAsync4() {
3032 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3033 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3034 <        assertTrue(f.cancel(true));
3035 <        checkCompletedWithWrappedCancellationException(g);
3036 <    }
3037 <
3038 <    /**
3039 <     * thenAcceptAsync result completes normally after normal
3040 <     * completion of source
3041 <     */
2972 <    public void testThenAcceptAsync() {
2973 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2974 <        IncAction r = new IncAction();
2975 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2976 <        f.complete(one);
2977 <        checkCompletedNormally(g, null);
2978 <        assertEquals(r.value, (Integer) 2);
2979 <    }
2980 <
2981 <    /**
2982 <     * thenAcceptAsync result completes exceptionally after exceptional
2983 <     * completion of source
2984 <     */
2985 <    public void testThenAcceptAsync2() {
2986 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2987 <        IncAction r = new IncAction();
2988 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2989 <        f.completeExceptionally(new CFException());
2990 <        checkCompletedWithWrappedCFException(g);
2991 <    }
2992 <
2993 <    /**
2994 <     * thenAcceptAsync result completes exceptionally if action does
2995 <     */
2996 <    public void testThenAcceptAsync3() {
2997 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2998 <        FailingConsumer r = new FailingConsumer();
2999 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3000 <        f.complete(null);
3001 <        checkCompletedWithWrappedCFException(g);
3002 <    }
3003 <
3004 <    /**
3005 <     * thenAcceptAsync result completes exceptionally if source cancelled
3006 <     */
3007 <    public void testThenAcceptAsync4() {
3008 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3009 <        IncAction r = new IncAction();
3010 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3011 <        assertTrue(f.cancel(true));
3012 <        checkCompletedWithWrappedCancellationException(g);
3013 <    }
3014 <
3015 <    // async with explicit executors
3016 <
3017 <    /**
3018 <     * thenApplyAsync result completes normally after normal completion of source
3019 <     */
3020 <    public void testThenApplyAsyncE() {
3021 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3022 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3023 <        f.complete(one);
3024 <        checkCompletedNormally(g, two);
3025 <    }
3026 <
3027 <    /**
3028 <     * thenApplyAsync result completes exceptionally after exceptional
3029 <     * completion of source
3030 <     */
3031 <    public void testThenApplyAsync2E() {
3032 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3033 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3034 <        f.completeExceptionally(new CFException());
3035 <        checkCompletedWithWrappedCFException(g);
3036 <    }
3037 <
3038 <    /**
3039 <     * thenApplyAsync result completes exceptionally if action does
3040 <     */
3041 <    public void testThenApplyAsync3E() {
3042 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3043 <        FailingFunction r = new FailingFunction();
3044 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3045 <        f.complete(null);
3046 <        checkCompletedWithWrappedCFException(g);
3047 <    }
3048 <
3049 <    /**
3050 <     * thenApplyAsync result completes exceptionally if source cancelled
3051 <     */
3052 <    public void testThenApplyAsync4E() {
3053 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3054 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3055 <        assertTrue(f.cancel(true));
3056 <        checkCompletedWithWrappedCancellationException(g);
3057 <    }
3058 <
3059 <    /**
3060 <     * thenAcceptAsync result completes normally after normal
3061 <     * completion of source
3062 <     */
3063 <    public void testThenAcceptAsyncE() {
3064 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3065 <        IncAction r = new IncAction();
3066 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3067 <        f.complete(one);
3068 <        checkCompletedNormally(g, null);
3069 <        assertEquals(r.value, (Integer) 2);
3070 <    }
3071 <
3072 <    /**
3073 <     * thenAcceptAsync result completes exceptionally after exceptional
3074 <     * completion of source
3075 <     */
3076 <    public void testThenAcceptAsync2E() {
3077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3078 <        IncAction r = new IncAction();
3079 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3080 <        f.completeExceptionally(new CFException());
3081 <        checkCompletedWithWrappedCFException(g);
3082 <    }
3083 <
3084 <    /**
3085 <     * thenAcceptAsync result completes exceptionally if action does
3086 <     */
3087 <    public void testThenAcceptAsync3E() {
3088 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3089 <        FailingConsumer r = new FailingConsumer();
3090 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3091 <        f.complete(null);
3092 <        checkCompletedWithWrappedCFException(g);
3093 <    }
2999 >    public void testThenCompose_actionReturnsFailingFuture() {
3000 >        for (ExecutionMode m : ExecutionMode.values())
3001 >        for (int order = 0; order < 6; order++)
3002 >        for (Integer v1 : new Integer[] { 1, null })
3003 >    {
3004 >        final CFException ex = new CFException();
3005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3006 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3007 >        final CompletableFuture<Integer> h;
3008 >        // Test all permutations of orders
3009 >        switch (order) {
3010 >        case 0:
3011 >            assertTrue(f.complete(v1));
3012 >            assertTrue(g.completeExceptionally(ex));
3013 >            h = m.thenCompose(f, (x -> g));
3014 >            break;
3015 >        case 1:
3016 >            assertTrue(f.complete(v1));
3017 >            h = m.thenCompose(f, (x -> g));
3018 >            assertTrue(g.completeExceptionally(ex));
3019 >            break;
3020 >        case 2:
3021 >            assertTrue(g.completeExceptionally(ex));
3022 >            assertTrue(f.complete(v1));
3023 >            h = m.thenCompose(f, (x -> g));
3024 >            break;
3025 >        case 3:
3026 >            assertTrue(g.completeExceptionally(ex));
3027 >            h = m.thenCompose(f, (x -> g));
3028 >            assertTrue(f.complete(v1));
3029 >            break;
3030 >        case 4:
3031 >            h = m.thenCompose(f, (x -> g));
3032 >            assertTrue(f.complete(v1));
3033 >            assertTrue(g.completeExceptionally(ex));
3034 >            break;
3035 >        case 5:
3036 >            h = m.thenCompose(f, (x -> g));
3037 >            assertTrue(f.complete(v1));
3038 >            assertTrue(g.completeExceptionally(ex));
3039 >            break;
3040 >        default: throw new AssertionError();
3041 >        }
3042  
3043 <    /**
3044 <     * thenAcceptAsync result completes exceptionally if source cancelled
3045 <     */
3046 <    public void testThenAcceptAsync4E() {
3099 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3100 <        IncAction r = new IncAction();
3101 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3102 <        assertTrue(f.cancel(true));
3103 <        checkCompletedWithWrappedCancellationException(g);
3104 <    }
3043 >        checkCompletedExceptionally(g, ex);
3044 >        checkCompletedWithWrappedException(h, ex);
3045 >        checkCompletedNormally(f, v1);
3046 >    }}
3047  
3048      // other static methods
3049  
# Line 3119 | Line 3061 | public class CompletableFutureTest exten
3061       * when all components complete normally
3062       */
3063      public void testAllOf_normal() throws Exception {
3064 <        for (int k = 1; k < 20; ++k) {
3065 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3066 <            for (int i = 0; i < k; ++i)
3064 >        for (int k = 1; k < 10; k++) {
3065 >            CompletableFuture<Integer>[] fs
3066 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3067 >            for (int i = 0; i < k; i++)
3068 >                fs[i] = new CompletableFuture<>();
3069 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3070 >            for (int i = 0; i < k; i++) {
3071 >                checkIncomplete(f);
3072 >                checkIncomplete(CompletableFuture.allOf(fs));
3073 >                fs[i].complete(one);
3074 >            }
3075 >            checkCompletedNormally(f, null);
3076 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3077 >        }
3078 >    }
3079 >
3080 >    public void testAllOf_backwards() throws Exception {
3081 >        for (int k = 1; k < 10; k++) {
3082 >            CompletableFuture<Integer>[] fs
3083 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3084 >            for (int i = 0; i < k; i++)
3085                  fs[i] = new CompletableFuture<>();
3086              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3087 <            for (int i = 0; i < k; ++i) {
3087 >            for (int i = k - 1; i >= 0; i--) {
3088                  checkIncomplete(f);
3089                  checkIncomplete(CompletableFuture.allOf(fs));
3090                  fs[i].complete(one);
# Line 3134 | Line 3094 | public class CompletableFutureTest exten
3094          }
3095      }
3096  
3097 +    public void testAllOf_exceptional() throws Exception {
3098 +        for (int k = 1; k < 10; k++) {
3099 +            CompletableFuture<Integer>[] fs
3100 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3101 +            CFException ex = new CFException();
3102 +            for (int i = 0; i < k; i++)
3103 +                fs[i] = new CompletableFuture<>();
3104 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3105 +            for (int i = 0; i < k; i++) {
3106 +                checkIncomplete(f);
3107 +                checkIncomplete(CompletableFuture.allOf(fs));
3108 +                if (i != k/2) {
3109 +                    fs[i].complete(i);
3110 +                    checkCompletedNormally(fs[i], i);
3111 +                } else {
3112 +                    fs[i].completeExceptionally(ex);
3113 +                    checkCompletedExceptionally(fs[i], ex);
3114 +                }
3115 +            }
3116 +            checkCompletedWithWrappedException(f, ex);
3117 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3118 +        }
3119 +    }
3120 +
3121      /**
3122       * anyOf(no component futures) returns an incomplete future
3123       */
3124      public void testAnyOf_empty() throws Exception {
3125 +        for (Integer v1 : new Integer[] { 1, null })
3126 +    {
3127          CompletableFuture<Object> f = CompletableFuture.anyOf();
3128          checkIncomplete(f);
3129 <    }
3129 >
3130 >        f.complete(v1);
3131 >        checkCompletedNormally(f, v1);
3132 >    }}
3133  
3134      /**
3135       * anyOf returns a future completed normally with a value when
3136       * a component future does
3137       */
3138      public void testAnyOf_normal() throws Exception {
3139 <        for (int k = 0; k < 10; ++k) {
3139 >        for (int k = 0; k < 10; k++) {
3140              CompletableFuture[] fs = new CompletableFuture[k];
3141 <            for (int i = 0; i < k; ++i)
3141 >            for (int i = 0; i < k; i++)
3142                  fs[i] = new CompletableFuture<>();
3143              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3144              checkIncomplete(f);
3145 <            for (int i = 0; i < k; ++i) {
3146 <                fs[i].complete(one);
3147 <                checkCompletedNormally(f, one);
3148 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3145 >            for (int i = 0; i < k; i++) {
3146 >                fs[i].complete(i);
3147 >                checkCompletedNormally(f, 0);
3148 >                int x = (int) CompletableFuture.anyOf(fs).join();
3149 >                assertTrue(0 <= x && x <= i);
3150 >            }
3151 >        }
3152 >    }
3153 >    public void testAnyOf_normal_backwards() throws Exception {
3154 >        for (int k = 0; k < 10; k++) {
3155 >            CompletableFuture[] fs = new CompletableFuture[k];
3156 >            for (int i = 0; i < k; i++)
3157 >                fs[i] = new CompletableFuture<>();
3158 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3159 >            checkIncomplete(f);
3160 >            for (int i = k - 1; i >= 0; i--) {
3161 >                fs[i].complete(i);
3162 >                checkCompletedNormally(f, k - 1);
3163 >                int x = (int) CompletableFuture.anyOf(fs).join();
3164 >                assertTrue(i <= x && x <= k - 1);
3165              }
3166          }
3167      }
# Line 3165 | Line 3170 | public class CompletableFutureTest exten
3170       * anyOf result completes exceptionally when any component does.
3171       */
3172      public void testAnyOf_exceptional() throws Exception {
3173 <        for (int k = 0; k < 10; ++k) {
3173 >        for (int k = 0; k < 10; k++) {
3174 >            CompletableFuture[] fs = new CompletableFuture[k];
3175 >            CFException[] exs = new CFException[k];
3176 >            for (int i = 0; i < k; i++) {
3177 >                fs[i] = new CompletableFuture<>();
3178 >                exs[i] = new CFException();
3179 >            }
3180 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3181 >            checkIncomplete(f);
3182 >            for (int i = 0; i < k; i++) {
3183 >                fs[i].completeExceptionally(exs[i]);
3184 >                checkCompletedWithWrappedException(f, exs[0]);
3185 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3186 >            }
3187 >        }
3188 >    }
3189 >
3190 >    public void testAnyOf_exceptional_backwards() throws Exception {
3191 >        for (int k = 0; k < 10; k++) {
3192              CompletableFuture[] fs = new CompletableFuture[k];
3193 <            for (int i = 0; i < k; ++i)
3193 >            CFException[] exs = new CFException[k];
3194 >            for (int i = 0; i < k; i++) {
3195                  fs[i] = new CompletableFuture<>();
3196 +                exs[i] = new CFException();
3197 +            }
3198              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3199              checkIncomplete(f);
3200 <            for (int i = 0; i < k; ++i) {
3201 <                fs[i].completeExceptionally(new CFException());
3202 <                checkCompletedWithWrappedCFException(f);
3200 >            for (int i = k - 1; i >= 0; i--) {
3201 >                fs[i].completeExceptionally(exs[i]);
3202 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3203                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3204              }
3205          }
# Line 3192 | Line 3218 | public class CompletableFutureTest exten
3218          Runnable[] throwingActions = {
3219              () -> CompletableFuture.supplyAsync(null),
3220              () -> CompletableFuture.supplyAsync(null, exec),
3221 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3221 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3222  
3223              () -> CompletableFuture.runAsync(null),
3224              () -> CompletableFuture.runAsync(null, exec),
# Line 3265 | Line 3291 | public class CompletableFutureTest exten
3291  
3292              () -> f.thenCompose(null),
3293              () -> f.thenComposeAsync(null),
3294 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3294 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3295              () -> f.thenComposeAsync(null, exec),
3296  
3297              () -> f.exceptionally(null),
# Line 3297 | Line 3323 | public class CompletableFutureTest exten
3323          assertSame(f, f.toCompletableFuture());
3324      }
3325  
3326 <    /**
3301 <     * whenComplete action executes on normal completion, propagating
3302 <     * source result.
3303 <     */
3304 <    public void testWhenComplete_normalCompletion1() {
3305 <        for (ExecutionMode m : ExecutionMode.values())
3306 <        for (boolean createIncomplete : new boolean[] { true, false })
3307 <        for (Integer v1 : new Integer[] { 1, null })
3308 <    {
3309 <        final AtomicInteger a = new AtomicInteger(0);
3310 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3311 <        if (!createIncomplete) f.complete(v1);
3312 <        final CompletableFuture<Integer> g = m.whenComplete
3313 <            (f,
3314 <             (Integer x, Throwable t) -> {
3315 <                threadAssertSame(x, v1);
3316 <                threadAssertNull(t);
3317 <                a.getAndIncrement();
3318 <            });
3319 <        if (createIncomplete) f.complete(v1);
3326 >    //--- tests of implementation details; not part of official tck ---
3327  
3328 <        checkCompletedNormally(g, v1);
3329 <        checkCompletedNormally(f, v1);
3330 <        assertEquals(1, a.get());
3331 <    }}
3328 >    Object resultOf(CompletableFuture<?> f) {
3329 >        try {
3330 >            java.lang.reflect.Field resultField
3331 >                = CompletableFuture.class.getDeclaredField("result");
3332 >            resultField.setAccessible(true);
3333 >            return resultField.get(f);
3334 >        } catch (Throwable t) { throw new AssertionError(t); }
3335 >    }
3336  
3337 <    /**
3338 <     * whenComplete action executes on exceptional completion, propagating
3328 <     * source result.
3329 <     */
3330 <    public void testWhenComplete_exceptionalCompletion() {
3337 >    public void testExceptionPropagationReusesResultObject() {
3338 >        if (!testImplementationDetails) return;
3339          for (ExecutionMode m : ExecutionMode.values())
3332        for (boolean createIncomplete : new boolean[] { true, false })
3333        for (Integer v1 : new Integer[] { 1, null })
3340      {
3335        final AtomicInteger a = new AtomicInteger(0);
3341          final CFException ex = new CFException();
3342 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3343 <        if (!createIncomplete) f.completeExceptionally(ex);
3339 <        final CompletableFuture<Integer> g = m.whenComplete
3340 <            (f,
3341 <             (Integer x, Throwable t) -> {
3342 <                threadAssertNull(x);
3343 <                threadAssertSame(t, ex);
3344 <                a.getAndIncrement();
3345 <            });
3346 <        if (createIncomplete) f.completeExceptionally(ex);
3347 <        checkCompletedWithWrappedCFException(f, ex);
3348 <        checkCompletedWithWrappedCFException(g, ex);
3349 <        assertEquals(1, a.get());
3350 <    }}
3342 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3343 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3344  
3345 <    /**
3346 <     * whenComplete action executes on cancelled source, propagating
3354 <     * CancellationException.
3355 <     */
3356 <    public void testWhenComplete_sourceCancelled() {
3357 <        for (ExecutionMode m : ExecutionMode.values())
3358 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3359 <        for (boolean createIncomplete : new boolean[] { true, false })
3360 <    {
3361 <        final AtomicInteger a = new AtomicInteger(0);
3362 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3363 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3364 <        final CompletableFuture<Integer> g = m.whenComplete
3365 <            (f,
3366 <             (Integer x, Throwable t) -> {
3367 <                threadAssertNull(x);
3368 <                threadAssertTrue(t instanceof CancellationException);
3369 <                a.getAndIncrement();
3370 <            });
3371 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3345 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3346 >            = new ArrayList<>();
3347  
3348 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3349 <        checkCompletedWithWrappedCancellationException(g);
3350 <        checkCancelled(f);
3376 <        assertEquals(1, a.get());
3377 <    }}
3348 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3349 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3350 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3351  
3352 <    /**
3353 <     * If a whenComplete action throws an exception when triggered by
3354 <     * a normal completion, it completes exceptionally
3382 <     */
3383 <    public void testWhenComplete_actionFailed() {
3384 <        for (boolean createIncomplete : new boolean[] { true, false })
3385 <        for (ExecutionMode m : ExecutionMode.values())
3386 <        for (Integer v1 : new Integer[] { 1, null })
3387 <    {
3388 <        final AtomicInteger a = new AtomicInteger(0);
3389 <        final CFException ex = new CFException();
3390 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3391 <        if (!createIncomplete) f.complete(v1);
3392 <        final CompletableFuture<Integer> g = m.whenComplete
3393 <            (f,
3394 <             (Integer x, Throwable t) -> {
3395 <                threadAssertSame(x, v1);
3396 <                threadAssertNull(t);
3397 <                a.getAndIncrement();
3398 <                throw ex;
3399 <            });
3400 <        if (createIncomplete) f.complete(v1);
3401 <        checkCompletedNormally(f, v1);
3402 <        checkCompletedWithWrappedCFException(g, ex);
3403 <        assertEquals(1, a.get());
3404 <    }}
3352 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3353 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3354 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3355  
3356 <    /**
3357 <     * If a whenComplete action throws an exception when triggered by
3358 <     * a source completion that also throws an exception, the source
3409 <     * exception takes precedence.
3410 <     */
3411 <    public void testWhenComplete_actionFailedSourceFailed() {
3412 <        for (boolean createIncomplete : new boolean[] { true, false })
3413 <        for (ExecutionMode m : ExecutionMode.values())
3414 <        for (Integer v1 : new Integer[] { 1, null })
3415 <    {
3416 <        final AtomicInteger a = new AtomicInteger(0);
3417 <        final CFException ex1 = new CFException();
3418 <        final CFException ex2 = new CFException();
3419 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3356 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3357 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3358 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3359  
3360 <        if (!createIncomplete) f.completeExceptionally(ex1);
3422 <        final CompletableFuture<Integer> g = m.whenComplete
3423 <            (f,
3424 <             (Integer x, Throwable t) -> {
3425 <                threadAssertSame(t, ex1);
3426 <                threadAssertNull(x);
3427 <                a.getAndIncrement();
3428 <                throw ex2;
3429 <            });
3430 <        if (createIncomplete) f.completeExceptionally(ex1);
3360 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3361  
3362 <        checkCompletedWithWrappedCFException(f, ex1);
3363 <        checkCompletedWithWrappedCFException(g, ex1);
3364 <        assertEquals(1, a.get());
3362 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3363 >
3364 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3365 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3366 >
3367 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3368 >                 fun : funs) {
3369 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3370 >            f.completeExceptionally(ex);
3371 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3372 >            checkCompletedWithWrappedException(src, ex);
3373 >            CompletableFuture<?> dep = fun.apply(src);
3374 >            checkCompletedWithWrappedException(dep, ex);
3375 >            assertSame(resultOf(src), resultOf(dep));
3376 >        }
3377 >
3378 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3379 >                 fun : funs) {
3380 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3381 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3382 >            CompletableFuture<?> dep = fun.apply(src);
3383 >            f.completeExceptionally(ex);
3384 >            checkCompletedWithWrappedException(src, ex);
3385 >            checkCompletedWithWrappedException(dep, ex);
3386 >            assertSame(resultOf(src), resultOf(dep));
3387 >        }
3388 >
3389 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3390 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3391 >                 fun : funs) {
3392 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3393 >            f.cancel(mayInterruptIfRunning);
3394 >            checkCancelled(f);
3395 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3396 >            checkCompletedWithWrappedCancellationException(src);
3397 >            CompletableFuture<?> dep = fun.apply(src);
3398 >            checkCompletedWithWrappedCancellationException(dep);
3399 >            assertSame(resultOf(src), resultOf(dep));
3400 >        }
3401 >
3402 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3403 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3404 >                 fun : funs) {
3405 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3406 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3407 >            CompletableFuture<?> dep = fun.apply(src);
3408 >            f.cancel(mayInterruptIfRunning);
3409 >            checkCancelled(f);
3410 >            checkCompletedWithWrappedCancellationException(src);
3411 >            checkCompletedWithWrappedCancellationException(dep);
3412 >            assertSame(resultOf(src), resultOf(dep));
3413 >        }
3414      }}
3415  
3416   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines