ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.41 by jsr166, Mon Jun 2 01:46:11 2014 UTC vs.
Revision 1.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;
342 <        public boolean ran() { return invocationCount == 1; }
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;
443 <        public boolean ran() { return invocationCount == 1; }
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.
454 <        public boolean ran() { return invocationCount == 1; }
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.
472 <        public boolean ran() { return invocationCount == 1; }
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;
480 <        boolean ran;
478 >
479 >    class Noop extends CheckedAction implements Runnable {
480 >        Noop(ExecutionMode m) { super(m); }
481          public void run() {
482 <            invocationCount++;
382 <            ran = true;
482 >            invoked();
483          }
484      }
485  
486 <    static final class FailingSupplier implements Supplier<Integer> {
487 <        boolean ran;
488 <        public Integer get() { ran = true; throw new CFException(); }
486 >    class FailingSupplier extends CheckedAction
487 >        implements Supplier<Integer>
488 >    {
489 >        FailingSupplier(ExecutionMode m) { super(m); }
490 >        public Integer get() {
491 >            invoked();
492 >            throw new CFException();
493 >        }
494      }
495 <    static final class FailingConsumer implements Consumer<Integer> {
496 <        boolean ran;
497 <        public void accept(Integer x) { ran = true; throw new CFException(); }
495 >
496 >    class FailingConsumer extends CheckedIntegerAction
497 >        implements Consumer<Integer>
498 >    {
499 >        FailingConsumer(ExecutionMode m) { super(m); }
500 >        public void accept(Integer x) {
501 >            invoked();
502 >            value = x;
503 >            throw new CFException();
504 >        }
505      }
506 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
507 <        boolean ran;
508 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
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 >            invoked();
513 >            value = subtract(x, y);
514 >            throw new CFException();
515 >        }
516      }
517 <    static final class FailingFunction implements Function<Integer, Integer> {
518 <        boolean ran;
519 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
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 >            invoked();
524 >            value = x;
525 >            throw new CFException();
526 >        }
527      }
528 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
529 <        boolean ran;
530 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
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 >            invoked();
535 >            value = subtract(x, y);
536 >            throw new CFException();
537 >        }
538      }
539 <    static final class FailingNoop implements Runnable {
540 <        boolean ran;
541 <        public void run() { ran = true; throw new CFException(); }
539 >
540 >    class FailingRunnable extends CheckedAction implements Runnable {
541 >        FailingRunnable(ExecutionMode m) { super(m); }
542 >        public void run() {
543 >            invoked();
544 >            throw new CFException();
545 >        }
546      }
547  
548 <    static final class CompletableFutureInc
549 <        implements Function<Integer, CompletableFuture<Integer>> {
550 <        boolean ran;
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 <            ran = true;
554 >            invoked();
555 >            value = x;
556              CompletableFuture<Integer> f = new CompletableFuture<>();
557 <            f.complete(Integer.valueOf(x.intValue() + 1));
557 >            assertTrue(f.complete(inc(x)));
558              return f;
559          }
560      }
561  
562 <    static final class FailingCompletableFutureFunction
563 <        implements Function<Integer, CompletableFuture<Integer>> {
564 <        boolean ran;
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 <            ran = true; throw new CFException();
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();
437 <        }
438 <    }
439 <
440 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
441 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
442 <    }
443 <
444 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
445 <        boolean ran;
446 <        public Integer apply(Integer x, Throwable t) {
447 <            ran = true;
448 <            return (t == null) ? two : three;
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 471 | 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 483 | 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              }
502        },
503
504 //             /** Experimental way to do more testing */
505 //         REVERSE_DEFAULT {
506 //             public <T,U> CompletableFuture<Void> runAfterBoth
507 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
508 //                 return g.runAfterBoth(f, a);
509 //             }
510 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
511 //                 (CompletableFuture<T> f,
512 //                  CompletionStage<? extends U> g,
513 //                  BiConsumer<? super T,? super U> a) {
514 //                 return DEFAULT.thenAcceptBoth(f, g, a);
515 //             }
516 //         },
517
518        DEFAULT_ASYNC {
704              public <T,U> CompletableFuture<Void> runAfterBoth
705                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
706                  return f.runAfterBothAsync(g, a);
# Line 532 | 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 544 | 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              }
563        },
564
565 //         REVERSE_DEFAULT_ASYNC {
566 //             public <T,U> CompletableFuture<Void> runAfterBoth
567 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
568 //                 return f.runAfterBothAsync(g, a);
569 //             }
570 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
571 //                 (CompletableFuture<T> f,
572 //                  CompletionStage<? extends U> g,
573 //                  BiConsumer<? super T,? super U> a) {
574 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
575 //             }
576 //         },
577
578        EXECUTOR {
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 592 | Line 790 | public class CompletableFutureTest exten
790                   BiFunction<? super T,? super U,? extends V> a) {
791                  return f.thenCombineAsync(g, a, new ThreadExecutor());
792              }
595            public <T,U> CompletableFuture<U> applyToEither
596                (CompletableFuture<T> f,
597                 CompletionStage<? extends T> g,
598                 Function<? super T,U> a) {
599                return f.applyToEitherAsync(g, a, new ThreadExecutor());
600            }
601            public <T> CompletableFuture<Void> acceptEither
602                (CompletableFuture<T> f,
603                 CompletionStage<? extends T> g,
604                 Consumer<? super T> a) {
605                return f.acceptEitherAsync(g, a, new ThreadExecutor());
606            }
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 632 | Line 838 | public class CompletableFutureTest exten
838              (CompletableFuture<T> f,
839               CompletionStage<? extends U> g,
840               BiFunction<? super T,? super U,? extends V> a);
635        public abstract <T,U> CompletableFuture<U> applyToEither
636            (CompletableFuture<T> f,
637             CompletionStage<? extends T> g,
638             Function<? super T,U> a);
639        public abstract <T> CompletableFuture<Void> acceptEither
640            (CompletableFuture<T> f,
641             CompletionStage<? extends T> g,
642             Consumer<? super T> a);
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 <
654 <
655 <    }
656 <
657 <    /**
658 <     * exceptionally action completes with function value on source
659 <     * exception; otherwise with source value
660 <     */
661 <    public void testExceptionally() {
662 <        CompletableFuture<Integer> f = new CompletableFuture<>();
663 <        ExceptionToInteger r = new ExceptionToInteger();
664 <        CompletableFuture<Integer> g = f.exceptionally(r);
665 <        f.completeExceptionally(new CFException());
666 <        checkCompletedNormally(g, three);
667 <
668 <        f = new CompletableFuture<>();
669 <        r = new ExceptionToInteger();
670 <        g = f.exceptionally(r);
671 <        f.complete(one);
672 <        checkCompletedNormally(g, one);
851 >             CompletionStage<? extends T> g,
852 >             Function<? super T,U> a);
853      }
854  
855      /**
856 <     * handle action completes normally with function value on either
857 <     * normal or exceptional completion of source
856 >     * exceptionally action is not invoked when source completes
857 >     * normally, and source result is propagated
858       */
859 <    public void testHandle() {
860 <        CompletableFuture<Integer> f, g;
861 <        IntegerHandler r;
862 <
863 <        f = new CompletableFuture<>();
864 <        f.completeExceptionally(new CFException());
865 <        g = f.handle(r = new IntegerHandler());
866 <        assertTrue(r.ran);
867 <        checkCompletedNormally(g, three);
868 <
869 <        f = new CompletableFuture<>();
870 <        g = f.handle(r = new IntegerHandler());
871 <        assertFalse(r.ran);
872 <        f.completeExceptionally(new CFException());
693 <        checkCompletedNormally(g, three);
694 <        assertTrue(r.ran);
695 <
696 <        f = new CompletableFuture<>();
697 <        f.complete(one);
698 <        g = f.handle(r = new IntegerHandler());
699 <        assertTrue(r.ran);
700 <        checkCompletedNormally(g, two);
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 <        f = new CompletableFuture<>();
875 <        g = f.handle(r = new IntegerHandler());
876 <        assertFalse(r.ran);
877 <        f.complete(one);
706 <        assertTrue(r.ran);
707 <        checkCompletedNormally(g, two);
708 <    }
874 >        checkCompletedNormally(g, v1);
875 >        checkCompletedNormally(f, v1);
876 >        assertEquals(0, a.get());
877 >    }}
878  
879      /**
880 <     * runAsync completes after running Runnable
880 >     * exceptionally action completes with function value on source
881 >     * exception
882       */
883 <    public void testRunAsync() {
884 <        Noop r = new Noop();
885 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
886 <        assertNull(f.join());
887 <        assertTrue(r.ran);
888 <        checkCompletedNormally(f, null);
889 <    }
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 >        checkCompletedNormally(g, v1);
901 >        assertEquals(1, a.get());
902 >    }}
903 >
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 >        checkCompletedWithWrappedException(g, ex2);
923 >        assertEquals(1, a.get());
924 >    }}
925  
926      /**
927 <     * runAsync with executor completes after running Runnable
927 >     * whenComplete action executes on normal completion, propagating
928 >     * source result.
929       */
930 <    public void testRunAsync2() {
931 <        Noop r = new Noop();
932 <        ThreadExecutor exec = new ThreadExecutor();
933 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
934 <        assertNull(f.join());
935 <        assertTrue(r.ran);
936 <        checkCompletedNormally(f, null);
937 <        assertEquals(1, exec.count.get());
938 <    }
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 <    /**
949 <     * failing runAsync completes exceptionally after running Runnable
950 <     */
951 <    public void testRunAsync3() {
738 <        FailingNoop r = new FailingNoop();
739 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
740 <        checkCompletedWithWrappedCFException(f);
741 <        assertTrue(r.ran);
742 <    }
948 >        checkCompletedNormally(g, v1);
949 >        checkCompletedNormally(f, v1);
950 >        assertEquals(1, a.get());
951 >    }}
952  
953      /**
954 <     * supplyAsync completes with result of supplier
954 >     * whenComplete action executes on exceptional completion, propagating
955 >     * source result.
956       */
957 <    public void testSupplyAsync() {
958 <        CompletableFuture<Integer> f;
959 <        f = CompletableFuture.supplyAsync(supplyOne);
960 <        assertEquals(f.join(), one);
961 <        checkCompletedNormally(f, one);
962 <    }
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 >        checkCompletedWithWrappedException(g, ex);
977 >        checkCompletedExceptionally(f, ex);
978 >        assertEquals(1, a.get());
979 >    }}
980 >
981 >    /**
982 >     * whenComplete action executes on cancelled source, propagating
983 >     * CancellationException.
984 >     */
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  
1003 <    /**
1004 <     * supplyAsync with executor completes with result of supplier
1005 <     */
1006 <    public void testSupplyAsync2() {
758 <        CompletableFuture<Integer> f;
759 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
760 <        assertEquals(f.join(), one);
761 <        checkCompletedNormally(f, one);
762 <    }
1003 >        checkCompletedWithWrappedCancellationException(g);
1004 >        checkCancelled(f);
1005 >        assertEquals(1, a.get());
1006 >    }}
1007  
1008      /**
1009 <     * Failing supplyAsync completes exceptionally
1009 >     * If a whenComplete action throws an exception when triggered by
1010 >     * a normal completion, it completes exceptionally
1011       */
1012 <    public void testSupplyAsync3() {
1013 <        FailingSupplier r = new FailingSupplier();
1014 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1015 <        checkCompletedWithWrappedCFException(f);
1016 <        assertTrue(r.ran);
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 <    // seq completion methods
1032 >        checkCompletedWithWrappedException(g, ex);
1033 >        checkCompletedNormally(f, v1);
1034 >        assertEquals(1, a.get());
1035 >    }}
1036  
1037      /**
1038 <     * thenRun result completes normally after normal completion of source
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 testThenRun() {
1043 <        CompletableFuture<Integer> f;
1044 <        CompletableFuture<Void> g;
1045 <        Noop r;
1046 <
1047 <        f = new CompletableFuture<>();
1048 <        g = f.thenRun(r = new Noop());
1049 <        f.complete(null);
1050 <        checkCompletedNormally(g, null);
1051 <        assertTrue(r.ran);
1052 <
1053 <        f = new CompletableFuture<>();
1054 <        f.complete(null);
1055 <        g = f.thenRun(r = new Noop());
1056 <        checkCompletedNormally(g, null);
1057 <        assertTrue(r.ran);
1058 <    }
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 >        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 >        checkCompletedWithWrappedException(g, ex1);
1065 >        checkCompletedExceptionally(f, ex1);
1066 >        assertEquals(1, a.get());
1067 >    }}
1068  
1069      /**
1070 <     * thenRun result completes exceptionally after exceptional
1070 >     * handle action completes normally with function value on normal
1071       * completion of source
1072       */
1073 <    public void testThenRun2() {
1074 <        CompletableFuture<Integer> f;
1075 <        CompletableFuture<Void> g;
1076 <        Noop r;
1077 <
1078 <        f = new CompletableFuture<>();
1079 <        g = f.thenRun(r = new Noop());
1080 <        f.completeExceptionally(new CFException());
1081 <        checkCompletedWithWrappedCFException(g);
1082 <        assertFalse(r.ran);
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 >    {
1078 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
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 <        f = new CompletableFuture<>();
1093 <        f.completeExceptionally(new CFException());
1094 <        g = f.thenRun(r = new Noop());
1095 <        checkCompletedWithWrappedCFException(g);
816 <        assertFalse(r.ran);
817 <    }
1092 >        checkCompletedNormally(g, inc(v1));
1093 >        checkCompletedNormally(f, v1);
1094 >        assertEquals(1, a.get());
1095 >    }}
1096  
1097      /**
1098 <     * thenRun result completes exceptionally if action does
1098 >     * handle action completes normally with function value on
1099 >     * exceptional completion of source
1100       */
1101 <    public void testThenRun3() {
1102 <        CompletableFuture<Integer> f;
1103 <        CompletableFuture<Void> g;
1104 <        FailingNoop r;
1105 <
1106 <        f = new CompletableFuture<>();
1107 <        g = f.thenRun(r = new FailingNoop());
1108 <        f.complete(null);
1109 <        checkCompletedWithWrappedCFException(g);
1101 >    public void testHandle_exceptionalCompletion() {
1102 >        for (ExecutionMode m : ExecutionMode.values())
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 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  
1121 <        f = new CompletableFuture<>();
1122 <        f.complete(null);
1123 <        g = f.thenRun(r = new FailingNoop());
1124 <        checkCompletedWithWrappedCFException(g);
836 <    }
1121 >        checkCompletedNormally(g, v1);
1122 >        checkCompletedExceptionally(f, ex);
1123 >        assertEquals(1, a.get());
1124 >    }}
1125  
1126      /**
1127 <     * thenRun result completes exceptionally if source cancelled
1127 >     * handle action completes normally with function value on
1128 >     * cancelled source
1129       */
1130 <    public void testThenRun4() {
1131 <        CompletableFuture<Integer> f;
1132 <        CompletableFuture<Void> g;
1133 <        Noop r;
1134 <
1135 <        f = new CompletableFuture<>();
1136 <        g = f.thenRun(r = new Noop());
1137 <        assertTrue(f.cancel(true));
1138 <        checkCompletedWithWrappedCancellationException(g);
1139 <
1140 <        f = new CompletableFuture<>();
1141 <        assertTrue(f.cancel(true));
1142 <        g = f.thenRun(r = new Noop());
1143 <        checkCompletedWithWrappedCancellationException(g);
1144 <    }
1130 >    public void testHandle_sourceCancelled() {
1131 >        for (ExecutionMode m : ExecutionMode.values())
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 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 <    /**
1151 <     * thenApply result completes normally after normal completion of source
1152 <     */
1153 <    public void testThenApply() {
861 <        CompletableFuture<Integer> f = new CompletableFuture<>();
862 <        CompletableFuture<Integer> g = f.thenApply(inc);
863 <        f.complete(one);
864 <        checkCompletedNormally(g, two);
865 <    }
1150 >        checkCompletedNormally(g, v1);
1151 >        checkCancelled(f);
1152 >        assertEquals(1, a.get());
1153 >    }}
1154  
1155      /**
1156 <     * thenApply result completes exceptionally after exceptional
869 <     * completion of source
1156 >     * handle result completes exceptionally if action does
1157       */
1158 <    public void testThenApply2() {
1159 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1160 <        CompletableFuture<Integer> g = f.thenApply(inc);
1161 <        f.completeExceptionally(new CFException());
1162 <        checkCompletedWithWrappedCFException(g);
1163 <    }
1158 >    public void testHandle_sourceFailedActionFailed() {
1159 >        for (ExecutionMode m : ExecutionMode.values())
1160 >        for (boolean createIncomplete : new boolean[] { true, false })
1161 >    {
1162 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
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 >        checkCompletedWithWrappedException(g, ex2);
1179 >        checkCompletedExceptionally(f, ex1);
1180 >        assertEquals(1, a.get());
1181 >    }}
1182 >
1183 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1184 >        for (ExecutionMode m : ExecutionMode.values())
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 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 <    /**
1204 <     * thenApply result completes exceptionally if action does
1205 <     */
1206 <    public void testThenApply3() {
882 <        CompletableFuture<Integer> f = new CompletableFuture<>();
883 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
884 <        f.complete(one);
885 <        checkCompletedWithWrappedCFException(g);
886 <    }
1203 >        checkCompletedWithWrappedException(g, ex);
1204 >        checkCompletedNormally(f, v1);
1205 >        assertEquals(1, a.get());
1206 >    }}
1207  
1208      /**
1209 <     * thenApply result completes exceptionally if source cancelled
1209 >     * runAsync completes after running Runnable
1210       */
1211 <    public void testThenApply4() {
1212 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1213 <        CompletableFuture<Integer> g = f.thenApply(inc);
1214 <        assertTrue(f.cancel(true));
1215 <        checkCompletedWithWrappedCancellationException(g);
1216 <    }
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      /**
1226 <     * thenAccept result completes normally after normal completion of source
1226 >     * failing runAsync completes exceptionally after running Runnable
1227       */
1228 <    public void testThenAccept() {
1229 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1230 <        IncAction r = new IncAction();
1231 <        CompletableFuture<Void> g = f.thenAccept(r);
1232 <        f.complete(one);
1233 <        checkCompletedNormally(g, null);
1234 <        assertEquals(r.value, (Integer) 2);
1235 <    }
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      /**
1242 <     * thenAccept result completes exceptionally after exceptional
912 <     * completion of source
1242 >     * supplyAsync completes with result of supplier
1243       */
1244 <    public void testThenAccept2() {
1245 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1246 <        IncAction r = new IncAction();
1247 <        CompletableFuture<Void> g = f.thenAccept(r);
1248 <        f.completeExceptionally(new CFException());
1249 <        checkCompletedWithWrappedCFException(g);
1250 <    }
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 >    {
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 >        r.assertInvoked();
1257 >    }}
1258  
1259      /**
1260 <     * thenAccept result completes exceptionally if action does
1260 >     * Failing supplyAsync completes exceptionally
1261       */
1262 <    public void testThenAccept3() {
1263 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1264 <        FailingConsumer r = new FailingConsumer();
1265 <        CompletableFuture<Void> g = f.thenAccept(r);
1266 <        f.complete(one);
1267 <        checkCompletedWithWrappedCFException(g);
1268 <        assertTrue(r.ran);
1269 <    }
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 <    /**
935 <     * thenAccept result completes exceptionally if source cancelled
936 <     */
937 <    public void testThenAccept4() {
938 <        CompletableFuture<Integer> f = new CompletableFuture<>();
939 <        IncAction r = new IncAction();
940 <        CompletableFuture<Void> g = f.thenAccept(r);
941 <        assertTrue(f.cancel(true));
942 <        checkCompletedWithWrappedCancellationException(g);
943 <    }
1275 >    // seq completion methods
1276  
1277      /**
1278 <     * thenCombine result completes normally after normal completion
947 <     * of sources
1278 >     * thenRun result completes normally after normal completion of source
1279       */
1280 <    public void testThenCombine_normalCompletion1() {
1280 >    public void testThenRun_normalCompletion() {
1281          for (ExecutionMode m : ExecutionMode.values())
1282          for (Integer v1 : new Integer[] { 1, null })
1283 <        for (Integer v2 : new Integer[] { 2, null }) {
953 <
1283 >    {
1284          final CompletableFuture<Integer> f = new CompletableFuture<>();
1285 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1286 <        final SubtractFunction r = new SubtractFunction();
957 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
958 <
959 <        f.complete(v1);
960 <        checkIncomplete(h);
961 <        assertEquals(r.invocationCount, 0);
962 <        g.complete(v2);
1285 >        final Noop[] rs = new Noop[6];
1286 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1287  
1288 <        checkCompletedNormally(h, subtract(v1, v2));
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 <        checkCompletedNormally(g, v2);
1307 <        assertEquals(r.invocationCount, 1);
968 <        }
969 <    }
1306 >        for (Noop r : rs) r.assertInvoked();
1307 >    }}
1308  
1309 <    public void testThenCombine_normalCompletion2() {
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 (Integer v1 : new Integer[] { 1, null })
1316 <        for (Integer v2 : new Integer[] { 2, null }) {
975 <
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();
979 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1318 >        final Noop[] rs = new Noop[6];
1319 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1320  
1321 <        g.complete(v2);
1322 <        checkIncomplete(h);
1323 <        assertEquals(r.invocationCount, 0);
1324 <        f.complete(v1);
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 <        checkCompletedNormally(h, subtract(v1, v2));
1343 <        checkCompletedNormally(f, v1);
1344 <        checkCompletedNormally(g, v2);
1345 <        assertEquals(r.invocationCount, 1);
990 <        }
991 <    }
992 <
993 <    public void testThenCombine_normalCompletion3() {
1342 >    /**
1343 >     * thenRun result completes exceptionally if source cancelled
1344 >     */
1345 >    public void testThenRun_sourceCancelled() {
1346          for (ExecutionMode m : ExecutionMode.values())
1347 <        for (Integer v1 : new Integer[] { 1, null })
1348 <        for (Integer v2 : new Integer[] { 2, null }) {
997 <
1347 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1348 >    {
1349          final CompletableFuture<Integer> f = new CompletableFuture<>();
1350 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1351 <        final SubtractFunction r = new SubtractFunction();
1001 <
1002 <        g.complete(v2);
1003 <        f.complete(v1);
1004 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1350 >        final Noop[] rs = new Noop[6];
1351 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1352  
1353 <        checkCompletedNormally(h, subtract(v1, v2));
1354 <        checkCompletedNormally(f, v1);
1355 <        checkCompletedNormally(g, v2);
1356 <        assertEquals(r.invocationCount, 1);
1357 <        }
1358 <    }
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 >        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 >        for (Noop r : rs) r.assertNotInvoked();
1372 >    }}
1373  
1374 <    public void testThenCombine_normalCompletion4() {
1374 >    /**
1375 >     * thenRun result completes exceptionally if action does
1376 >     */
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 }) {
1017 <
1380 >    {
1381          final CompletableFuture<Integer> f = new CompletableFuture<>();
1382 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1383 <        final SubtractFunction r = new SubtractFunction();
1021 <
1022 <        f.complete(v1);
1023 <        g.complete(v2);
1024 <        final CompletableFuture<Integer> h = m.thenCombine(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 <        checkCompletedNormally(h, 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);
1029 <        assertEquals(r.invocationCount, 1);
1030 <        }
1031 <    }
1400 >    }}
1401  
1402      /**
1403 <     * thenCombine result completes exceptionally after exceptional
1035 <     * completion of either source
1403 >     * thenApply result completes normally after normal completion of source
1404       */
1405 <    public void testThenCombine_exceptionalCompletion1() {
1038 <        for (ExecutionMode m : ExecutionMode.values())
1039 <        for (Integer v1 : new Integer[] { 1, null }) {
1040 <
1041 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1042 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1043 <        final SubtractFunction r = new SubtractFunction();
1044 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1045 <        final CFException ex = new CFException();
1046 <
1047 <        f.completeExceptionally(ex);
1048 <        checkIncomplete(h);
1049 <        g.complete(v1);
1050 <
1051 <        checkCompletedWithWrappedCFException(h, ex);
1052 <        checkCompletedWithWrappedCFException(f, ex);
1053 <        assertEquals(r.invocationCount, 0);
1054 <        checkCompletedNormally(g, v1);
1055 <        }
1056 <    }
1057 <
1058 <    public void testThenCombine_exceptionalCompletion2() {
1405 >    public void testThenApply_normalCompletion() {
1406          for (ExecutionMode m : ExecutionMode.values())
1407 <        for (Integer v1 : new Integer[] { 1, null }) {
1408 <
1407 >        for (Integer v1 : new Integer[] { 1, null })
1408 >    {
1409          final CompletableFuture<Integer> f = new CompletableFuture<>();
1410 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1411 <        final SubtractFunction r = new SubtractFunction();
1065 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1066 <        final CFException ex = new CFException();
1410 >        final IncFunction[] rs = new IncFunction[4];
1411 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1412  
1413 <        g.completeExceptionally(ex);
1414 <        checkIncomplete(h);
1415 <        f.complete(v1);
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 <        checkCompletedWithWrappedCFException(h, ex);
1422 <        checkCompletedWithWrappedCFException(g, ex);
1423 <        assertEquals(r.invocationCount, 0);
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 <        }
1427 <    }
1426 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1427 >    }}
1428  
1429 <    public void testThenCombine_exceptionalCompletion3() {
1429 >    /**
1430 >     * thenApply result completes exceptionally after exceptional
1431 >     * completion of source
1432 >     */
1433 >    public void testThenApply_exceptionalCompletion() {
1434          for (ExecutionMode m : ExecutionMode.values())
1435 <        for (Integer v1 : new Integer[] { 1, null }) {
1082 <
1083 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1084 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1085 <        final SubtractFunction r = new SubtractFunction();
1435 >    {
1436          final CFException ex = new CFException();
1087
1088        g.completeExceptionally(ex);
1089        f.complete(v1);
1090        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1091
1092        checkCompletedWithWrappedCFException(h, ex);
1093        checkCompletedWithWrappedCFException(g, ex);
1094        assertEquals(r.invocationCount, 0);
1095        checkCompletedNormally(f, v1);
1096        }
1097    }
1098
1099    public void testThenCombine_exceptionalCompletion4() {
1100        for (ExecutionMode m : ExecutionMode.values())
1101        for (Integer v1 : new Integer[] { 1, null }) {
1102
1437          final CompletableFuture<Integer> f = new CompletableFuture<>();
1438 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1439 <        final SubtractFunction r = new SubtractFunction();
1106 <        final CFException ex = new CFException();
1107 <
1108 <        f.completeExceptionally(ex);
1109 <        g.complete(v1);
1110 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1438 >        final IncFunction[] rs = new IncFunction[4];
1439 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1440  
1441 <        checkCompletedWithWrappedCFException(h, ex);
1442 <        checkCompletedWithWrappedCFException(f, ex);
1443 <        assertEquals(r.invocationCount, 0);
1444 <        checkCompletedNormally(g, v1);
1445 <        }
1446 <    }
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      /**
1456 <     * thenCombine result completes exceptionally if action does
1456 >     * thenApply result completes exceptionally if source cancelled
1457       */
1458 <    public void testThenCombine_actionFailed1() {
1458 >    public void testThenApply_sourceCancelled() {
1459          for (ExecutionMode m : ExecutionMode.values())
1460 <        for (Integer v1 : new Integer[] { 1, null })
1461 <        for (Integer v2 : new Integer[] { 2, null }) {
1126 <
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 FailingBiFunction r = new FailingBiFunction();
1130 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1463 >        final IncFunction[] rs = new IncFunction[4];
1464 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1465  
1466 <        f.complete(v1);
1467 <        checkIncomplete(h);
1468 <        g.complete(v2);
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);
1473 <        checkCompletedNormally(f, v1);
1474 <        checkCompletedNormally(g, v2);
1475 <        }
1476 <    }
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 testThenCombine_actionFailed2() {
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1146 <
1486 >    {
1487          final CompletableFuture<Integer> f = new CompletableFuture<>();
1488 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1489 <        final FailingBiFunction r = new FailingBiFunction();
1150 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1488 >        final FailingFunction[] rs = new FailingFunction[4];
1489 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1490  
1491 <        g.complete(v2);
1492 <        checkIncomplete(h);
1493 <        f.complete(v1);
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);
1497 >        checkCompletedWithWrappedCFException(h0);
1498 >        checkCompletedWithWrappedCFException(h1);
1499 >        checkCompletedWithWrappedCFException(h2);
1500 >        checkCompletedWithWrappedCFException(h3);
1501          checkCompletedNormally(f, v1);
1502 <        checkCompletedNormally(g, v2);
1159 <        }
1160 <    }
1502 >    }}
1503  
1504      /**
1505 <     * thenCombine result completes exceptionally if either source cancelled
1505 >     * thenAccept result completes normally after normal completion of source
1506       */
1507 <    public void testThenCombine_sourceCancelled1() {
1507 >    public void testThenAccept_normalCompletion() {
1508          for (ExecutionMode m : ExecutionMode.values())
1509 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1510 <        for (Integer v1 : new Integer[] { 1, null }) {
1169 <
1170 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1171 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1172 <        final SubtractFunction r = new SubtractFunction();
1173 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1174 <
1175 <        assertTrue(f.cancel(mayInterruptIfRunning));
1176 <        checkIncomplete(h);
1177 <        g.complete(v1);
1178 <
1179 <        checkCompletedWithWrappedCancellationException(h);
1180 <        checkCancelled(f);
1181 <        assertEquals(r.invocationCount, 0);
1182 <        checkCompletedNormally(g, v1);
1183 <        }
1184 <    }
1185 <
1186 <    public void testThenCombine_sourceCancelled2() {
1187 <        for (ExecutionMode m : ExecutionMode.values())
1188 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1189 <        for (Integer v1 : new Integer[] { 1, null }) {
1190 <
1509 >        for (Integer v1 : new Integer[] { 1, null })
1510 >    {
1511          final CompletableFuture<Integer> f = new CompletableFuture<>();
1512 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1513 <        final SubtractFunction r = new SubtractFunction();
1194 <        final CompletableFuture<Integer> h = m.thenCombine(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 <        assertTrue(g.cancel(mayInterruptIfRunning));
1516 <        checkIncomplete(h);
1517 <        f.complete(v1);
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 <        checkCompletedWithWrappedCancellationException(h);
1524 <        checkCancelled(g);
1525 <        assertEquals(r.invocationCount, 0);
1523 >        checkCompletedNormally(h0, null);
1524 >        checkCompletedNormally(h1, null);
1525 >        checkCompletedNormally(h2, null);
1526 >        checkCompletedNormally(h3, null);
1527          checkCompletedNormally(f, v1);
1528 <        }
1529 <    }
1528 >        for (NoopConsumer r : rs) r.assertValue(v1);
1529 >    }}
1530  
1531 <    public void testThenCombine_sourceCancelled3() {
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 (boolean mayInterruptIfRunning : new boolean[] { true, false })
1538 <        for (Integer v1 : new Integer[] { 1, null }) {
1211 <
1537 >    {
1538 >        final CFException ex = new CFException();
1539          final CompletableFuture<Integer> f = new CompletableFuture<>();
1540 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1541 <        final SubtractFunction r = new SubtractFunction();
1540 >        final NoopConsumer[] rs = new NoopConsumer[4];
1541 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1542  
1543 <        assertTrue(g.cancel(mayInterruptIfRunning));
1544 <        f.complete(v1);
1545 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        checkCompletedWithWrappedCancellationException(h);
1558 <        checkCancelled(g);
1559 <        assertEquals(r.invocationCount, 0);
1560 <        checkCompletedNormally(f, v1);
1224 <        }
1225 <    }
1226 <
1227 <    public void testThenCombine_sourceCancelled4() {
1557 >    /**
1558 >     * thenAccept result completes exceptionally if source cancelled
1559 >     */
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 }) {
1231 <
1563 >    {
1564          final CompletableFuture<Integer> f = new CompletableFuture<>();
1565 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1566 <        final SubtractFunction r = new SubtractFunction();
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 <        g.complete(v1);
1572 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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(r.invocationCount, 0);
1580 <        checkCompletedNormally(g, v1);
1244 <        }
1245 <    }
1579 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1580 >    }}
1581  
1582      /**
1583 <     * thenAcceptBoth result completes normally after normal
1249 <     * completion of sources
1583 >     * thenAccept result completes exceptionally if action does
1584       */
1585 <    public void testThenAcceptBoth_normalCompletion1() {
1585 >    public void testThenAccept_actionFailed() {
1586          for (ExecutionMode m : ExecutionMode.values())
1587          for (Integer v1 : new Integer[] { 1, null })
1588 <        for (Integer v2 : new Integer[] { 2, null }) {
1255 <
1588 >    {
1589          final CompletableFuture<Integer> f = new CompletableFuture<>();
1590 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1591 <        final SubtractAction r = new SubtractAction();
1259 <        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 <        f.complete(v1);
1594 <        checkIncomplete(h);
1595 <        assertFalse(r.ran());
1596 <        g.complete(v2);
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 <        checkCompletedNormally(h, null);
1600 <        assertEquals(r.value, subtract(v1, v2));
1599 >        checkCompletedWithWrappedCFException(h0);
1600 >        checkCompletedWithWrappedCFException(h1);
1601 >        checkCompletedWithWrappedCFException(h2);
1602 >        checkCompletedWithWrappedCFException(h3);
1603          checkCompletedNormally(f, v1);
1604 <        checkCompletedNormally(g, v2);
1270 <        }
1271 <    }
1604 >    }}
1605  
1606 <    public void testThenAcceptBoth_normalCompletion2() {
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 fFirst : new boolean[] { true, false })
1613          for (Integer v1 : new Integer[] { 1, null })
1614 <        for (Integer v2 : new Integer[] { 2, null }) {
1615 <
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();
1619 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1618 >        final SubtractFunction[] rs = new SubtractFunction[6];
1619 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1620 >
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  
1283        g.complete(v2);
1284        checkIncomplete(h);
1285        assertFalse(r.ran());
1286        f.complete(v1);
1287
1288        checkCompletedNormally(h, null);
1289        assertEquals(r.value, subtract(v1, v2));
1647          checkCompletedNormally(f, v1);
1648          checkCompletedNormally(g, v2);
1649 <        }
1293 <    }
1649 >    }}
1650  
1651 <    public void testThenAcceptBoth_normalCompletion3() {
1651 >    /**
1652 >     * thenCombine result completes exceptionally after exceptional
1653 >     * completion of either source
1654 >     */
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 }) {
1299 <
1660 >    {
1661          final CompletableFuture<Integer> f = new CompletableFuture<>();
1662          final CompletableFuture<Integer> g = new CompletableFuture<>();
1663 <        final SubtractAction r = new SubtractAction();
1664 <
1665 <        g.complete(v2);
1666 <        f.complete(v1);
1667 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1668 <
1669 <        checkCompletedNormally(h, null);
1670 <        assertEquals(r.value, subtract(v1, v2));
1671 <        checkCompletedNormally(f, v1);
1672 <        checkCompletedNormally(g, v2);
1673 <        }
1674 <    }
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 testThenAcceptBoth_normalCompletion4() {
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 }) {
1319 <
1704 >    {
1705          final CompletableFuture<Integer> f = new CompletableFuture<>();
1706          final CompletableFuture<Integer> g = new CompletableFuture<>();
1707 <        final SubtractAction r = new SubtractAction();
1708 <
1709 <        f.complete(v1);
1710 <        g.complete(v2);
1711 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1712 <
1713 <        checkCompletedNormally(h, null);
1714 <        assertEquals(r.value, subtract(v1, v2));
1715 <        checkCompletedNormally(f, v1);
1716 <        checkCompletedNormally(g, v2);
1717 <        }
1718 <    }
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      /**
1739 <     * thenAcceptBoth result completes exceptionally after exceptional
1337 <     * completion of either source
1739 >     * thenCombine result completes exceptionally if action does
1740       */
1741 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1340 <        for (ExecutionMode m : ExecutionMode.values())
1341 <        for (Integer v1 : new Integer[] { 1, null }) {
1342 <
1343 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1344 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1345 <        final SubtractAction r = new SubtractAction();
1346 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1347 <        final CFException ex = new CFException();
1348 <
1349 <        f.completeExceptionally(ex);
1350 <        checkIncomplete(h);
1351 <        g.complete(v1);
1352 <
1353 <        checkCompletedWithWrappedCFException(h, ex);
1354 <        checkCompletedWithWrappedCFException(f, ex);
1355 <        assertEquals(r.invocationCount, 0);
1356 <        checkCompletedNormally(g, v1);
1357 <        }
1358 <    }
1359 <
1360 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1741 >    public void testThenCombine_actionFailed() {
1742          for (ExecutionMode m : ExecutionMode.values())
1743 <        for (Integer v1 : new Integer[] { 1, null }) {
1744 <
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 >    {
1747          final CompletableFuture<Integer> f = new CompletableFuture<>();
1748          final CompletableFuture<Integer> g = new CompletableFuture<>();
1749 <        final SubtractAction r = new SubtractAction();
1750 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1751 <        final CFException ex = new CFException();
1369 <
1370 <        g.completeExceptionally(ex);
1371 <        checkIncomplete(h);
1372 <        f.complete(v1);
1749 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1750 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1751 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1752  
1753 <        checkCompletedWithWrappedCFException(h, ex);
1754 <        checkCompletedWithWrappedCFException(g, ex);
1755 <        assertEquals(r.invocationCount, 0);
1756 <        checkCompletedNormally(f, v1);
1378 <        }
1379 <    }
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 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1759 <        for (ExecutionMode m : ExecutionMode.values())
1760 <        for (Integer v1 : new Integer[] { 1, null }) {
1761 <
1762 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1386 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1387 <        final SubtractAction r = new SubtractAction();
1388 <        final CFException ex = new CFException();
1389 <
1390 <        g.completeExceptionally(ex);
1391 <        f.complete(v1);
1392 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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(h, ex);
1765 <        checkCompletedWithWrappedCFException(g, ex);
1766 <        assertEquals(r.invocationCount, 0);
1764 >        checkCompletedWithWrappedCFException(h1);
1765 >        checkCompletedWithWrappedCFException(h2);
1766 >        checkCompletedWithWrappedCFException(h3);
1767 >        r1.assertInvoked();
1768 >        r2.assertInvoked();
1769 >        r3.assertInvoked();
1770          checkCompletedNormally(f, v1);
1771 <        }
1772 <    }
1400 <
1401 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1402 <        for (ExecutionMode m : ExecutionMode.values())
1403 <        for (Integer v1 : new Integer[] { 1, null }) {
1404 <
1405 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1406 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1407 <        final SubtractAction r = new SubtractAction();
1408 <        final CFException ex = new CFException();
1409 <
1410 <        f.completeExceptionally(ex);
1411 <        g.complete(v1);
1412 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1413 <
1414 <        checkCompletedWithWrappedCFException(h, ex);
1415 <        checkCompletedWithWrappedCFException(f, ex);
1416 <        assertFalse(r.ran());
1417 <        checkCompletedNormally(g, v1);
1418 <        }
1419 <    }
1771 >        checkCompletedNormally(g, v2);
1772 >    }}
1773  
1774      /**
1775 <     * thenAcceptBoth result completes exceptionally if action does
1775 >     * thenAcceptBoth result completes normally after normal
1776 >     * completion of sources
1777       */
1778 <    public void testThenAcceptBoth_actionFailed1() {
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 FailingBiConsumer r = new FailingBiConsumer();
1787 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1788 <
1789 <        f.complete(v1);
1790 <        checkIncomplete(h);
1791 <        g.complete(v2);
1792 <
1793 <        checkCompletedWithWrappedCFException(h);
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 <        }
1442 <    }
1813 >    }}
1814  
1815 <    public void testThenAcceptBoth_actionFailed2() {
1815 >    /**
1816 >     * thenAcceptBoth result completes exceptionally after exceptional
1817 >     * completion of either source
1818 >     */
1819 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1820          for (ExecutionMode m : ExecutionMode.values())
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1448 <
1824 >    {
1825          final CompletableFuture<Integer> f = new CompletableFuture<>();
1826          final CompletableFuture<Integer> g = new CompletableFuture<>();
1827 <        final FailingBiConsumer r = new FailingBiConsumer();
1828 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1829 <
1830 <        g.complete(v2);
1831 <        checkIncomplete(h);
1832 <        f.complete(v1);
1833 <
1834 <        checkCompletedWithWrappedCFException(h);
1835 <        checkCompletedNormally(f, v1);
1836 <        checkCompletedNormally(g, v2);
1837 <        }
1838 <    }
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      /**
1860       * thenAcceptBoth result completes exceptionally if either source cancelled
1861       */
1862 <    public void testThenAcceptBoth_sourceCancelled1() {
1468 <        for (ExecutionMode m : ExecutionMode.values())
1469 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1470 <        for (Integer v1 : new Integer[] { 1, null }) {
1471 <
1472 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1473 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1474 <        final SubtractAction r = new SubtractAction();
1475 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1476 <
1477 <        assertTrue(f.cancel(mayInterruptIfRunning));
1478 <        checkIncomplete(h);
1479 <        g.complete(v1);
1480 <
1481 <        checkCompletedWithWrappedCancellationException(h);
1482 <        checkCancelled(f);
1483 <        assertEquals(r.invocationCount, 0);
1484 <        checkCompletedNormally(g, v1);
1485 <        }
1486 <    }
1487 <
1488 <    public void testThenAcceptBoth_sourceCancelled2() {
1489 <        for (ExecutionMode m : ExecutionMode.values())
1490 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1491 <        for (Integer v1 : new Integer[] { 1, null }) {
1492 <
1493 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1494 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1495 <        final SubtractAction r = new SubtractAction();
1496 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1497 <
1498 <        assertTrue(g.cancel(mayInterruptIfRunning));
1499 <        checkIncomplete(h);
1500 <        f.complete(v1);
1501 <
1502 <        checkCompletedWithWrappedCancellationException(h);
1503 <        checkCancelled(g);
1504 <        assertEquals(r.invocationCount, 0);
1505 <        checkCompletedNormally(f, v1);
1506 <        }
1507 <    }
1508 <
1509 <    public void testThenAcceptBoth_sourceCancelled3() {
1510 <        for (ExecutionMode m : ExecutionMode.values())
1511 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1512 <        for (Integer v1 : new Integer[] { 1, null }) {
1513 <
1514 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1515 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1516 <        final SubtractAction r = new SubtractAction();
1517 <
1518 <        assertTrue(g.cancel(mayInterruptIfRunning));
1519 <        f.complete(v1);
1520 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1521 <
1522 <        checkCompletedWithWrappedCancellationException(h);
1523 <        checkCancelled(g);
1524 <        assertEquals(r.invocationCount, 0);
1525 <        checkCompletedNormally(f, v1);
1526 <        }
1527 <    }
1528 <
1529 <    public void testThenAcceptBoth_sourceCancelled4() {
1862 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1863          for (ExecutionMode m : ExecutionMode.values())
1864          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1865 <        for (Integer v1 : new Integer[] { 1, null }) {
1866 <
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 SubtractAction r = new SubtractAction();
1872 <
1873 <        assertTrue(f.cancel(mayInterruptIfRunning));
1874 <        g.complete(v1);
1875 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1876 <
1877 <        checkCompletedWithWrappedCancellationException(h);
1878 <        checkCancelled(f);
1879 <        assertEquals(r.invocationCount, 0);
1880 <        checkCompletedNormally(g, v1);
1881 <        }
1882 <    }
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 normally after normal
1551 <     * completion of sources
1903 >     * thenAcceptBoth result completes exceptionally if action does
1904       */
1905 <    public void testRunAfterBoth_normalCompletion1() {
1554 <        for (ExecutionMode m : ExecutionMode.values())
1555 <        for (Integer v1 : new Integer[] { 1, null })
1556 <        for (Integer v2 : new Integer[] { 2, null }) {
1557 <
1558 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1559 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1560 <        final Noop r = new Noop();
1561 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1562 <
1563 <        f.complete(v1);
1564 <        checkIncomplete(h);
1565 <        assertFalse(r.ran);
1566 <        g.complete(v2);
1567 <
1568 <        checkCompletedNormally(h, null);
1569 <        assertEquals(r.invocationCount, 1);
1570 <        checkCompletedNormally(f, v1);
1571 <        checkCompletedNormally(g, v2);
1572 <        }
1573 <    }
1574 <
1575 <    public void testRunAfterBoth_normalCompletion2() {
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 Noop r = new Noop();
1914 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1913 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1914 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1915 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1916  
1917 <        g.complete(v2);
1918 <        checkIncomplete(h);
1919 <        assertFalse(r.ran);
1920 <        f.complete(v1);
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 <        checkCompletedNormally(h, null);
1923 <        assertEquals(r.invocationCount, 1);
1924 <        checkCompletedNormally(f, v1);
1925 <        checkCompletedNormally(g, v2);
1926 <        }
1595 <    }
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 <    public void testRunAfterBoth_normalCompletion3() {
1929 <        for (ExecutionMode m : ExecutionMode.values())
1930 <        for (Integer v1 : new Integer[] { 1, null })
1931 <        for (Integer v2 : new Integer[] { 2, null }) {
1932 <
1933 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1603 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1604 <        final Noop r = new Noop();
1605 <
1606 <        g.complete(v2);
1607 <        f.complete(v1);
1608 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1609 <
1610 <        checkCompletedNormally(h, null);
1611 <        assertTrue(r.ran);
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 <        }
1615 <    }
1936 >    }}
1937  
1938 <    public void testRunAfterBoth_normalCompletion4() {
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 Noop r = new Noop();
1951 <
1952 <        f.complete(v1);
1953 <        g.complete(v2);
1954 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1955 <
1956 <        checkCompletedNormally(h, null);
1957 <        assertEquals(r.invocationCount, 1);
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 <        }
1635 <    }
1977 >    }}
1978  
1979      /**
1980       * runAfterBoth result completes exceptionally after exceptional
1981       * completion of either source
1982       */
1983 <    public void testRunAfterBoth_exceptionalCompletion1() {
1642 <        for (ExecutionMode m : ExecutionMode.values())
1643 <        for (Integer v1 : new Integer[] { 1, null }) {
1644 <
1645 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1646 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1647 <        final Noop r = new Noop();
1648 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1649 <        final CFException ex = new CFException();
1650 <
1651 <        f.completeExceptionally(ex);
1652 <        checkIncomplete(h);
1653 <        g.complete(v1);
1654 <
1655 <        checkCompletedWithWrappedCFException(h, ex);
1656 <        checkCompletedWithWrappedCFException(f, ex);
1657 <        assertEquals(r.invocationCount, 0);
1658 <        checkCompletedNormally(g, v1);
1659 <        }
1660 <    }
1661 <
1662 <    public void testRunAfterBoth_exceptionalCompletion2() {
1663 <        for (ExecutionMode m : ExecutionMode.values())
1664 <        for (Integer v1 : new Integer[] { 1, null }) {
1665 <
1666 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1667 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 <        final Noop r = new Noop();
1669 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670 <        final CFException ex = new CFException();
1671 <
1672 <        g.completeExceptionally(ex);
1673 <        checkIncomplete(h);
1674 <        f.complete(v1);
1675 <
1676 <        checkCompletedWithWrappedCFException(h, ex);
1677 <        checkCompletedWithWrappedCFException(g, ex);
1678 <        assertEquals(r.invocationCount, 0);
1679 <        checkCompletedNormally(f, v1);
1680 <        }
1681 <    }
1682 <
1683 <    public void testRunAfterBoth_exceptionalCompletion3() {
1983 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1984          for (ExecutionMode m : ExecutionMode.values())
1985 <        for (Integer v1 : new Integer[] { 1, null }) {
1986 <
1987 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1988 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1689 <        final Noop r = new Noop();
1690 <        final CFException ex = new CFException();
1691 <
1692 <        g.completeExceptionally(ex);
1693 <        f.complete(v1);
1694 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1695 <
1696 <        checkCompletedWithWrappedCFException(h, ex);
1697 <        checkCompletedWithWrappedCFException(g, ex);
1698 <        assertEquals(r.invocationCount, 0);
1699 <        checkCompletedNormally(f, v1);
1700 <        }
1701 <    }
1702 <
1703 <    public void testRunAfterBoth_exceptionalCompletion4() {
1704 <        for (ExecutionMode m : ExecutionMode.values())
1705 <        for (Integer v1 : new Integer[] { 1, null }) {
1706 <
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<>();
1709        final Noop r = new Noop();
1991          final CFException ex = new CFException();
1992 <
1993 <        f.completeExceptionally(ex);
1994 <        g.complete(v1);
1995 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1996 <
1997 <        checkCompletedWithWrappedCFException(h, ex);
1998 <        checkCompletedWithWrappedCFException(f, ex);
1999 <        assertEquals(r.invocationCount, 0);
2000 <        checkCompletedNormally(g, v1);
2001 <        }
2002 <    }
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      /**
2024 <     * runAfterBoth result completes exceptionally if action does
2024 >     * runAfterBoth result completes exceptionally if either source cancelled
2025       */
2026 <    public void testRunAfterBoth_actionFailed1() {
2026 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2027          for (ExecutionMode m : ExecutionMode.values())
2028 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1730 <
2032 >    {
2033          final CompletableFuture<Integer> f = new CompletableFuture<>();
2034          final CompletableFuture<Integer> g = new CompletableFuture<>();
2035 <        final FailingNoop r = new FailingNoop();
2036 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2037 <
2038 <        f.complete(v1);
2039 <        checkIncomplete(h);
2040 <        g.complete(v2);
2041 <
2042 <        checkCompletedWithWrappedCFException(h);
2043 <        checkCompletedNormally(f, v1);
2044 <        checkCompletedNormally(g, v2);
2045 <        }
2046 <    }
2047 <
2048 <    public void testRunAfterBoth_actionFailed2() {
2049 <        for (ExecutionMode m : ExecutionMode.values())
2050 <        for (Integer v1 : new Integer[] { 1, null })
2051 <        for (Integer v2 : new Integer[] { 2, null }) {
2052 <
2053 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2054 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2055 <        final FailingNoop r = new FailingNoop();
2056 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2057 <
2058 <        g.complete(v2);
2059 <        checkIncomplete(h);
2060 <        f.complete(v1);
2061 <
2062 <        checkCompletedWithWrappedCFException(h);
2063 <        checkCompletedNormally(f, v1);
2064 <        checkCompletedNormally(g, v2);
1763 <        }
1764 <    }
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      /**
2067 <     * runAfterBoth result completes exceptionally if either source cancelled
2067 >     * runAfterBoth result completes exceptionally if action does
2068       */
2069 <    public void testRunAfterBoth_sourceCancelled1() {
1770 <        for (ExecutionMode m : ExecutionMode.values())
1771 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1772 <        for (Integer v1 : new Integer[] { 1, null }) {
1773 <
1774 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1775 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1776 <        final Noop r = new Noop();
1777 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1778 <
1779 <        assertTrue(f.cancel(mayInterruptIfRunning));
1780 <        checkIncomplete(h);
1781 <        g.complete(v1);
1782 <
1783 <        checkCompletedWithWrappedCancellationException(h);
1784 <        checkCancelled(f);
1785 <        assertEquals(r.invocationCount, 0);
1786 <        checkCompletedNormally(g, v1);
1787 <        }
1788 <    }
1789 <
1790 <    public void testRunAfterBoth_sourceCancelled2() {
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 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2077 >        final FailingRunnable r1 = new FailingRunnable(m);
2078 >        final FailingRunnable r2 = new FailingRunnable(m);
2079 >        final FailingRunnable r3 = new FailingRunnable(m);
2080  
2081 <        assertTrue(g.cancel(mayInterruptIfRunning));
2082 <        checkIncomplete(h);
2083 <        f.complete(v1);
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 <        checkCompletedWithWrappedCancellationException(h);
2087 <        checkCancelled(g);
2088 <        assertEquals(r.invocationCount, 0);
2089 <        checkCompletedNormally(f, v1);
2090 <        }
1809 <    }
1810 <
1811 <    public void testRunAfterBoth_sourceCancelled3() {
1812 <        for (ExecutionMode m : ExecutionMode.values())
1813 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1814 <        for (Integer v1 : new Integer[] { 1, null }) {
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 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2093 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2094 <        final Noop r = new Noop();
2095 <
2096 <        assertTrue(g.cancel(mayInterruptIfRunning));
2097 <        f.complete(v1);
1822 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1823 <
1824 <        checkCompletedWithWrappedCancellationException(h);
1825 <        checkCancelled(g);
1826 <        assertEquals(r.invocationCount, 0);
2092 >        checkCompletedWithWrappedCFException(h1);
2093 >        checkCompletedWithWrappedCFException(h2);
2094 >        checkCompletedWithWrappedCFException(h3);
2095 >        r1.assertInvoked();
2096 >        r2.assertInvoked();
2097 >        r3.assertInvoked();
2098          checkCompletedNormally(f, v1);
2099 <        }
2100 <    }
1830 <
1831 <    public void testRunAfterBoth_sourceCancelled4() {
1832 <        for (ExecutionMode m : ExecutionMode.values())
1833 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1834 <        for (Integer v1 : new Integer[] { 1, null }) {
1835 <
1836 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1837 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1838 <        final Noop r = new Noop();
1839 <
1840 <        assertTrue(f.cancel(mayInterruptIfRunning));
1841 <        g.complete(v1);
1842 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1843 <
1844 <        checkCompletedWithWrappedCancellationException(h);
1845 <        checkCancelled(f);
1846 <        assertEquals(r.invocationCount, 0);
1847 <        checkCompletedNormally(g, v1);
1848 <        }
1849 <    }
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));
2124 <        g.complete(v2);
2125 <
2126 <        checkCompletedNormally(f, v1);
2127 <        checkCompletedNormally(g, v2);
2128 <        checkCompletedNormally(h, inc(v1));
1872 <        }
1873 <    }
1874 <
1875 <    public void testApplyToEither_normalCompletion2() {
1876 <        for (ExecutionMode m : ExecutionMode.values())
1877 <        for (Integer v1 : new Integer[] { 1, null })
1878 <        for (Integer v2 : new Integer[] { 2, null }) {
1879 <
1880 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1881 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1882 <        final IncFunction r = new IncFunction();
1883 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1884 <
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);
1886        checkCompletedNormally(h, inc(v2));
1887        f.complete(v1);
2130  
2131 <        checkCompletedNormally(f, v1);
2132 <        checkCompletedNormally(g, v2);
2133 <        checkCompletedNormally(h, inc(v2));
2134 <        }
2135 <    }
2136 <    public void testApplyToEither_normalCompletion3() {
2137 <        for (ExecutionMode m : ExecutionMode.values())
2138 <        for (Integer v1 : new Integer[] { 1, null })
2139 <        for (Integer v2 : new Integer[] { 2, null }) {
1898 <
1899 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1900 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1901 <        final IncFunction r = new IncFunction();
1902 <
1903 <        f.complete(v1);
1904 <        g.complete(v2);
1905 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <
2144 <        // unspecified behavior
2145 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2146 <                   Objects.equals(h.join(), inc(v2)));
2147 <        assertEquals(r.invocationCount, 1);
2148 <        }
1915 <    }
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<>();
1927        final IncFunction r = new IncFunction();
1928        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(r.invocationCount, 0);
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())
1944 <        for (Integer v1 : new Integer[] { 1, null }) {
1945 <
1946 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1947 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1948 <        final IncFunction r = new IncFunction();
1949 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1950 <        final CFException ex = new CFException();
1951 <
1952 <        g.completeExceptionally(ex);
1953 <        checkCompletedWithWrappedCFException(h, ex);
1954 <        f.complete(v1);
1955 <
1956 <        assertEquals(r.invocationCount, 0);
1957 <        checkCompletedNormally(f, v1);
1958 <        checkCompletedWithWrappedCFException(g, ex);
1959 <        checkCompletedWithWrappedCFException(h, ex);
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          }
1961    }
1962
1963    public void testApplyToEither_exceptionalCompletion3() {
1964        for (ExecutionMode m : ExecutionMode.values())
1965        for (Integer v1 : new Integer[] { 1, null }) {
1966
1967        final CompletableFuture<Integer> f = new CompletableFuture<>();
1968        final CompletableFuture<Integer> g = new CompletableFuture<>();
1969        final IncFunction r = new IncFunction();
1970        final CFException ex = new CFException();
1971
1972        g.completeExceptionally(ex);
1973        f.complete(v1);
1974        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1975
1976        // unspecified behavior
1977        Integer v;
2189          try {
2190 <            assertEquals(h.join(), inc(v1));
2191 <            assertEquals(r.invocationCount, 1);
2190 >            assertEquals(inc(v1), h5.join());
2191 >            rs[5].assertValue(inc(v1));
2192          } catch (CompletionException ok) {
2193 <            checkCompletedWithWrappedCFException(h, ex);
2194 <            assertEquals(r.invocationCount, 0);
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<>();
1997        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
2005 <        Integer v;
2225 >        // unspecified behavior - both source completions available
2226          try {
2227 <            assertEquals(h.join(), inc(v1));
2228 <            assertEquals(r.invocationCount, 1);
2227 >            assertEquals(inc(v1), h0.join());
2228 >            rs[0].assertValue(inc(v1));
2229          } catch (CompletionException ok) {
2230 <            checkCompletedWithWrappedCFException(h, ex);
2231 <            assertEquals(r.invocationCount, 0);
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();
2030 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2031 <
2032 <        f.complete(v1);
2033 <        checkCompletedWithWrappedCFException(h);
2034 <        g.complete(v2);
2035 <        checkCompletedNormally(f, v1);
2036 <        checkCompletedNormally(g, v2);
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          }
2038    }
2039
2040    public void testApplyToEither_actionFailed2() {
2041        for (ExecutionMode m : ExecutionMode.values())
2042        for (Integer v1 : new Integer[] { 1, null })
2043        for (Integer v2 : new Integer[] { 2, null }) {
2044
2045        final CompletableFuture<Integer> f = new CompletableFuture<>();
2046        final CompletableFuture<Integer> g = new CompletableFuture<>();
2047        final FailingFunction r = new FailingFunction();
2048        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2254  
2050        g.complete(v2);
2051        checkCompletedWithWrappedCFException(h);
2052        f.complete(v1);
2255          checkCompletedNormally(f, v1);
2256 <        checkCompletedNormally(g, v2);
2257 <        }
2056 <    }
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);
2076        assertEquals(r.invocationCount, 0);
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(r.invocationCount, 0);
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          }
2101    }
2102
2103    public void testApplyToEither_sourceCancelled3() {
2104        for (ExecutionMode m : ExecutionMode.values())
2105        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2106        for (Integer v1 : new Integer[] { 1, null }) {
2107
2108        final CompletableFuture<Integer> f = new CompletableFuture<>();
2109        final CompletableFuture<Integer> g = new CompletableFuture<>();
2110        final IncFunction r = new IncFunction();
2111
2112        assertTrue(g.cancel(mayInterruptIfRunning));
2113        f.complete(v1);
2114        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2115
2116        // unspecified behavior
2117        Integer v;
2340          try {
2341 <            assertEquals(h.join(), inc(v1));
2342 <            assertEquals(r.invocationCount, 1);
2341 >            assertEquals(inc(v1), h1.join());
2342 >            rs[1].assertValue(inc(v1));
2343          } catch (CompletionException ok) {
2344 <            checkCompletedWithWrappedCancellationException(h);
2345 <            assertEquals(r.invocationCount, 0);
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          }
2129    }
2130
2131    public void testApplyToEither_sourceCancelled4() {
2132        for (ExecutionMode m : ExecutionMode.values())
2133        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2134        for (Integer v1 : new Integer[] { 1, null }) {
2135
2136        final CompletableFuture<Integer> f = new CompletableFuture<>();
2137        final CompletableFuture<Integer> g = new CompletableFuture<>();
2138        final IncFunction r = new IncFunction();
2139
2140        assertTrue(f.cancel(mayInterruptIfRunning));
2141        g.complete(v1);
2142        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2143
2144        // unspecified behavior
2145        Integer v;
2354          try {
2355 <            assertEquals(h.join(), inc(v1));
2356 <            assertEquals(r.invocationCount, 1);
2355 >            assertEquals(inc(v1), h3.join());
2356 >            rs[3].assertValue(inc(v1));
2357          } catch (CompletionException ok) {
2358 <            checkCompletedWithWrappedCancellationException(h);
2359 <            assertEquals(r.invocationCount, 0);
2358 >            checkCompletedWithWrappedCancellationException(h3);
2359 >            rs[3].assertNotInvoked();
2360          }
2361  
2362 <        checkCancelled(f);
2363 <        checkCompletedNormally(g, v1);
2364 <        }
2157 <    }
2362 >        checkCompletedNormally(f, v1);
2363 >        checkCancelled(g);
2364 >    }}
2365  
2366      /**
2367 <     * acceptEither result completes normally after normal completion
2161 <     * 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));
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          g.complete(v2);
2391  
2392 <        checkCompletedNormally(f, v1);
2393 <        checkCompletedNormally(g, v2);
2394 <        checkCompletedNormally(h, null);
2181 <        }
2182 <    }
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 <    public void testAcceptEither_normalCompletion2() {
2397 <        for (ExecutionMode m : ExecutionMode.values())
2398 <        for (Integer v1 : new Integer[] { 1, null })
2399 <        for (Integer v2 : new Integer[] { 2, null }) {
2400 <
2401 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2190 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2191 <        final IncAction r = new IncAction();
2192 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2193 <
2194 <        g.complete(v2);
2195 <        checkCompletedNormally(h, null);
2196 <        assertEquals(r.value, inc(v2));
2197 <        f.complete(v1);
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();
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  
2213        f.complete(v1);
2214        g.complete(v2);
2215        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2216
2217        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<>();
2237        final IncAction r = new IncAction();
2238        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);
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 <        assertEquals(r.invocationCount, 0);
2246 <        checkCompletedNormally(g, v1);
2247 <        checkCompletedWithWrappedCFException(f, ex);
2248 <        checkCompletedWithWrappedCFException(h, ex);
2249 <        }
2250 <    }
2251 <
2252 <    public void testAcceptEither_exceptionalCompletion2() {
2253 <        for (ExecutionMode m : ExecutionMode.values())
2254 <        for (Integer v1 : new Integer[] { 1, null }) {
2255 <
2256 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2257 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2258 <        final IncAction r = new IncAction();
2259 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2260 <        final CFException ex = new CFException();
2261 <
2262 <        g.completeExceptionally(ex);
2263 <        checkCompletedWithWrappedCFException(h, ex);
2264 <        f.complete(v1);
2487 >        g.complete(v1);
2488  
2489 <        assertEquals(r.invocationCount, 0);
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          }
2271    }
2272
2273    public void testAcceptEither_exceptionalCompletion3() {
2274        for (ExecutionMode m : ExecutionMode.values())
2275        for (Integer v1 : new Integer[] { 1, null }) {
2276
2277        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279        final IncAction r = new IncAction();
2280        final CFException ex = new CFException();
2281
2282        g.completeExceptionally(ex);
2283        f.complete(v1);
2284        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2285
2286        // unspecified behavior
2287        Integer v;
2499          try {
2500 <            assertEquals(h.join(), null);
2501 <            assertEquals(r.invocationCount, 1);
2291 <            assertEquals(inc(v1), r.value);
2500 >            assertNull(h5.join());
2501 >            rs[5].assertValue(v1);
2502          } catch (CompletionException ok) {
2503 <            checkCompletedWithWrappedCFException(h, ex);
2504 <            assertEquals(r.invocationCount, 0);
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<>();
2308        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
2316 <        Integer v;
2535 >        // unspecified behavior - both source completions available
2536          try {
2537 <            assertEquals(h.join(), null);
2538 <            assertEquals(r.invocationCount, 1);
2320 <            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(r.invocationCount, 0);
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();
2342 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2343 <
2344 <        f.complete(v1);
2345 <        checkCompletedWithWrappedCFException(h);
2346 <        g.complete(v2);
2347 <        checkCompletedNormally(f, v1);
2348 <        checkCompletedNormally(g, v2);
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          }
2350    }
2351
2352    public void testAcceptEither_actionFailed2() {
2353        for (ExecutionMode m : ExecutionMode.values())
2354        for (Integer v1 : new Integer[] { 1, null })
2355        for (Integer v2 : new Integer[] { 2, null }) {
2356
2357        final CompletableFuture<Integer> f = new CompletableFuture<>();
2358        final CompletableFuture<Integer> g = new CompletableFuture<>();
2359        final FailingConsumer r = new FailingConsumer();
2360        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2564  
2362        g.complete(v2);
2363        checkCompletedWithWrappedCFException(h);
2364        f.complete(v1);
2565          checkCompletedNormally(f, v1);
2566 <        checkCompletedNormally(g, v2);
2567 <        }
2368 <    }
2566 >        checkCompletedExceptionally(g, ex);
2567 >    }}
2568  
2569      /**
2570       * acceptEither result completes exceptionally if either source cancelled
2571       */
2572 <    public void testAcceptEither_sourceCancelled1() {
2374 <        for (ExecutionMode m : ExecutionMode.values())
2375 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2376 <        for (Integer v1 : new Integer[] { 1, null }) {
2377 <
2378 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2379 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2380 <        final IncAction r = new IncAction();
2381 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2382 <
2383 <        assertTrue(f.cancel(mayInterruptIfRunning));
2384 <        checkCompletedWithWrappedCancellationException(h);
2385 <        g.complete(v1);
2386 <
2387 <        checkCancelled(f);
2388 <        assertEquals(r.invocationCount, 0);
2389 <        checkCompletedNormally(g, v1);
2390 <        checkCompletedWithWrappedCancellationException(h);
2391 <        }
2392 <    }
2393 <
2394 <    public void testAcceptEither_sourceCancelled2() {
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 <
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);
2403 <
2404 <        assertTrue(g.cancel(mayInterruptIfRunning));
2405 <        checkCompletedWithWrappedCancellationException(h);
2406 <        f.complete(v1);
2579 >        final NoopConsumer[] rs = new NoopConsumer[6];
2580 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2581  
2582 <        checkCancelled(g);
2583 <        assertEquals(r.invocationCount, 0);
2584 <        checkCompletedNormally(f, v1);
2585 <        checkCompletedWithWrappedCancellationException(h);
2586 <        }
2587 <    }
2588 <
2589 <    public void testAcceptEither_sourceCancelled3() {
2590 <        for (ExecutionMode m : ExecutionMode.values())
2591 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2592 <        for (Integer v1 : new Integer[] { 1, null }) {
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 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2421 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2422 <        final IncAction r = new IncAction();
2423 <
2424 <        assertTrue(g.cancel(mayInterruptIfRunning));
2425 <        f.complete(v1);
2426 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
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(r.invocationCount, 1);
2433 <            assertEquals(inc(v1), r.value);
2602 >            assertNull(h4.join());
2603 >            rs[4].assertValue(v1);
2604          } catch (CompletionException ok) {
2605 <            checkCompletedWithWrappedCancellationException(h);
2606 <            assertEquals(r.invocationCount, 0);
2437 <        }
2438 <
2439 <        checkCancelled(g);
2440 <        checkCompletedNormally(f, v1);
2605 >            checkCompletedWithWrappedCancellationException(h4);
2606 >            rs[4].assertNotInvoked();
2607          }
2442    }
2443
2444    public void testAcceptEither_sourceCancelled4() {
2445        for (ExecutionMode m : ExecutionMode.values())
2446        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2447        for (Integer v1 : new Integer[] { 1, null }) {
2448
2449        final CompletableFuture<Integer> f = new CompletableFuture<>();
2450        final CompletableFuture<Integer> g = new CompletableFuture<>();
2451        final IncAction r = new IncAction();
2452
2453        assertTrue(f.cancel(mayInterruptIfRunning));
2454        g.complete(v1);
2455        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2456
2457        // unspecified behavior
2458        Integer v;
2608          try {
2609 <            assertEquals(h.join(), null);
2610 <            assertEquals(r.invocationCount, 1);
2462 <            assertEquals(inc(v1), r.value);
2609 >            assertNull(h5.join());
2610 >            rs[5].assertValue(v1);
2611          } catch (CompletionException ok) {
2612 <            checkCompletedWithWrappedCancellationException(h);
2613 <            assertEquals(r.invocationCount, 0);
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
2475 <     * 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(r.invocationCount, 1);
2643 <        g.complete(v2);
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 <        checkCompletedNormally(f, v1);
2493 <        checkCompletedNormally(g, v2);
2494 <        checkCompletedNormally(h, null);
2495 <        assertEquals(r.invocationCount, 1);
2496 <        }
2497 <    }
2498 <
2499 <    public void testRunAfterEither_normalCompletion2() {
2500 <        for (ExecutionMode m : ExecutionMode.values())
2501 <        for (Integer v1 : new Integer[] { 1, null })
2502 <        for (Integer v2 : new Integer[] { 2, null }) {
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();
2507 <        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(r.invocationCount, 1);
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(r.invocationCount, 1);
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);
2531        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(r.invocationCount, 1);
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<>();
2550        final Noop r = new Noop();
2551        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);
2731 <
2732 <        assertEquals(r.invocationCount, 0);
2733 <        checkCompletedNormally(g, v1);
2734 <        checkCompletedWithWrappedCFException(f, ex);
2735 <        checkCompletedWithWrappedCFException(h, ex);
2736 <        }
2737 <    }
2738 <
2739 <    public void testRunAfterEither_exceptionalCompletion2() {
2740 <        for (ExecutionMode m : ExecutionMode.values())
2567 <        for (Integer v1 : new Integer[] { 1, null }) {
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 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2570 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2571 <        final Noop r = new Noop();
2572 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2573 <        final CFException ex = new CFException();
2574 <
2575 <        g.completeExceptionally(ex);
2576 <        checkCompletedWithWrappedCFException(h, ex);
2577 <        f.complete(v1);
2742 >        assertTrue(g.complete(v1));
2743  
2744 <        assertEquals(r.invocationCount, 0);
2745 <        checkCompletedNormally(f, v1);
2746 <        checkCompletedWithWrappedCFException(g, ex);
2747 <        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          }
2584    }
2585
2586    public void testRunAfterEither_exceptionalCompletion3() {
2587        for (ExecutionMode m : ExecutionMode.values())
2588        for (Integer v1 : new Integer[] { 1, null }) {
2589
2590        final CompletableFuture<Integer> f = new CompletableFuture<>();
2591        final CompletableFuture<Integer> g = new CompletableFuture<>();
2592        final Noop r = new Noop();
2593        final CFException ex = new CFException();
2594
2595        g.completeExceptionally(ex);
2596        f.complete(v1);
2597        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2598
2599        // unspecified behavior
2600        Integer v;
2754          try {
2755 <            assertEquals(h.join(), null);
2756 <            assertEquals(r.invocationCount, 1);
2755 >            assertNull(h5.join());
2756 >            rs[5].assertInvoked();
2757          } catch (CompletionException ok) {
2758 <            checkCompletedWithWrappedCFException(h, ex);
2759 <            assertEquals(r.invocationCount, 0);
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<>();
2620        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
2628 <        Integer v;
2790 >        // unspecified behavior - both source completions available
2791          try {
2792 <            assertEquals(h.join(), null);
2793 <            assertEquals(r.invocationCount, 1);
2792 >            assertEquals(null, h0.join());
2793 >            rs[0].assertInvoked();
2794          } catch (CompletionException ok) {
2795 <            checkCompletedWithWrappedCFException(h, ex);
2796 <            assertEquals(r.invocationCount, 0);
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();
2653 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2654 <
2655 <        f.complete(v1);
2656 <        checkCompletedWithWrappedCFException(h);
2657 <        g.complete(v2);
2658 <        checkCompletedNormally(f, v1);
2659 <        checkCompletedNormally(g, v2);
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          }
2661    }
2662
2663    public void testRunAfterEither_actionFailed2() {
2664        for (ExecutionMode m : ExecutionMode.values())
2665        for (Integer v1 : new Integer[] { 1, null })
2666        for (Integer v2 : new Integer[] { 2, null }) {
2667
2668        final CompletableFuture<Integer> f = new CompletableFuture<>();
2669        final CompletableFuture<Integer> g = new CompletableFuture<>();
2670        final FailingNoop r = new FailingNoop();
2671        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2819  
2673        g.complete(v2);
2674        checkCompletedWithWrappedCFException(h);
2675        f.complete(v1);
2820          checkCompletedNormally(f, v1);
2821 <        checkCompletedNormally(g, v2);
2822 <        }
2679 <    }
2821 >        checkCompletedExceptionally(g, ex);
2822 >    }}
2823  
2824      /**
2825       * runAfterEither result completes exceptionally if either source cancelled
2826       */
2827 <    public void testRunAfterEither_sourceCancelled1() {
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(f.cancel(mayInterruptIfRunning));
2838 <        checkCompletedWithWrappedCancellationException(h);
2839 <        g.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(f);
2699 <        assertEquals(r.invocationCount, 0);
2700 <        checkCompletedNormally(g, v1);
2701 <        checkCompletedWithWrappedCancellationException(h);
2702 <        }
2703 <    }
2851 >        assertTrue(g.complete(v1));
2852  
2853 <    public void testRunAfterEither_sourceCancelled2() {
2854 <        for (ExecutionMode m : ExecutionMode.values())
2855 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2856 <        for (Integer v1 : new Integer[] { 1, null }) {
2857 <
2858 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2859 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2860 <        final Noop r = new Noop();
2861 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2714 <
2715 <        assertTrue(g.cancel(mayInterruptIfRunning));
2716 <        checkCompletedWithWrappedCancellationException(h);
2717 <        f.complete(v1);
2718 <
2719 <        checkCancelled(g);
2720 <        assertEquals(r.invocationCount, 0);
2721 <        checkCompletedNormally(f, v1);
2722 <        checkCompletedWithWrappedCancellationException(h);
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 >            assertNull(h4.join());
2858 >            rs[4].assertInvoked();
2859 >        } catch (CompletionException ok) {
2860 >            checkCompletedWithWrappedCancellationException(h4);
2861 >            rs[4].assertNotInvoked();
2862          }
2724    }
2725
2726    public void testRunAfterEither_sourceCancelled3() {
2727        for (ExecutionMode m : ExecutionMode.values())
2728        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2729        for (Integer v1 : new Integer[] { 1, null }) {
2730
2731        final CompletableFuture<Integer> f = new CompletableFuture<>();
2732        final CompletableFuture<Integer> g = new CompletableFuture<>();
2733        final Noop r = new Noop();
2734
2735        assertTrue(g.cancel(mayInterruptIfRunning));
2736        f.complete(v1);
2737        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2738
2739        // unspecified behavior
2740        Integer v;
2863          try {
2864 <            assertEquals(h.join(), null);
2865 <            assertEquals(r.invocationCount, 1);
2864 >            assertNull(h5.join());
2865 >            rs[5].assertInvoked();
2866          } catch (CompletionException ok) {
2867 <            checkCompletedWithWrappedCancellationException(h);
2868 <            assertEquals(r.invocationCount, 0);
2867 >            checkCompletedWithWrappedCancellationException(h5);
2868 >            rs[5].assertNotInvoked();
2869          }
2870  
2871 <        checkCancelled(g);
2872 <        checkCompletedNormally(f, v1);
2873 <        }
2874 <    }
2871 >        checkCancelled(f);
2872 >        checkCompletedNormally(g, v1);
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 <    public void testRunAfterEither_sourceCancelled4() {
2880 >    /**
2881 >     * runAfterEither result completes exceptionally if action does
2882 >     */
2883 >    public void testRunAfterEither_actionFailed() {
2884          for (ExecutionMode m : ExecutionMode.values())
2885 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2886 <        for (Integer v1 : new Integer[] { 1, null }) {
2887 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
2890 <        final Noop r = new Noop();
2890 >        final FailingRunnable[] rs = new FailingRunnable[6];
2891 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2892  
2893 <        assertTrue(f.cancel(mayInterruptIfRunning));
2894 <        g.complete(v1);
2895 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
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 <        // unspecified behavior
2910 <        Integer v;
2911 <        try {
2912 <            assertEquals(h.join(), null);
2771 <            assertEquals(r.invocationCount, 1);
2772 <        } catch (CompletionException ok) {
2773 <            checkCompletedWithWrappedCancellationException(h);
2774 <            assertEquals(r.invocationCount, 0);
2775 <        }
2776 <
2777 <        checkCancelled(f);
2778 <        checkCompletedNormally(g, v1);
2779 <        }
2780 <    }
2909 >        checkCompletedNormally(f, v1);
2910 >        checkCompletedNormally(g, v2);
2911 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2912 >    }}
2913  
2914      /**
2915       * thenCompose result completes normally after normal completion of source
2916       */
2917 <    public void testThenCompose() {
2918 <        CompletableFuture<Integer> f, g;
2919 <        CompletableFutureInc r;
2920 <
2921 <        f = new CompletableFuture<>();
2922 <        g = f.thenCompose(r = new CompletableFutureInc());
2923 <        f.complete(one);
2924 <        checkCompletedNormally(g, two);
2925 <        assertTrue(r.ran);
2917 >    public void testThenCompose_normalCompletion() {
2918 >        for (ExecutionMode m : ExecutionMode.values())
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(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 <        f = new CompletableFuture<>();
2929 <        f.complete(one);
2930 <        g = f.thenCompose(r = new CompletableFutureInc());
2931 <        checkCompletedNormally(g, two);
2799 <        assertTrue(r.ran);
2800 <    }
2928 >        checkCompletedNormally(g, inc(v1));
2929 >        checkCompletedNormally(f, v1);
2930 >        r.assertValue(v1);
2931 >    }}
2932  
2933      /**
2934       * thenCompose result completes exceptionally after exceptional
2935       * completion of source
2936       */
2937 <    public void testThenCompose2() {
2938 <        CompletableFuture<Integer> f, g;
2939 <        CompletableFutureInc r;
2940 <
2941 <        f = new CompletableFuture<>();
2942 <        g = f.thenCompose(r = new CompletableFutureInc());
2943 <        f.completeExceptionally(new CFException());
2944 <        checkCompletedWithWrappedCFException(g);
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(m);
2943 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2944 >        if (!createIncomplete) f.completeExceptionally(ex);
2945 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2946 >        if (createIncomplete) f.completeExceptionally(ex);
2947  
2948 <        f = new CompletableFuture<>();
2949 <        f.completeExceptionally(new CFException());
2950 <        g = f.thenCompose(r = new CompletableFutureInc());
2951 <        checkCompletedWithWrappedCFException(g);
2819 <    }
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 testThenCompose3() {
2957 <        CompletableFuture<Integer> f, g;
2958 <        FailingCompletableFutureFunction r;
2959 <
2960 <        f = new CompletableFuture<>();
2961 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2962 <        f.complete(one);
2963 <        checkCompletedWithWrappedCFException(g);
2956 >    public void testThenCompose_actionFailed() {
2957 >        for (ExecutionMode m : ExecutionMode.values())
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(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  
2833        f = new CompletableFuture<>();
2834        f.complete(one);
2835        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2968          checkCompletedWithWrappedCFException(g);
2969 <    }
2969 >        checkCompletedNormally(f, v1);
2970 >    }}
2971  
2972      /**
2973       * thenCompose result completes exceptionally if source cancelled
2974       */
2975 <    public void testThenCompose4() {
2976 <        CompletableFuture<Integer> f, g;
2977 <        CompletableFutureInc r;
2978 <
2979 <        f = new CompletableFuture<>();
2980 <        g = f.thenCompose(r = new CompletableFutureInc());
2981 <        assertTrue(f.cancel(true));
2982 <        checkCompletedWithWrappedCancellationException(g);
2983 <
2984 <        f = new CompletableFuture<>();
2985 <        assertTrue(f.cancel(true));
2986 <        g = f.thenCompose(r = new CompletableFutureInc());
2987 <        checkCompletedWithWrappedCancellationException(g);
2855 <    }
2856 <
2857 <    // asyncs
2858 <
2859 <    /**
2860 <     * thenRunAsync result completes normally after normal completion of source
2861 <     */
2862 <    public void testThenRunAsync() {
2863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2864 <        Noop r = new Noop();
2865 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2866 <        f.complete(null);
2867 <        checkCompletedNormally(g, null);
2868 <
2869 <        // reordered version
2870 <        f = new CompletableFuture<>();
2871 <        f.complete(null);
2872 <        r = new Noop();
2873 <        g = f.thenRunAsync(r);
2874 <        checkCompletedNormally(g, null);
2875 <    }
2876 <
2877 <    /**
2878 <     * thenRunAsync result completes exceptionally after exceptional
2879 <     * completion of source
2880 <     */
2881 <    public void testThenRunAsync2() {
2882 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2883 <        Noop r = new Noop();
2884 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2885 <        f.completeExceptionally(new CFException());
2886 <        try {
2887 <            g.join();
2888 <            shouldThrow();
2889 <        } catch (CompletionException success) {}
2890 <        checkCompletedWithWrappedCFException(g);
2891 <    }
2892 <
2893 <    /**
2894 <     * thenRunAsync result completes exceptionally if action does
2895 <     */
2896 <    public void testThenRunAsync3() {
2897 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2898 <        FailingNoop r = new FailingNoop();
2899 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2900 <        f.complete(null);
2901 <        checkCompletedWithWrappedCFException(g);
2902 <    }
2903 <
2904 <    /**
2905 <     * thenRunAsync result completes exceptionally if source cancelled
2906 <     */
2907 <    public void testThenRunAsync4() {
2908 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2909 <        Noop r = new Noop();
2910 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2911 <        assertTrue(f.cancel(true));
2912 <        checkCompletedWithWrappedCancellationException(g);
2913 <    }
2914 <
2915 <    /**
2916 <     * thenApplyAsync result completes normally after normal completion of source
2917 <     */
2918 <    public void testThenApplyAsync() {
2919 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2920 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2921 <        f.complete(one);
2922 <        checkCompletedNormally(g, two);
2923 <    }
2924 <
2925 <    /**
2926 <     * thenApplyAsync result completes exceptionally after exceptional
2927 <     * completion of source
2928 <     */
2929 <    public void testThenApplyAsync2() {
2930 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2931 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2932 <        f.completeExceptionally(new CFException());
2933 <        checkCompletedWithWrappedCFException(g);
2934 <    }
2935 <
2936 <    /**
2937 <     * thenApplyAsync result completes exceptionally if action does
2938 <     */
2939 <    public void testThenApplyAsync3() {
2940 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2941 <        FailingFunction r = new FailingFunction();
2942 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2943 <        f.complete(null);
2944 <        checkCompletedWithWrappedCFException(g);
2945 <    }
2946 <
2947 <    /**
2948 <     * thenApplyAsync result completes exceptionally if source cancelled
2949 <     */
2950 <    public void testThenApplyAsync4() {
2951 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2952 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2953 <        assertTrue(f.cancel(true));
2954 <        checkCompletedWithWrappedCancellationException(g);
2955 <    }
2956 <
2957 <    /**
2958 <     * thenAcceptAsync result completes normally after normal
2959 <     * completion of source
2960 <     */
2961 <    public void testThenAcceptAsync() {
2962 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2963 <        IncAction r = new IncAction();
2964 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2965 <        f.complete(one);
2966 <        checkCompletedNormally(g, null);
2967 <        assertEquals(r.value, (Integer) 2);
2968 <    }
2969 <
2970 <    /**
2971 <     * thenAcceptAsync result completes exceptionally after exceptional
2972 <     * completion of source
2973 <     */
2974 <    public void testThenAcceptAsync2() {
2975 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2976 <        IncAction r = new IncAction();
2977 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2978 <        f.completeExceptionally(new CFException());
2979 <        checkCompletedWithWrappedCFException(g);
2980 <    }
2981 <
2982 <    /**
2983 <     * thenAcceptAsync result completes exceptionally if action does
2984 <     */
2985 <    public void testThenAcceptAsync3() {
2986 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2987 <        FailingConsumer r = new FailingConsumer();
2988 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2989 <        f.complete(null);
2990 <        checkCompletedWithWrappedCFException(g);
2991 <    }
2992 <
2993 <    /**
2994 <     * thenAcceptAsync result completes exceptionally if source cancelled
2995 <     */
2996 <    public void testThenAcceptAsync4() {
2997 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2998 <        IncAction r = new IncAction();
2999 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3000 <        assertTrue(f.cancel(true));
3001 <        checkCompletedWithWrappedCancellationException(g);
3002 <    }
3003 <
3004 <    /**
3005 <     * thenComposeAsync result completes normally after normal
3006 <     * completion of source
3007 <     */
3008 <    public void testThenComposeAsync() {
3009 <        CompletableFuture<Integer> f, g;
3010 <        CompletableFutureInc r;
3011 <
3012 <        f = new CompletableFuture<>();
3013 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3014 <        f.complete(one);
3015 <        checkCompletedNormally(g, two);
3016 <
3017 <        f = new CompletableFuture<>();
3018 <        f.complete(one);
3019 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3020 <        checkCompletedNormally(g, two);
3021 <    }
3022 <
3023 <    /**
3024 <     * thenComposeAsync result completes exceptionally after
3025 <     * exceptional completion of source
3026 <     */
3027 <    public void testThenComposeAsync2() {
3028 <        CompletableFuture<Integer> f, g;
3029 <        CompletableFutureInc r;
3030 <
3031 <        f = new CompletableFuture<>();
3032 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3033 <        f.completeExceptionally(new CFException());
3034 <        checkCompletedWithWrappedCFException(g);
3035 <        assertFalse(r.ran);
3036 <
3037 <        f = new CompletableFuture<>();
3038 <        f.completeExceptionally(new CFException());
3039 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3040 <        checkCompletedWithWrappedCFException(g);
3041 <        assertFalse(r.ran);
3042 <    }
3043 <
3044 <    /**
3045 <     * thenComposeAsync result completes exceptionally if action does
3046 <     */
3047 <    public void testThenComposeAsync3() {
3048 <        CompletableFuture<Integer> f, g;
3049 <        FailingCompletableFutureFunction r;
3050 <
3051 <        f = new CompletableFuture<>();
3052 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3053 <        f.complete(one);
3054 <        checkCompletedWithWrappedCFException(g);
3055 <
3056 <        f = new CompletableFuture<>();
3057 <        f.complete(one);
3058 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3059 <        checkCompletedWithWrappedCFException(g);
3060 <    }
3061 <
3062 <    /**
3063 <     * thenComposeAsync result completes exceptionally if source cancelled
3064 <     */
3065 <    public void testThenComposeAsync4() {
3066 <        CompletableFuture<Integer> f, g;
3067 <        CompletableFutureInc r;
3068 <
3069 <        f = new CompletableFuture<>();
3070 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3071 <        assertTrue(f.cancel(true));
3072 <        checkCompletedWithWrappedCancellationException(g);
3073 <
3074 <        f = new CompletableFuture<>();
3075 <        assertTrue(f.cancel(true));
3076 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3077 <        checkCompletedWithWrappedCancellationException(g);
3078 <    }
3079 <
3080 <    // async with explicit executors
3081 <
3082 <    /**
3083 <     * thenRunAsync result completes normally after normal completion of source
3084 <     */
3085 <    public void testThenRunAsyncE() {
3086 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3087 <        Noop r = new Noop();
3088 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3089 <        f.complete(null);
3090 <        checkCompletedNormally(g, null);
3091 <
3092 <        // reordered version
3093 <        f = new CompletableFuture<>();
3094 <        f.complete(null);
3095 <        r = new Noop();
3096 <        g = f.thenRunAsync(r, new ThreadExecutor());
3097 <        checkCompletedNormally(g, null);
3098 <    }
3099 <
3100 <    /**
3101 <     * thenRunAsync result completes exceptionally after exceptional
3102 <     * completion of source
3103 <     */
3104 <    public void testThenRunAsync2E() {
3105 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3106 <        Noop r = new Noop();
3107 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3108 <        f.completeExceptionally(new CFException());
3109 <        try {
3110 <            g.join();
3111 <            shouldThrow();
3112 <        } catch (CompletionException success) {}
3113 <        checkCompletedWithWrappedCFException(g);
3114 <    }
3115 <
3116 <    /**
3117 <     * thenRunAsync result completes exceptionally if action does
3118 <     */
3119 <    public void testThenRunAsync3E() {
3120 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3121 <        FailingNoop r = new FailingNoop();
3122 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3123 <        f.complete(null);
3124 <        checkCompletedWithWrappedCFException(g);
3125 <    }
3126 <
3127 <    /**
3128 <     * thenRunAsync result completes exceptionally if source cancelled
3129 <     */
3130 <    public void testThenRunAsync4E() {
3131 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3132 <        Noop r = new Noop();
3133 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3134 <        assertTrue(f.cancel(true));
3135 <        checkCompletedWithWrappedCancellationException(g);
3136 <    }
3137 <
3138 <    /**
3139 <     * thenApplyAsync result completes normally after normal completion of source
3140 <     */
3141 <    public void testThenApplyAsyncE() {
3142 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3143 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3144 <        f.complete(one);
3145 <        checkCompletedNormally(g, two);
3146 <    }
3147 <
3148 <    /**
3149 <     * thenApplyAsync result completes exceptionally after exceptional
3150 <     * completion of source
3151 <     */
3152 <    public void testThenApplyAsync2E() {
3153 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3154 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3155 <        f.completeExceptionally(new CFException());
3156 <        checkCompletedWithWrappedCFException(g);
3157 <    }
3158 <
3159 <    /**
3160 <     * thenApplyAsync result completes exceptionally if action does
3161 <     */
3162 <    public void testThenApplyAsync3E() {
3163 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3164 <        FailingFunction r = new FailingFunction();
3165 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3166 <        f.complete(null);
3167 <        checkCompletedWithWrappedCFException(g);
3168 <    }
3169 <
3170 <    /**
3171 <     * thenApplyAsync result completes exceptionally if source cancelled
3172 <     */
3173 <    public void testThenApplyAsync4E() {
3174 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3175 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3176 <        assertTrue(f.cancel(true));
3177 <        checkCompletedWithWrappedCancellationException(g);
3178 <    }
3179 <
3180 <    /**
3181 <     * thenAcceptAsync result completes normally after normal
3182 <     * completion of source
3183 <     */
3184 <    public void testThenAcceptAsyncE() {
3185 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3186 <        IncAction r = new IncAction();
3187 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3188 <        f.complete(one);
3189 <        checkCompletedNormally(g, null);
3190 <        assertEquals(r.value, (Integer) 2);
3191 <    }
3192 <
3193 <    /**
3194 <     * thenAcceptAsync result completes exceptionally after exceptional
3195 <     * completion of source
3196 <     */
3197 <    public void testThenAcceptAsync2E() {
3198 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3199 <        IncAction r = new IncAction();
3200 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3201 <        f.completeExceptionally(new CFException());
3202 <        checkCompletedWithWrappedCFException(g);
3203 <    }
3204 <
3205 <    /**
3206 <     * thenAcceptAsync result completes exceptionally if action does
3207 <     */
3208 <    public void testThenAcceptAsync3E() {
3209 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3210 <        FailingConsumer r = new FailingConsumer();
3211 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3212 <        f.complete(null);
3213 <        checkCompletedWithWrappedCFException(g);
3214 <    }
3215 <
3216 <    /**
3217 <     * thenAcceptAsync result completes exceptionally if source cancelled
3218 <     */
3219 <    public void testThenAcceptAsync4E() {
3220 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3221 <        IncAction r = new IncAction();
3222 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3223 <        assertTrue(f.cancel(true));
3224 <        checkCompletedWithWrappedCancellationException(g);
3225 <    }
3226 <
3227 <    /**
3228 <     * thenComposeAsync result completes normally after normal
3229 <     * completion of source
3230 <     */
3231 <    public void testThenComposeAsyncE() {
3232 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3233 <        CompletableFutureInc r = new CompletableFutureInc();
3234 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3235 <        f.complete(one);
3236 <        checkCompletedNormally(g, two);
3237 <    }
3238 <
3239 <    /**
3240 <     * thenComposeAsync result completes exceptionally after
3241 <     * exceptional completion of source
3242 <     */
3243 <    public void testThenComposeAsync2E() {
3244 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3245 <        CompletableFutureInc r = new CompletableFutureInc();
3246 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3247 <        f.completeExceptionally(new CFException());
3248 <        checkCompletedWithWrappedCFException(g);
3249 <    }
3250 <
3251 <    /**
3252 <     * thenComposeAsync result completes exceptionally if action does
3253 <     */
3254 <    public void testThenComposeAsync3E() {
3255 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3256 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3257 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3258 <        f.complete(one);
3259 <        checkCompletedWithWrappedCFException(g);
3260 <    }
2975 >    public void testThenCompose_sourceCancelled() {
2976 >        for (ExecutionMode m : ExecutionMode.values())
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(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 >        }
2988  
3262    /**
3263     * thenComposeAsync result completes exceptionally if source cancelled
3264     */
3265    public void testThenComposeAsync4E() {
3266        CompletableFuture<Integer> f = new CompletableFuture<>();
3267        CompletableFutureInc r = new CompletableFutureInc();
3268        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3269        assertTrue(f.cancel(true));
2989          checkCompletedWithWrappedCancellationException(g);
2990 <    }
2990 >        checkCancelled(f);
2991 >    }}
2992  
2993      // other static methods
2994  
# Line 3286 | 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++) {
3016 >                checkIncomplete(f);
3017 >                checkIncomplete(CompletableFuture.allOf(fs));
3018 >                fs[i].complete(one);
3019 >            }
3020 >            checkCompletedNormally(f, null);
3021 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
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 = 0; i < k; ++i) {
3032 >            for (int i = k - 1; i >= 0; i--) {
3033                  checkIncomplete(f);
3034                  checkIncomplete(CompletableFuture.allOf(fs));
3035                  fs[i].complete(one);
# Line 3301 | Line 3039 | public class CompletableFutureTest exten
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 3332 | 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 3359 | 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 3432 | 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 3464 | Line 3268 | public class CompletableFutureTest exten
3268          assertSame(f, f.toCompletableFuture());
3269      }
3270  
3271 <    /**
3468 <     * whenComplete action executes on normal completion, propagating
3469 <     * source result.
3470 <     */
3471 <    public void testWhenComplete1() {
3472 <        final AtomicInteger a = new AtomicInteger();
3473 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3474 <        CompletableFuture<Integer> g =
3475 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3476 <        f.complete(three);
3477 <        checkCompletedNormally(f, three);
3478 <        checkCompletedNormally(g, three);
3479 <        assertEquals(a.get(), 1);
3480 <    }
3481 <
3482 <    /**
3483 <     * whenComplete action executes on exceptional completion, propagating
3484 <     * source result.
3485 <     */
3486 <    public void testWhenComplete2() {
3487 <        final AtomicInteger a = new AtomicInteger();
3488 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3489 <        CompletableFuture<Integer> g =
3490 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3491 <        f.completeExceptionally(new CFException());
3492 <        assertTrue(f.isCompletedExceptionally());
3493 <        assertTrue(g.isCompletedExceptionally());
3494 <        assertEquals(a.get(), 1);
3495 <    }
3496 <
3497 <    /**
3498 <     * If a whenComplete action throws an exception when triggered by
3499 <     * a normal completion, it completes exceptionally
3500 <     */
3501 <    public void testWhenComplete3() {
3502 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3503 <        CompletableFuture<Integer> g =
3504 <            f.whenComplete((Integer x, Throwable t) ->
3505 <                           { throw new CFException(); } );
3506 <        f.complete(three);
3507 <        checkCompletedNormally(f, three);
3508 <        assertTrue(g.isCompletedExceptionally());
3509 <        checkCompletedWithWrappedCFException(g);
3510 <    }
3511 <
3512 <    /**
3513 <     * whenCompleteAsync action executes on normal completion, propagating
3514 <     * source result.
3515 <     */
3516 <    public void testWhenCompleteAsync1() {
3517 <        final AtomicInteger a = new AtomicInteger();
3518 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3519 <        CompletableFuture<Integer> g =
3520 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3521 <        f.complete(three);
3522 <        checkCompletedNormally(f, three);
3523 <        checkCompletedNormally(g, three);
3524 <        assertEquals(a.get(), 1);
3525 <    }
3271 >    //--- tests of implementation details; not part of official tck ---
3272  
3273 <    /**
3274 <     * whenCompleteAsync action executes on exceptional completion, propagating
3275 <     * source result.
3276 <     */
3277 <    public void testWhenCompleteAsync2() {
3278 <        final AtomicInteger a = new AtomicInteger();
3279 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3534 <        CompletableFuture<Integer> g =
3535 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3536 <        f.completeExceptionally(new CFException());
3537 <        checkCompletedWithWrappedCFException(f);
3538 <        checkCompletedWithWrappedCFException(g);
3539 <    }
3540 <
3541 <    /**
3542 <     * If a whenCompleteAsync action throws an exception when
3543 <     * triggered by a normal completion, it completes exceptionally
3544 <     */
3545 <    public void testWhenCompleteAsync3() {
3546 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3547 <        CompletableFuture<Integer> g =
3548 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3549 <                           { throw new CFException(); } );
3550 <        f.complete(three);
3551 <        checkCompletedNormally(f, three);
3552 <        checkCompletedWithWrappedCFException(g);
3553 <    }
3554 <
3555 <    /**
3556 <     * whenCompleteAsync action executes on normal completion, propagating
3557 <     * source result.
3558 <     */
3559 <    public void testWhenCompleteAsync1e() {
3560 <        final AtomicInteger a = new AtomicInteger();
3561 <        ThreadExecutor exec = new ThreadExecutor();
3562 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3563 <        CompletableFuture<Integer> g =
3564 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3565 <                                exec);
3566 <        f.complete(three);
3567 <        checkCompletedNormally(f, three);
3568 <        checkCompletedNormally(g, three);
3569 <        assertEquals(a.get(), 1);
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 <     * whenCompleteAsync action executes on exceptional completion, propagating
3284 <     * source result.
3285 <     */
3286 <    public void testWhenCompleteAsync2e() {
3287 <        final AtomicInteger a = new AtomicInteger();
3288 <        ThreadExecutor exec = new ThreadExecutor();
3579 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3580 <        CompletableFuture<Integer> g =
3581 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3582 <                                exec);
3583 <        f.completeExceptionally(new CFException());
3584 <        checkCompletedWithWrappedCFException(f);
3585 <        checkCompletedWithWrappedCFException(g);
3586 <    }
3282 >    public void testExceptionPropagationReusesResultObject() {
3283 >        if (!testImplementationDetails) return;
3284 >        for (ExecutionMode m : ExecutionMode.values())
3285 >    {
3286 >        final CFException ex = new CFException();
3287 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3288 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3289  
3290 <    /**
3291 <     * If a whenCompleteAsync action throws an exception when triggered
3590 <     * by a normal completion, it completes exceptionally
3591 <     */
3592 <    public void testWhenCompleteAsync3e() {
3593 <        ThreadExecutor exec = new ThreadExecutor();
3594 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3595 <        CompletableFuture<Integer> g =
3596 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3597 <                                { throw new CFException(); },
3598 <                                exec);
3599 <        f.complete(three);
3600 <        checkCompletedNormally(f, three);
3601 <        checkCompletedWithWrappedCFException(g);
3602 <    }
3290 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3291 >            = new ArrayList<>();
3292  
3293 <    /**
3294 <     * handleAsync action completes normally with function value on
3295 <     * either normal or exceptional completion of source
3607 <     */
3608 <    public void testHandleAsync() {
3609 <        CompletableFuture<Integer> f, g;
3610 <        IntegerHandler r;
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 <        f = new CompletableFuture<>();
3298 <        g = f.handleAsync(r = new IntegerHandler());
3299 <        assertFalse(r.ran);
3615 <        f.completeExceptionally(new CFException());
3616 <        checkCompletedWithWrappedCFException(f);
3617 <        checkCompletedNormally(g, three);
3618 <        assertTrue(r.ran);
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 <        f = new CompletableFuture<>();
3302 <        g = f.handleAsync(r = new IntegerHandler());
3303 <        assertFalse(r.ran);
3623 <        f.completeExceptionally(new CFException());
3624 <        checkCompletedWithWrappedCFException(f);
3625 <        checkCompletedNormally(g, three);
3626 <        assertTrue(r.ran);
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<>();
3629 <        g = f.handleAsync(r = new IntegerHandler());
3630 <        assertFalse(r.ran);
3631 <        f.complete(one);
3632 <        checkCompletedNormally(f, one);
3633 <        checkCompletedNormally(g, two);
3634 <        assertTrue(r.ran);
3305 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3306  
3307 <        f = new CompletableFuture<>();
3637 <        g = f.handleAsync(r = new IntegerHandler());
3638 <        assertFalse(r.ran);
3639 <        f.complete(one);
3640 <        checkCompletedNormally(f, one);
3641 <        checkCompletedNormally(g, two);
3642 <        assertTrue(r.ran);
3643 <    }
3307 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3308  
3309 <    /**
3310 <     * handleAsync action with Executor completes normally with
3647 <     * function value on either normal or exceptional completion of
3648 <     * source
3649 <     */
3650 <    public void testHandleAsync2() {
3651 <        CompletableFuture<Integer> f, g;
3652 <        ThreadExecutor exec = new ThreadExecutor();
3653 <        IntegerHandler r;
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(), exec);
3314 <        assertFalse(r.ran);
3315 <        f.completeExceptionally(new CFException());
3316 <        checkCompletedWithWrappedCFException(f);
3317 <        checkCompletedNormally(g, three);
3318 <        assertTrue(r.ran);
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 <        assertFalse(r.ran);
3326 <        f.completeExceptionally(new CFException());
3327 <        checkCompletedWithWrappedCFException(f);
3328 <        checkCompletedNormally(g, three);
3329 <        assertTrue(r.ran);
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 <        assertFalse(r.ran);
3337 <        f.complete(one);
3338 <        checkCompletedNormally(f, one);
3339 <        checkCompletedNormally(g, two);
3340 <        assertTrue(r.ran);
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 <        assertFalse(r.ran);
3350 <        f.complete(one);
3351 <        checkCompletedNormally(f, one);
3352 <        checkCompletedNormally(g, two);
3353 <        assertTrue(r.ran);
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