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.36 by jsr166, Sun Jun 1 23:12:45 2014 UTC vs.
Revision 1.99 by jsr166, Wed Jan 7 07:59:20 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines