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.44 by jsr166, Mon Jun 2 06:06:30 2014 UTC vs.
Revision 1.96 by jsr166, Sat Nov 1 14:50:26 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines