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.46 by jsr166, Mon Jun 2 17:41:22 2014 UTC vs.
Revision 1.97 by jsr166, Wed Dec 31 16:44:01 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines