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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines