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.34 by jsr166, Sun Jun 1 21:17:05 2014 UTC vs.
Revision 1.138 by jsr166, Sun Nov 15 23:31:51 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 > import static java.util.concurrent.CompletableFuture.completedFuture;
11 > import static java.util.concurrent.CompletableFuture.failedFuture;
12 >
13 > import java.lang.reflect.Method;
14 > import java.lang.reflect.Modifier;
15 >
16 > import java.util.stream.Collectors;
17 > import java.util.stream.Stream;
18 >
19 > import java.util.ArrayList;
20 > import java.util.Arrays;
21 > import java.util.List;
22 > import java.util.Objects;
23 > import java.util.Set;
24   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
25   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
26   import java.util.concurrent.CompletableFuture;
27   import java.util.concurrent.CompletionException;
28 + import java.util.concurrent.CompletionStage;
29 + import java.util.concurrent.ExecutionException;
30 + import java.util.concurrent.Executor;
31 + import java.util.concurrent.ForkJoinPool;
32 + import java.util.concurrent.ForkJoinTask;
33   import java.util.concurrent.TimeoutException;
34 + import java.util.concurrent.TimeUnit;
35   import java.util.concurrent.atomic.AtomicInteger;
36 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
22 < import static java.util.concurrent.TimeUnit.SECONDS;
23 < import java.util.*;
24 < import java.util.function.Supplier;
25 < import java.util.function.Consumer;
36 > import java.util.concurrent.atomic.AtomicReference;
37   import java.util.function.BiConsumer;
27 import java.util.function.Function;
38   import java.util.function.BiFunction;
39 + import java.util.function.Consumer;
40 + import java.util.function.Function;
41 + import java.util.function.Predicate;
42 + import java.util.function.Supplier;
43 +
44 + import junit.framework.AssertionFailedError;
45 + import junit.framework.Test;
46 + import junit.framework.TestSuite;
47  
48   public class CompletableFutureTest extends JSR166TestCase {
49  
50      public static void main(String[] args) {
51 <        junit.textui.TestRunner.run(suite());
51 >        main(suite(), args);
52      }
53      public static Test suite() {
54          return new TestSuite(CompletableFutureTest.class);
# Line 41 | Line 59 | public class CompletableFutureTest exten
59      void checkIncomplete(CompletableFuture<?> f) {
60          assertFalse(f.isDone());
61          assertFalse(f.isCancelled());
62 <        assertTrue(f.toString().contains("[Not completed]"));
62 >        assertTrue(f.toString().contains("Not completed"));
63          try {
64              assertNull(f.getNow(null));
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 54 | Line 72 | public class CompletableFutureTest exten
72      }
73  
74      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
75 <        try {
76 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
59 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
75 >        checkTimedGet(f, value);
76 >
77          try {
78              assertEquals(value, f.join());
79          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 72 | Line 89 | public class CompletableFutureTest exten
89          assertTrue(f.toString().contains("[Completed normally]"));
90      }
91  
92 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
93 <        try {
94 <            f.get(LONG_DELAY_MS, MILLISECONDS);
95 <            shouldThrow();
96 <        } catch (ExecutionException success) {
97 <            assertTrue(success.getCause() instanceof CFException);
98 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
99 <        try {
100 <            f.join();
101 <            shouldThrow();
102 <        } catch (CompletionException success) {
103 <            assertTrue(success.getCause() instanceof CFException);
104 <        }
105 <        try {
106 <            f.getNow(null);
107 <            shouldThrow();
108 <        } catch (CompletionException success) {
92 <            assertTrue(success.getCause() instanceof CFException);
92 >    /**
93 >     * Returns the "raw" internal exceptional completion of f,
94 >     * without any additional wrapping with CompletionException.
95 >     */
96 >    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
97 >        // handle (and whenComplete) can distinguish between "direct"
98 >        // and "wrapped" exceptional completion
99 >        return f.handle((U u, Throwable t) -> t).join();
100 >    }
101 >
102 >    void checkCompletedExceptionally(CompletableFuture<?> f,
103 >                                     boolean wrapped,
104 >                                     Consumer<Throwable> checker) {
105 >        Throwable cause = exceptionalCompletion(f);
106 >        if (wrapped) {
107 >            assertTrue(cause instanceof CompletionException);
108 >            cause = cause.getCause();
109          }
110 <        try {
95 <            f.get();
96 <            shouldThrow();
97 <        } catch (ExecutionException success) {
98 <            assertTrue(success.getCause() instanceof CFException);
99 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
100 <        assertTrue(f.isDone());
101 <        assertFalse(f.isCancelled());
102 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
103 <    }
110 >        checker.accept(cause);
111  
112 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
106 <                                              CFException ex) {
112 >        long startTime = System.nanoTime();
113          try {
114              f.get(LONG_DELAY_MS, MILLISECONDS);
115              shouldThrow();
116          } catch (ExecutionException success) {
117 <            assertSame(ex, success.getCause());
117 >            assertSame(cause, success.getCause());
118          } catch (Throwable fail) { threadUnexpectedException(fail); }
119 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
120 +
121          try {
122              f.join();
123              shouldThrow();
124          } catch (CompletionException success) {
125 <            assertSame(ex, success.getCause());
126 <        }
125 >            assertSame(cause, success.getCause());
126 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
127 >
128          try {
129              f.getNow(null);
130              shouldThrow();
131          } catch (CompletionException success) {
132 <            assertSame(ex, success.getCause());
133 <        }
132 >            assertSame(cause, success.getCause());
133 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
134 >
135          try {
136              f.get();
137              shouldThrow();
138          } catch (ExecutionException success) {
139 <            assertSame(ex, success.getCause());
139 >            assertSame(cause, success.getCause());
140          } catch (Throwable fail) { threadUnexpectedException(fail); }
141 <        assertTrue(f.isDone());
141 >
142          assertFalse(f.isCancelled());
143 +        assertTrue(f.isDone());
144 +        assertTrue(f.isCompletedExceptionally());
145          assertTrue(f.toString().contains("[Completed exceptionally]"));
146      }
147  
148 +    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
149 +        checkCompletedExceptionally(f, true,
150 +            (t) -> assertTrue(t instanceof CFException));
151 +    }
152 +
153 +    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
154 +        checkCompletedExceptionally(f, true,
155 +            (t) -> assertTrue(t instanceof CancellationException));
156 +    }
157 +
158 +    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
159 +        checkCompletedExceptionally(f, false,
160 +            (t) -> assertTrue(t instanceof TimeoutException));
161 +    }
162 +
163 +    void checkCompletedWithWrappedException(CompletableFuture<?> f,
164 +                                            Throwable ex) {
165 +        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
166 +    }
167 +
168 +    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
169 +        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
170 +    }
171 +
172      void checkCancelled(CompletableFuture<?> f) {
173 +        long startTime = System.nanoTime();
174          try {
175              f.get(LONG_DELAY_MS, MILLISECONDS);
176              shouldThrow();
177          } catch (CancellationException success) {
178          } catch (Throwable fail) { threadUnexpectedException(fail); }
179 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
180 +
181          try {
182              f.join();
183              shouldThrow();
# Line 152 | Line 191 | public class CompletableFutureTest exten
191              shouldThrow();
192          } catch (CancellationException success) {
193          } catch (Throwable fail) { threadUnexpectedException(fail); }
155        assertTrue(f.isDone());
156        assertTrue(f.isCompletedExceptionally());
157        assertTrue(f.isCancelled());
158        assertTrue(f.toString().contains("[Completed exceptionally]"));
159    }
194  
195 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
196 <        try {
163 <            f.get(LONG_DELAY_MS, MILLISECONDS);
164 <            shouldThrow();
165 <        } catch (ExecutionException success) {
166 <            assertTrue(success.getCause() instanceof CancellationException);
167 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
168 <        try {
169 <            f.join();
170 <            shouldThrow();
171 <        } catch (CompletionException success) {
172 <            assertTrue(success.getCause() instanceof CancellationException);
173 <        }
174 <        try {
175 <            f.getNow(null);
176 <            shouldThrow();
177 <        } catch (CompletionException success) {
178 <            assertTrue(success.getCause() instanceof CancellationException);
179 <        }
180 <        try {
181 <            f.get();
182 <            shouldThrow();
183 <        } catch (ExecutionException success) {
184 <            assertTrue(success.getCause() instanceof CancellationException);
185 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
195 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
196 >
197          assertTrue(f.isDone());
187        assertFalse(f.isCancelled());
198          assertTrue(f.isCompletedExceptionally());
199 +        assertTrue(f.isCancelled());
200          assertTrue(f.toString().contains("[Completed exceptionally]"));
201      }
202  
# Line 203 | Line 214 | public class CompletableFutureTest exten
214       * isCancelled, join, get, and getNow
215       */
216      public void testComplete() {
217 +        for (Integer v1 : new Integer[] { 1, null })
218 +    {
219          CompletableFuture<Integer> f = new CompletableFuture<>();
220          checkIncomplete(f);
221 <        f.complete(one);
222 <        checkCompletedNormally(f, one);
223 <    }
221 >        assertTrue(f.complete(v1));
222 >        assertFalse(f.complete(v1));
223 >        checkCompletedNormally(f, v1);
224 >    }}
225  
226      /**
227       * completeExceptionally completes exceptionally, as indicated by
# Line 215 | Line 229 | public class CompletableFutureTest exten
229       */
230      public void testCompleteExceptionally() {
231          CompletableFuture<Integer> f = new CompletableFuture<>();
232 +        CFException ex = new CFException();
233          checkIncomplete(f);
234 <        f.completeExceptionally(new CFException());
235 <        checkCompletedWithWrappedCFException(f);
234 >        f.completeExceptionally(ex);
235 >        checkCompletedExceptionally(f, ex);
236      }
237  
238      /**
# Line 225 | Line 240 | public class CompletableFutureTest exten
240       * methods isDone, isCancelled, join, get, and getNow
241       */
242      public void testCancel() {
243 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
244 +    {
245          CompletableFuture<Integer> f = new CompletableFuture<>();
246          checkIncomplete(f);
247 <        assertTrue(f.cancel(true));
247 >        assertTrue(f.cancel(mayInterruptIfRunning));
248 >        assertTrue(f.cancel(mayInterruptIfRunning));
249 >        assertTrue(f.cancel(!mayInterruptIfRunning));
250          checkCancelled(f);
251 <    }
251 >    }}
252  
253      /**
254       * obtrudeValue forces completion with given value
# Line 237 | Line 256 | public class CompletableFutureTest exten
256      public void testObtrudeValue() {
257          CompletableFuture<Integer> f = new CompletableFuture<>();
258          checkIncomplete(f);
259 <        f.complete(one);
259 >        assertTrue(f.complete(one));
260          checkCompletedNormally(f, one);
261          f.obtrudeValue(three);
262          checkCompletedNormally(f, three);
# Line 246 | Line 265 | public class CompletableFutureTest exten
265          f = new CompletableFuture<>();
266          f.obtrudeValue(three);
267          checkCompletedNormally(f, three);
268 +        f.obtrudeValue(null);
269 +        checkCompletedNormally(f, null);
270          f = new CompletableFuture<>();
271          f.completeExceptionally(new CFException());
272          f.obtrudeValue(four);
# Line 256 | Line 277 | public class CompletableFutureTest exten
277       * obtrudeException forces completion with given exception
278       */
279      public void testObtrudeException() {
280 <        CompletableFuture<Integer> f = new CompletableFuture<>();
281 <        checkIncomplete(f);
282 <        f.complete(one);
283 <        checkCompletedNormally(f, one);
284 <        f.obtrudeException(new CFException());
264 <        checkCompletedWithWrappedCFException(f);
280 >        for (Integer v1 : new Integer[] { 1, null })
281 >    {
282 >        CFException ex;
283 >        CompletableFuture<Integer> f;
284 >
285          f = new CompletableFuture<>();
286 <        f.obtrudeException(new CFException());
287 <        checkCompletedWithWrappedCFException(f);
286 >        assertTrue(f.complete(v1));
287 >        for (int i = 0; i < 2; i++) {
288 >            f.obtrudeException(ex = new CFException());
289 >            checkCompletedExceptionally(f, ex);
290 >        }
291 >
292 >        f = new CompletableFuture<>();
293 >        for (int i = 0; i < 2; i++) {
294 >            f.obtrudeException(ex = new CFException());
295 >            checkCompletedExceptionally(f, ex);
296 >        }
297 >
298          f = new CompletableFuture<>();
299 +        f.completeExceptionally(ex = new CFException());
300 +        f.obtrudeValue(v1);
301 +        checkCompletedNormally(f, v1);
302 +        f.obtrudeException(ex = new CFException());
303 +        checkCompletedExceptionally(f, ex);
304          f.completeExceptionally(new CFException());
305 <        f.obtrudeValue(four);
306 <        checkCompletedNormally(f, four);
307 <        f.obtrudeException(new CFException());
308 <        checkCompletedWithWrappedCFException(f);
274 <    }
305 >        checkCompletedExceptionally(f, ex);
306 >        assertFalse(f.complete(v1));
307 >        checkCompletedExceptionally(f, ex);
308 >    }}
309  
310      /**
311       * getNumberOfDependents returns number of dependent tasks
312       */
313      public void testGetNumberOfDependents() {
314 +        for (ExecutionMode m : ExecutionMode.values())
315 +        for (Integer v1 : new Integer[] { 1, null })
316 +    {
317          CompletableFuture<Integer> f = new CompletableFuture<>();
318 <        assertEquals(f.getNumberOfDependents(), 0);
319 <        CompletableFuture g = f.thenRun(new Noop());
320 <        assertEquals(f.getNumberOfDependents(), 1);
321 <        assertEquals(g.getNumberOfDependents(), 0);
322 <        CompletableFuture h = f.thenRun(new Noop());
323 <        assertEquals(f.getNumberOfDependents(), 2);
324 <        f.complete(1);
318 >        assertEquals(0, f.getNumberOfDependents());
319 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
320 >        assertEquals(1, f.getNumberOfDependents());
321 >        assertEquals(0, g.getNumberOfDependents());
322 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
323 >        assertEquals(2, f.getNumberOfDependents());
324 >        assertEquals(0, h.getNumberOfDependents());
325 >        assertTrue(f.complete(v1));
326          checkCompletedNormally(g, null);
327 <        assertEquals(f.getNumberOfDependents(), 0);
328 <        assertEquals(g.getNumberOfDependents(), 0);
329 <    }
327 >        checkCompletedNormally(h, null);
328 >        assertEquals(0, f.getNumberOfDependents());
329 >        assertEquals(0, g.getNumberOfDependents());
330 >        assertEquals(0, h.getNumberOfDependents());
331 >    }}
332  
333      /**
334       * toString indicates current completion state
# Line 299 | Line 339 | public class CompletableFutureTest exten
339          f = new CompletableFuture<String>();
340          assertTrue(f.toString().contains("[Not completed]"));
341  
342 <        f.complete("foo");
342 >        assertTrue(f.complete("foo"));
343          assertTrue(f.toString().contains("[Completed normally]"));
344  
345          f = new CompletableFuture<String>();
346 <        f.completeExceptionally(new IndexOutOfBoundsException());
346 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
347          assertTrue(f.toString().contains("[Completed exceptionally]"));
348 +
349 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
350 +            f = new CompletableFuture<String>();
351 +            assertTrue(f.cancel(mayInterruptIfRunning));
352 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
353 +        }
354      }
355  
356      /**
# Line 315 | Line 361 | public class CompletableFutureTest exten
361          checkCompletedNormally(f, "test");
362      }
363  
364 <    // Choose non-commutative actions for better coverage
365 <
366 <    static final Supplier<Integer> supplyOne =
367 <        () -> Integer.valueOf(1);
368 <    static final Function<Integer, Integer> inc =
369 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
370 <    static final BiFunction<Integer, Integer, Integer> subtract =
325 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
326 <    static final class IncAction implements Consumer<Integer> {
327 <        int value;
328 <        public void accept(Integer x) { value = x.intValue() + 1; }
329 <    }
330 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
331 <        int value;
332 <        public void accept(Integer x, Integer y) {
333 <            value = x.intValue() - y.intValue();
364 >    abstract class CheckedAction {
365 >        int invocationCount = 0;
366 >        final ExecutionMode m;
367 >        CheckedAction(ExecutionMode m) { this.m = m; }
368 >        void invoked() {
369 >            m.checkExecutionMode();
370 >            assertEquals(0, invocationCount++);
371          }
372 <    }
373 <    static final class Noop implements Runnable {
337 <        boolean ran;
338 <        public void run() { ran = true; }
372 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
373 >        void assertInvoked() { assertEquals(1, invocationCount); }
374      }
375  
376 <    static final class FailingSupplier implements Supplier<Integer> {
377 <        boolean ran;
378 <        public Integer get() { ran = true; throw new CFException(); }
379 <    }
380 <    static final class FailingConsumer implements Consumer<Integer> {
381 <        boolean ran;
347 <        public void accept(Integer x) { ran = true; throw new CFException(); }
348 <    }
349 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
350 <        boolean ran;
351 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
352 <    }
353 <    static final class FailingFunction implements Function<Integer, Integer> {
354 <        boolean ran;
355 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
356 <    }
357 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
358 <        boolean ran;
359 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
360 <    }
361 <    static final class FailingNoop implements Runnable {
362 <        boolean ran;
363 <        public void run() { ran = true; throw new CFException(); }
364 <    }
365 <
366 <    static final class CompletableFutureInc
367 <        implements Function<Integer, CompletableFuture<Integer>> {
368 <        boolean ran;
369 <        public CompletableFuture<Integer> apply(Integer x) {
370 <            ran = true;
371 <            CompletableFuture<Integer> f = new CompletableFuture<>();
372 <            f.complete(Integer.valueOf(x.intValue() + 1));
373 <            return f;
376 >    abstract class CheckedIntegerAction extends CheckedAction {
377 >        Integer value;
378 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
379 >        void assertValue(Integer expected) {
380 >            assertInvoked();
381 >            assertEquals(expected, value);
382          }
383      }
384  
385 <    static final class FailingCompletableFutureFunction
386 <        implements Function<Integer, CompletableFuture<Integer>> {
387 <        boolean ran;
388 <        public CompletableFuture<Integer> apply(Integer x) {
389 <            ran = true; throw new CFException();
385 >    class IntegerSupplier extends CheckedAction
386 >        implements Supplier<Integer>
387 >    {
388 >        final Integer value;
389 >        IntegerSupplier(ExecutionMode m, Integer value) {
390 >            super(m);
391 >            this.value = value;
392          }
393 <    }
394 <
395 <    // Used for explicit executor tests
386 <    static final class ThreadExecutor implements Executor {
387 <        AtomicInteger count = new AtomicInteger(0);
388 <
389 <        public void execute(Runnable r) {
390 <            count.getAndIncrement();
391 <            new Thread(r).start();
393 >        public Integer get() {
394 >            invoked();
395 >            return value;
396          }
397      }
398  
399 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
400 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
399 >    // A function that handles and produces null values as well.
400 >    static Integer inc(Integer x) {
401 >        return (x == null) ? null : x + 1;
402      }
403  
404 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
405 <        boolean ran;
406 <        public Integer apply(Integer x, Throwable t) {
407 <            ran = true;
408 <            return (t == null) ? two : three;
404 >    class NoopConsumer extends CheckedIntegerAction
405 >        implements Consumer<Integer>
406 >    {
407 >        NoopConsumer(ExecutionMode m) { super(m); }
408 >        public void accept(Integer x) {
409 >            invoked();
410 >            value = x;
411          }
412      }
413  
414 <    /**
415 <     * exceptionally action completes with function value on source
416 <     * exception; otherwise with source value
417 <     */
418 <    public void testExceptionally() {
419 <        CompletableFuture<Integer> f = new CompletableFuture<>();
420 <        ExceptionToInteger r = new ExceptionToInteger();
421 <        CompletableFuture<Integer> g = f.exceptionally(r);
415 <        f.completeExceptionally(new CFException());
416 <        checkCompletedNormally(g, three);
417 <
418 <        f = new CompletableFuture<>();
419 <        r = new ExceptionToInteger();
420 <        g = f.exceptionally(r);
421 <        f.complete(one);
422 <        checkCompletedNormally(g, one);
423 <    }
424 <
425 <    /**
426 <     * handle action completes normally with function value on either
427 <     * normal or exceptional completion of source
428 <     */
429 <    public void testHandle() {
430 <        CompletableFuture<Integer> f, g;
431 <        IntegerHandler r;
432 <
433 <        f = new CompletableFuture<>();
434 <        f.completeExceptionally(new CFException());
435 <        g = f.handle(r = new IntegerHandler());
436 <        assertTrue(r.ran);
437 <        checkCompletedNormally(g, three);
438 <
439 <        f = new CompletableFuture<>();
440 <        g = f.handle(r = new IntegerHandler());
441 <        assertFalse(r.ran);
442 <        f.completeExceptionally(new CFException());
443 <        checkCompletedNormally(g, three);
444 <        assertTrue(r.ran);
445 <
446 <        f = new CompletableFuture<>();
447 <        f.complete(one);
448 <        g = f.handle(r = new IntegerHandler());
449 <        assertTrue(r.ran);
450 <        checkCompletedNormally(g, two);
451 <
452 <        f = new CompletableFuture<>();
453 <        g = f.handle(r = new IntegerHandler());
454 <        assertFalse(r.ran);
455 <        f.complete(one);
456 <        assertTrue(r.ran);
457 <        checkCompletedNormally(g, two);
458 <    }
459 <
460 <    /**
461 <     * runAsync completes after running Runnable
462 <     */
463 <    public void testRunAsync() {
464 <        Noop r = new Noop();
465 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
466 <        assertNull(f.join());
467 <        assertTrue(r.ran);
468 <        checkCompletedNormally(f, null);
469 <    }
470 <
471 <    /**
472 <     * runAsync with executor completes after running Runnable
473 <     */
474 <    public void testRunAsync2() {
475 <        Noop r = new Noop();
476 <        ThreadExecutor exec = new ThreadExecutor();
477 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
478 <        assertNull(f.join());
479 <        assertTrue(r.ran);
480 <        checkCompletedNormally(f, null);
481 <        assertEquals(1, exec.count.get());
482 <    }
483 <
484 <    /**
485 <     * failing runAsync completes exceptionally after running Runnable
486 <     */
487 <    public void testRunAsync3() {
488 <        FailingNoop r = new FailingNoop();
489 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
490 <        checkCompletedWithWrappedCFException(f);
491 <        assertTrue(r.ran);
492 <    }
493 <
494 <    /**
495 <     * supplyAsync completes with result of supplier
496 <     */
497 <    public void testSupplyAsync() {
498 <        CompletableFuture<Integer> f;
499 <        f = CompletableFuture.supplyAsync(supplyOne);
500 <        assertEquals(f.join(), one);
501 <        checkCompletedNormally(f, one);
502 <    }
503 <
504 <    /**
505 <     * supplyAsync with executor completes with result of supplier
506 <     */
507 <    public void testSupplyAsync2() {
508 <        CompletableFuture<Integer> f;
509 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
510 <        assertEquals(f.join(), one);
511 <        checkCompletedNormally(f, one);
512 <    }
513 <
514 <    /**
515 <     * Failing supplyAsync completes exceptionally
516 <     */
517 <    public void testSupplyAsync3() {
518 <        FailingSupplier r = new FailingSupplier();
519 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
520 <        checkCompletedWithWrappedCFException(f);
521 <        assertTrue(r.ran);
522 <    }
523 <
524 <    // seq completion methods
525 <
526 <    /**
527 <     * thenRun result completes normally after normal completion of source
528 <     */
529 <    public void testThenRun() {
530 <        CompletableFuture<Integer> f;
531 <        CompletableFuture<Void> g;
532 <        Noop r;
533 <
534 <        f = new CompletableFuture<>();
535 <        g = f.thenRun(r = new Noop());
536 <        f.complete(null);
537 <        checkCompletedNormally(g, null);
538 <        assertTrue(r.ran);
539 <
540 <        f = new CompletableFuture<>();
541 <        f.complete(null);
542 <        g = f.thenRun(r = new Noop());
543 <        checkCompletedNormally(g, null);
544 <        assertTrue(r.ran);
545 <    }
546 <
547 <    /**
548 <     * thenRun result completes exceptionally after exceptional
549 <     * completion of source
550 <     */
551 <    public void testThenRun2() {
552 <        CompletableFuture<Integer> f;
553 <        CompletableFuture<Void> g;
554 <        Noop r;
555 <
556 <        f = new CompletableFuture<>();
557 <        g = f.thenRun(r = new Noop());
558 <        f.completeExceptionally(new CFException());
559 <        checkCompletedWithWrappedCFException(g);
560 <        assertFalse(r.ran);
561 <
562 <        f = new CompletableFuture<>();
563 <        f.completeExceptionally(new CFException());
564 <        g = f.thenRun(r = new Noop());
565 <        checkCompletedWithWrappedCFException(g);
566 <        assertFalse(r.ran);
567 <    }
568 <
569 <    /**
570 <     * thenRun result completes exceptionally if action does
571 <     */
572 <    public void testThenRun3() {
573 <        CompletableFuture<Integer> f;
574 <        CompletableFuture<Void> g;
575 <        FailingNoop r;
576 <
577 <        f = new CompletableFuture<>();
578 <        g = f.thenRun(r = new FailingNoop());
579 <        f.complete(null);
580 <        checkCompletedWithWrappedCFException(g);
581 <
582 <        f = new CompletableFuture<>();
583 <        f.complete(null);
584 <        g = f.thenRun(r = new FailingNoop());
585 <        checkCompletedWithWrappedCFException(g);
586 <    }
587 <
588 <    /**
589 <     * thenRun result completes exceptionally if source cancelled
590 <     */
591 <    public void testThenRun4() {
592 <        CompletableFuture<Integer> f;
593 <        CompletableFuture<Void> g;
594 <        Noop r;
595 <
596 <        f = new CompletableFuture<>();
597 <        g = f.thenRun(r = new Noop());
598 <        assertTrue(f.cancel(true));
599 <        checkCompletedWithWrappedCancellationException(g);
600 <
601 <        f = new CompletableFuture<>();
602 <        assertTrue(f.cancel(true));
603 <        g = f.thenRun(r = new Noop());
604 <        checkCompletedWithWrappedCancellationException(g);
605 <    }
606 <
607 <    /**
608 <     * thenApply result completes normally after normal completion of source
609 <     */
610 <    public void testThenApply() {
611 <        CompletableFuture<Integer> f = new CompletableFuture<>();
612 <        CompletableFuture<Integer> g = f.thenApply(inc);
613 <        f.complete(one);
614 <        checkCompletedNormally(g, two);
615 <    }
616 <
617 <    /**
618 <     * thenApply result completes exceptionally after exceptional
619 <     * completion of source
620 <     */
621 <    public void testThenApply2() {
622 <        CompletableFuture<Integer> f = new CompletableFuture<>();
623 <        CompletableFuture<Integer> g = f.thenApply(inc);
624 <        f.completeExceptionally(new CFException());
625 <        checkCompletedWithWrappedCFException(g);
414 >    class IncFunction extends CheckedIntegerAction
415 >        implements Function<Integer,Integer>
416 >    {
417 >        IncFunction(ExecutionMode m) { super(m); }
418 >        public Integer apply(Integer x) {
419 >            invoked();
420 >            return value = inc(x);
421 >        }
422      }
423  
424 <    /**
425 <     * thenApply result completes exceptionally if action does
426 <     */
427 <    public void testThenApply3() {
428 <        CompletableFuture<Integer> f = new CompletableFuture<>();
429 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
634 <        f.complete(one);
635 <        checkCompletedWithWrappedCFException(g);
424 >    // Choose non-commutative actions for better coverage
425 >    // A non-commutative function that handles and produces null values as well.
426 >    static Integer subtract(Integer x, Integer y) {
427 >        return (x == null && y == null) ? null :
428 >            ((x == null) ? 42 : x.intValue())
429 >            - ((y == null) ? 99 : y.intValue());
430      }
431  
432 <    /**
433 <     * thenApply result completes exceptionally if source cancelled
434 <     */
435 <    public void testThenApply4() {
436 <        CompletableFuture<Integer> f = new CompletableFuture<>();
437 <        CompletableFuture<Integer> g = f.thenApply(inc);
438 <        assertTrue(f.cancel(true));
439 <        checkCompletedWithWrappedCancellationException(g);
432 >    class SubtractAction extends CheckedIntegerAction
433 >        implements BiConsumer<Integer, Integer>
434 >    {
435 >        SubtractAction(ExecutionMode m) { super(m); }
436 >        public void accept(Integer x, Integer y) {
437 >            invoked();
438 >            value = subtract(x, y);
439 >        }
440      }
441  
442 <    /**
443 <     * thenAccept result completes normally after normal completion of source
444 <     */
445 <    public void testThenAccept() {
446 <        CompletableFuture<Integer> f = new CompletableFuture<>();
447 <        IncAction r = new IncAction();
448 <        CompletableFuture<Void> g = f.thenAccept(r);
449 <        f.complete(one);
656 <        checkCompletedNormally(g, null);
657 <        assertEquals(r.value, 2);
442 >    class SubtractFunction extends CheckedIntegerAction
443 >        implements BiFunction<Integer, Integer, Integer>
444 >    {
445 >        SubtractFunction(ExecutionMode m) { super(m); }
446 >        public Integer apply(Integer x, Integer y) {
447 >            invoked();
448 >            return value = subtract(x, y);
449 >        }
450      }
451  
452 <    /**
453 <     * thenAccept result completes exceptionally after exceptional
454 <     * completion of source
455 <     */
456 <    public void testThenAccept2() {
665 <        CompletableFuture<Integer> f = new CompletableFuture<>();
666 <        IncAction r = new IncAction();
667 <        CompletableFuture<Void> g = f.thenAccept(r);
668 <        f.completeExceptionally(new CFException());
669 <        checkCompletedWithWrappedCFException(g);
452 >    class Noop extends CheckedAction implements Runnable {
453 >        Noop(ExecutionMode m) { super(m); }
454 >        public void run() {
455 >            invoked();
456 >        }
457      }
458  
459 <    /**
460 <     * thenAccept result completes exceptionally if action does
461 <     */
462 <    public void testThenAccept3() {
463 <        CompletableFuture<Integer> f = new CompletableFuture<>();
464 <        FailingConsumer r = new FailingConsumer();
465 <        CompletableFuture<Void> g = f.thenAccept(r);
466 <        f.complete(one);
680 <        checkCompletedWithWrappedCFException(g);
681 <        assertTrue(r.ran);
459 >    class FailingSupplier extends CheckedAction
460 >        implements Supplier<Integer>
461 >    {
462 >        FailingSupplier(ExecutionMode m) { super(m); }
463 >        public Integer get() {
464 >            invoked();
465 >            throw new CFException();
466 >        }
467      }
468  
469 <    /**
470 <     * thenAccept result completes exceptionally if source cancelled
471 <     */
472 <    public void testThenAccept4() {
473 <        CompletableFuture<Integer> f = new CompletableFuture<>();
474 <        IncAction r = new IncAction();
475 <        CompletableFuture<Void> g = f.thenAccept(r);
476 <        assertTrue(f.cancel(true));
477 <        checkCompletedWithWrappedCancellationException(g);
469 >    class FailingConsumer extends CheckedIntegerAction
470 >        implements Consumer<Integer>
471 >    {
472 >        FailingConsumer(ExecutionMode m) { super(m); }
473 >        public void accept(Integer x) {
474 >            invoked();
475 >            value = x;
476 >            throw new CFException();
477 >        }
478      }
479  
480 <    /**
481 <     * thenCombine result completes normally after normal completion
482 <     * of sources
483 <     */
484 <    public void testThenCombine() {
485 <        CompletableFuture<Integer> f, g, h;
486 <
487 <        f = new CompletableFuture<>();
488 <        g = new CompletableFuture<>();
704 <        h = f.thenCombine(g, subtract);
705 <        f.complete(3);
706 <        checkIncomplete(h);
707 <        g.complete(1);
708 <        checkCompletedNormally(h, 2);
709 <
710 <        f = new CompletableFuture<>();
711 <        g = new CompletableFuture<>();
712 <        h = f.thenCombine(g, subtract);
713 <        g.complete(1);
714 <        checkIncomplete(h);
715 <        f.complete(3);
716 <        checkCompletedNormally(h, 2);
717 <
718 <        f = new CompletableFuture<>();
719 <        g = new CompletableFuture<>();
720 <        g.complete(1);
721 <        f.complete(3);
722 <        h = f.thenCombine(g, subtract);
723 <        checkCompletedNormally(h, 2);
480 >    class FailingBiConsumer extends CheckedIntegerAction
481 >        implements BiConsumer<Integer, Integer>
482 >    {
483 >        FailingBiConsumer(ExecutionMode m) { super(m); }
484 >        public void accept(Integer x, Integer y) {
485 >            invoked();
486 >            value = subtract(x, y);
487 >            throw new CFException();
488 >        }
489      }
490  
491 <    /**
492 <     * thenCombine result completes exceptionally after exceptional
493 <     * completion of either source
494 <     */
495 <    public void testThenCombine2() {
496 <        CompletableFuture<Integer> f, g, h;
497 <
498 <        f = new CompletableFuture<>();
499 <        g = new CompletableFuture<>();
735 <        h = f.thenCombine(g, subtract);
736 <        f.completeExceptionally(new CFException());
737 <        checkIncomplete(h);
738 <        g.complete(1);
739 <        checkCompletedWithWrappedCFException(h);
740 <
741 <        f = new CompletableFuture<>();
742 <        g = new CompletableFuture<>();
743 <        h = f.thenCombine(g, subtract);
744 <        g.completeExceptionally(new CFException());
745 <        checkIncomplete(h);
746 <        f.complete(3);
747 <        checkCompletedWithWrappedCFException(h);
748 <
749 <        f = new CompletableFuture<>();
750 <        g = new CompletableFuture<>();
751 <        f.complete(3);
752 <        g.completeExceptionally(new CFException());
753 <        h = f.thenCombine(g, subtract);
754 <        checkCompletedWithWrappedCFException(h);
755 <
756 <        f = new CompletableFuture<>();
757 <        g = new CompletableFuture<>();
758 <        f.completeExceptionally(new CFException());
759 <        g.complete(3);
760 <        h = f.thenCombine(g, subtract);
761 <        checkCompletedWithWrappedCFException(h);
491 >    class FailingFunction extends CheckedIntegerAction
492 >        implements Function<Integer, Integer>
493 >    {
494 >        FailingFunction(ExecutionMode m) { super(m); }
495 >        public Integer apply(Integer x) {
496 >            invoked();
497 >            value = x;
498 >            throw new CFException();
499 >        }
500      }
501  
502 <    /**
503 <     * thenCombine result completes exceptionally if action does
504 <     */
505 <    public void testThenCombine3() {
506 <        CompletableFuture<Integer> f = new CompletableFuture<>();
507 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
508 <        FailingBiFunction r = new FailingBiFunction();
509 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
510 <        f.complete(one);
773 <        checkIncomplete(g);
774 <        assertFalse(r.ran);
775 <        f2.complete(two);
776 <        checkCompletedWithWrappedCFException(g);
777 <        assertTrue(r.ran);
502 >    class FailingBiFunction extends CheckedIntegerAction
503 >        implements BiFunction<Integer, Integer, Integer>
504 >    {
505 >        FailingBiFunction(ExecutionMode m) { super(m); }
506 >        public Integer apply(Integer x, Integer y) {
507 >            invoked();
508 >            value = subtract(x, y);
509 >            throw new CFException();
510 >        }
511      }
512  
513 <    /**
514 <     * thenCombine result completes exceptionally if either source cancelled
515 <     */
516 <    public void testThenCombine4() {
517 <        CompletableFuture<Integer> f, g, h;
518 <
786 <        f = new CompletableFuture<>();
787 <        g = new CompletableFuture<>();
788 <        h = f.thenCombine(g, subtract);
789 <        assertTrue(f.cancel(true));
790 <        checkIncomplete(h);
791 <        g.complete(1);
792 <        checkCompletedWithWrappedCancellationException(h);
793 <
794 <        f = new CompletableFuture<>();
795 <        g = new CompletableFuture<>();
796 <        h = f.thenCombine(g, subtract);
797 <        assertTrue(g.cancel(true));
798 <        checkIncomplete(h);
799 <        f.complete(3);
800 <        checkCompletedWithWrappedCancellationException(h);
801 <
802 <        f = new CompletableFuture<>();
803 <        g = new CompletableFuture<>();
804 <        assertTrue(f.cancel(true));
805 <        assertTrue(g.cancel(true));
806 <        h = f.thenCombine(g, subtract);
807 <        checkCompletedWithWrappedCancellationException(h);
513 >    class FailingRunnable extends CheckedAction implements Runnable {
514 >        FailingRunnable(ExecutionMode m) { super(m); }
515 >        public void run() {
516 >            invoked();
517 >            throw new CFException();
518 >        }
519      }
520  
521 <    /**
522 <     * thenAcceptBoth result completes normally after normal
523 <     * completion of sources
524 <     */
525 <    public void testThenAcceptBoth() {
526 <        CompletableFuture<Integer> f, g;
527 <        CompletableFuture<Void> h;
528 <        SubtractAction r;
529 <
530 <        f = new CompletableFuture<>();
531 <        g = new CompletableFuture<>();
821 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
822 <        f.complete(3);
823 <        checkIncomplete(h);
824 <        g.complete(1);
825 <        checkCompletedNormally(h, null);
826 <        assertEquals(r.value, 2);
827 <
828 <        f = new CompletableFuture<>();
829 <        g = new CompletableFuture<>();
830 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
831 <        g.complete(1);
832 <        checkIncomplete(h);
833 <        f.complete(3);
834 <        checkCompletedNormally(h, null);
835 <        assertEquals(r.value, 2);
836 <
837 <        f = new CompletableFuture<>();
838 <        g = new CompletableFuture<>();
839 <        g.complete(1);
840 <        f.complete(3);
841 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
842 <        checkCompletedNormally(h, null);
843 <        assertEquals(r.value, 2);
521 >    class CompletableFutureInc extends CheckedIntegerAction
522 >        implements Function<Integer, CompletableFuture<Integer>>
523 >    {
524 >        CompletableFutureInc(ExecutionMode m) { super(m); }
525 >        public CompletableFuture<Integer> apply(Integer x) {
526 >            invoked();
527 >            value = x;
528 >            CompletableFuture<Integer> f = new CompletableFuture<>();
529 >            assertTrue(f.complete(inc(x)));
530 >            return f;
531 >        }
532      }
533  
534 <    /**
535 <     * thenAcceptBoth result completes exceptionally after exceptional
536 <     * completion of either source
537 <     */
538 <    public void testThenAcceptBoth2() {
539 <        CompletableFuture<Integer> f, g;
540 <        CompletableFuture<Void> h;
541 <        SubtractAction r;
542 <
855 <        f = new CompletableFuture<>();
856 <        g = new CompletableFuture<>();
857 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
858 <        f.completeExceptionally(new CFException());
859 <        checkIncomplete(h);
860 <        g.complete(1);
861 <        checkCompletedWithWrappedCFException(h);
862 <
863 <        f = new CompletableFuture<>();
864 <        g = new CompletableFuture<>();
865 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
866 <        g.completeExceptionally(new CFException());
867 <        checkIncomplete(h);
868 <        f.complete(3);
869 <        checkCompletedWithWrappedCFException(h);
870 <
871 <        f = new CompletableFuture<>();
872 <        g = new CompletableFuture<>();
873 <        f.complete(3);
874 <        g.completeExceptionally(new CFException());
875 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
876 <        checkCompletedWithWrappedCFException(h);
877 <
878 <        f = new CompletableFuture<>();
879 <        g = new CompletableFuture<>();
880 <        f.completeExceptionally(new CFException());
881 <        g.complete(3);
882 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
883 <        checkCompletedWithWrappedCFException(h);
534 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
535 >        implements Function<Integer, CompletableFuture<Integer>>
536 >    {
537 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
538 >        public CompletableFuture<Integer> apply(Integer x) {
539 >            invoked();
540 >            value = x;
541 >            throw new CFException();
542 >        }
543      }
544  
545 <    /**
546 <     * thenAcceptBoth result completes exceptionally if action does
547 <     */
548 <    public void testThenAcceptBoth3() {
549 <        CompletableFuture<Integer> f, g;
550 <        CompletableFuture<Void> h;
551 <        FailingBiConsumer r;
893 <
894 <        f = new CompletableFuture<>();
895 <        g = new CompletableFuture<>();
896 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
897 <        f.complete(3);
898 <        checkIncomplete(h);
899 <        g.complete(1);
900 <        checkCompletedWithWrappedCFException(h);
545 >    // Used for explicit executor tests
546 >    static final class ThreadExecutor implements Executor {
547 >        final AtomicInteger count = new AtomicInteger(0);
548 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
549 >        static boolean startedCurrentThread() {
550 >            return Thread.currentThread().getThreadGroup() == tg;
551 >        }
552  
553 <        f = new CompletableFuture<>();
554 <        g = new CompletableFuture<>();
555 <        f.complete(3);
556 <        g.complete(1);
906 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
907 <        checkCompletedWithWrappedCFException(h);
553 >        public void execute(Runnable r) {
554 >            count.getAndIncrement();
555 >            new Thread(tg, r).start();
556 >        }
557      }
558  
559 <    /**
560 <     * thenAcceptBoth result completes exceptionally if either source cancelled
912 <     */
913 <    public void testThenAcceptBoth4() {
914 <        CompletableFuture<Integer> f, g;
915 <        CompletableFuture<Void> h;
916 <        SubtractAction r;
917 <
918 <        f = new CompletableFuture<>();
919 <        g = new CompletableFuture<>();
920 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
921 <        assertTrue(f.cancel(true));
922 <        checkIncomplete(h);
923 <        g.complete(1);
924 <        checkCompletedWithWrappedCancellationException(h);
925 <
926 <        f = new CompletableFuture<>();
927 <        g = new CompletableFuture<>();
928 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
929 <        assertTrue(g.cancel(true));
930 <        checkIncomplete(h);
931 <        f.complete(3);
932 <        checkCompletedWithWrappedCancellationException(h);
933 <
934 <        f = new CompletableFuture<>();
935 <        g = new CompletableFuture<>();
936 <        f.complete(3);
937 <        assertTrue(g.cancel(true));
938 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
939 <        checkCompletedWithWrappedCancellationException(h);
940 <
941 <        f = new CompletableFuture<>();
942 <        g = new CompletableFuture<>();
943 <        assertTrue(f.cancel(true));
944 <        g.complete(3);
945 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
946 <        checkCompletedWithWrappedCancellationException(h);
947 <    }
559 >    static final boolean defaultExecutorIsCommonPool
560 >        = ForkJoinPool.getCommonPoolParallelism() > 1;
561  
562      /**
563       * Permits the testing of parallel code for the 3 different
564 <     * execution modes without repeating all the testing code.
564 >     * execution modes without copy/pasting all the test methods.
565       */
566      enum ExecutionMode {
567 <        DEFAULT {
567 >        SYNC {
568 >            public void checkExecutionMode() {
569 >                assertFalse(ThreadExecutor.startedCurrentThread());
570 >                assertNull(ForkJoinTask.getPool());
571 >            }
572 >            public CompletableFuture<Void> runAsync(Runnable a) {
573 >                throw new UnsupportedOperationException();
574 >            }
575 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
576 >                throw new UnsupportedOperationException();
577 >            }
578 >            public <T> CompletableFuture<Void> thenRun
579 >                (CompletableFuture<T> f, Runnable a) {
580 >                return f.thenRun(a);
581 >            }
582 >            public <T> CompletableFuture<Void> thenAccept
583 >                (CompletableFuture<T> f, Consumer<? super T> a) {
584 >                return f.thenAccept(a);
585 >            }
586 >            public <T,U> CompletableFuture<U> thenApply
587 >                (CompletableFuture<T> f, Function<? super T,U> a) {
588 >                return f.thenApply(a);
589 >            }
590 >            public <T,U> CompletableFuture<U> thenCompose
591 >                (CompletableFuture<T> f,
592 >                 Function<? super T,? extends CompletionStage<U>> a) {
593 >                return f.thenCompose(a);
594 >            }
595 >            public <T,U> CompletableFuture<U> handle
596 >                (CompletableFuture<T> f,
597 >                 BiFunction<? super T,Throwable,? extends U> a) {
598 >                return f.handle(a);
599 >            }
600 >            public <T> CompletableFuture<T> whenComplete
601 >                (CompletableFuture<T> f,
602 >                 BiConsumer<? super T,? super Throwable> a) {
603 >                return f.whenComplete(a);
604 >            }
605              public <T,U> CompletableFuture<Void> runAfterBoth
606 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
607 <                return f.runAfterBoth(g, r);
606 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
607 >                return f.runAfterBoth(g, a);
608 >            }
609 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
610 >                (CompletableFuture<T> f,
611 >                 CompletionStage<? extends U> g,
612 >                 BiConsumer<? super T,? super U> a) {
613 >                return f.thenAcceptBoth(g, a);
614 >            }
615 >            public <T,U,V> CompletableFuture<V> thenCombine
616 >                (CompletableFuture<T> f,
617 >                 CompletionStage<? extends U> g,
618 >                 BiFunction<? super T,? super U,? extends V> a) {
619 >                return f.thenCombine(g, a);
620 >            }
621 >            public <T> CompletableFuture<Void> runAfterEither
622 >                (CompletableFuture<T> f,
623 >                 CompletionStage<?> g,
624 >                 java.lang.Runnable a) {
625 >                return f.runAfterEither(g, a);
626 >            }
627 >            public <T> CompletableFuture<Void> acceptEither
628 >                (CompletableFuture<T> f,
629 >                 CompletionStage<? extends T> g,
630 >                 Consumer<? super T> a) {
631 >                return f.acceptEither(g, a);
632 >            }
633 >            public <T,U> CompletableFuture<U> applyToEither
634 >                (CompletableFuture<T> f,
635 >                 CompletionStage<? extends T> g,
636 >                 Function<? super T,U> a) {
637 >                return f.applyToEither(g, a);
638              }
639          },
640  
641 <        DEFAULT_ASYNC {
641 >        ASYNC {
642 >            public void checkExecutionMode() {
643 >                assertEquals(defaultExecutorIsCommonPool,
644 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
645 >            }
646 >            public CompletableFuture<Void> runAsync(Runnable a) {
647 >                return CompletableFuture.runAsync(a);
648 >            }
649 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
650 >                return CompletableFuture.supplyAsync(a);
651 >            }
652 >            public <T> CompletableFuture<Void> thenRun
653 >                (CompletableFuture<T> f, Runnable a) {
654 >                return f.thenRunAsync(a);
655 >            }
656 >            public <T> CompletableFuture<Void> thenAccept
657 >                (CompletableFuture<T> f, Consumer<? super T> a) {
658 >                return f.thenAcceptAsync(a);
659 >            }
660 >            public <T,U> CompletableFuture<U> thenApply
661 >                (CompletableFuture<T> f, Function<? super T,U> a) {
662 >                return f.thenApplyAsync(a);
663 >            }
664 >            public <T,U> CompletableFuture<U> thenCompose
665 >                (CompletableFuture<T> f,
666 >                 Function<? super T,? extends CompletionStage<U>> a) {
667 >                return f.thenComposeAsync(a);
668 >            }
669 >            public <T,U> CompletableFuture<U> handle
670 >                (CompletableFuture<T> f,
671 >                 BiFunction<? super T,Throwable,? extends U> a) {
672 >                return f.handleAsync(a);
673 >            }
674 >            public <T> CompletableFuture<T> whenComplete
675 >                (CompletableFuture<T> f,
676 >                 BiConsumer<? super T,? super Throwable> a) {
677 >                return f.whenCompleteAsync(a);
678 >            }
679              public <T,U> CompletableFuture<Void> runAfterBoth
680 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
681 <                return f.runAfterBothAsync(g, r);
680 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
681 >                return f.runAfterBothAsync(g, a);
682 >            }
683 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
684 >                (CompletableFuture<T> f,
685 >                 CompletionStage<? extends U> g,
686 >                 BiConsumer<? super T,? super U> a) {
687 >                return f.thenAcceptBothAsync(g, a);
688 >            }
689 >            public <T,U,V> CompletableFuture<V> thenCombine
690 >                (CompletableFuture<T> f,
691 >                 CompletionStage<? extends U> g,
692 >                 BiFunction<? super T,? super U,? extends V> a) {
693 >                return f.thenCombineAsync(g, a);
694 >            }
695 >            public <T> CompletableFuture<Void> runAfterEither
696 >                (CompletableFuture<T> f,
697 >                 CompletionStage<?> g,
698 >                 java.lang.Runnable a) {
699 >                return f.runAfterEitherAsync(g, a);
700 >            }
701 >            public <T> CompletableFuture<Void> acceptEither
702 >                (CompletableFuture<T> f,
703 >                 CompletionStage<? extends T> g,
704 >                 Consumer<? super T> a) {
705 >                return f.acceptEitherAsync(g, a);
706 >            }
707 >            public <T,U> CompletableFuture<U> applyToEither
708 >                (CompletableFuture<T> f,
709 >                 CompletionStage<? extends T> g,
710 >                 Function<? super T,U> a) {
711 >                return f.applyToEitherAsync(g, a);
712              }
713          },
714  
715          EXECUTOR {
716 +            public void checkExecutionMode() {
717 +                assertTrue(ThreadExecutor.startedCurrentThread());
718 +            }
719 +            public CompletableFuture<Void> runAsync(Runnable a) {
720 +                return CompletableFuture.runAsync(a, new ThreadExecutor());
721 +            }
722 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
723 +                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
724 +            }
725 +            public <T> CompletableFuture<Void> thenRun
726 +                (CompletableFuture<T> f, Runnable a) {
727 +                return f.thenRunAsync(a, new ThreadExecutor());
728 +            }
729 +            public <T> CompletableFuture<Void> thenAccept
730 +                (CompletableFuture<T> f, Consumer<? super T> a) {
731 +                return f.thenAcceptAsync(a, new ThreadExecutor());
732 +            }
733 +            public <T,U> CompletableFuture<U> thenApply
734 +                (CompletableFuture<T> f, Function<? super T,U> a) {
735 +                return f.thenApplyAsync(a, new ThreadExecutor());
736 +            }
737 +            public <T,U> CompletableFuture<U> thenCompose
738 +                (CompletableFuture<T> f,
739 +                 Function<? super T,? extends CompletionStage<U>> a) {
740 +                return f.thenComposeAsync(a, new ThreadExecutor());
741 +            }
742 +            public <T,U> CompletableFuture<U> handle
743 +                (CompletableFuture<T> f,
744 +                 BiFunction<? super T,Throwable,? extends U> a) {
745 +                return f.handleAsync(a, new ThreadExecutor());
746 +            }
747 +            public <T> CompletableFuture<T> whenComplete
748 +                (CompletableFuture<T> f,
749 +                 BiConsumer<? super T,? super Throwable> a) {
750 +                return f.whenCompleteAsync(a, new ThreadExecutor());
751 +            }
752              public <T,U> CompletableFuture<Void> runAfterBoth
753 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
754 <                return f.runAfterBothAsync(g, r, new ThreadExecutor());
753 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
754 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
755 >            }
756 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
757 >                (CompletableFuture<T> f,
758 >                 CompletionStage<? extends U> g,
759 >                 BiConsumer<? super T,? super U> a) {
760 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
761 >            }
762 >            public <T,U,V> CompletableFuture<V> thenCombine
763 >                (CompletableFuture<T> f,
764 >                 CompletionStage<? extends U> g,
765 >                 BiFunction<? super T,? super U,? extends V> a) {
766 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
767 >            }
768 >            public <T> CompletableFuture<Void> runAfterEither
769 >                (CompletableFuture<T> f,
770 >                 CompletionStage<?> g,
771 >                 java.lang.Runnable a) {
772 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
773 >            }
774 >            public <T> CompletableFuture<Void> acceptEither
775 >                (CompletableFuture<T> f,
776 >                 CompletionStage<? extends T> g,
777 >                 Consumer<? super T> a) {
778 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
779 >            }
780 >            public <T,U> CompletableFuture<U> applyToEither
781 >                (CompletableFuture<T> f,
782 >                 CompletionStage<? extends T> g,
783 >                 Function<? super T,U> a) {
784 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
785              }
786          };
787  
788 +        public abstract void checkExecutionMode();
789 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
790 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
791 +        public abstract <T> CompletableFuture<Void> thenRun
792 +            (CompletableFuture<T> f, Runnable a);
793 +        public abstract <T> CompletableFuture<Void> thenAccept
794 +            (CompletableFuture<T> f, Consumer<? super T> a);
795 +        public abstract <T,U> CompletableFuture<U> thenApply
796 +            (CompletableFuture<T> f, Function<? super T,U> a);
797 +        public abstract <T,U> CompletableFuture<U> thenCompose
798 +            (CompletableFuture<T> f,
799 +             Function<? super T,? extends CompletionStage<U>> a);
800 +        public abstract <T,U> CompletableFuture<U> handle
801 +            (CompletableFuture<T> f,
802 +             BiFunction<? super T,Throwable,? extends U> a);
803 +        public abstract <T> CompletableFuture<T> whenComplete
804 +            (CompletableFuture<T> f,
805 +             BiConsumer<? super T,? super Throwable> a);
806          public abstract <T,U> CompletableFuture<Void> runAfterBoth
807 <            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r);
807 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
808 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
809 >            (CompletableFuture<T> f,
810 >             CompletionStage<? extends U> g,
811 >             BiConsumer<? super T,? super U> a);
812 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
813 >            (CompletableFuture<T> f,
814 >             CompletionStage<? extends U> g,
815 >             BiFunction<? super T,? super U,? extends V> a);
816 >        public abstract <T> CompletableFuture<Void> runAfterEither
817 >            (CompletableFuture<T> f,
818 >             CompletionStage<?> g,
819 >             java.lang.Runnable a);
820 >        public abstract <T> CompletableFuture<Void> acceptEither
821 >            (CompletableFuture<T> f,
822 >             CompletionStage<? extends T> g,
823 >             Consumer<? super T> a);
824 >        public abstract <T,U> CompletableFuture<U> applyToEither
825 >            (CompletableFuture<T> f,
826 >             CompletionStage<? extends T> g,
827 >             Function<? super T,U> a);
828      }
829  
830      /**
831 <     * runAfterBoth result completes normally after normal
832 <     * completion of sources
831 >     * exceptionally action is not invoked when source completes
832 >     * normally, and source result is propagated
833       */
834 <    public void testRunAfterBoth_normalCompletion1() {
835 <        for (ExecutionMode m : ExecutionMode.values())
834 >    public void testExceptionally_normalCompletion() {
835 >        for (boolean createIncomplete : new boolean[] { true, false })
836          for (Integer v1 : new Integer[] { 1, null })
837 <        for (Integer v2 : new Integer[] { 2, null }) {
838 <
837 >    {
838 >        final AtomicInteger a = new AtomicInteger(0);
839          final CompletableFuture<Integer> f = new CompletableFuture<>();
840 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
841 <        final Noop r = new Noop();
842 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
843 <
844 <        f.complete(v1);
845 <        checkIncomplete(h);
846 <        assertFalse(r.ran);
847 <        g.complete(v2);
840 >        if (!createIncomplete) assertTrue(f.complete(v1));
841 >        final CompletableFuture<Integer> g = f.exceptionally
842 >            ((Throwable t) -> {
843 >                a.getAndIncrement();
844 >                threadFail("should not be called");
845 >                return null;            // unreached
846 >            });
847 >        if (createIncomplete) assertTrue(f.complete(v1));
848  
849 <        checkCompletedNormally(h, null);
999 <        assertTrue(r.ran);
849 >        checkCompletedNormally(g, v1);
850          checkCompletedNormally(f, v1);
851 <        checkCompletedNormally(g, v2);
852 <        }
1003 <    }
851 >        assertEquals(0, a.get());
852 >    }}
853  
854 <    public void testRunAfterBoth_normalCompletion2() {
855 <        for (ExecutionMode m : ExecutionMode.values())
854 >    /**
855 >     * exceptionally action completes with function value on source
856 >     * exception
857 >     */
858 >    public void testExceptionally_exceptionalCompletion() {
859 >        for (boolean createIncomplete : new boolean[] { true, false })
860          for (Integer v1 : new Integer[] { 1, null })
861 <        for (Integer v2 : new Integer[] { 2, null }) {
862 <
861 >    {
862 >        final AtomicInteger a = new AtomicInteger(0);
863 >        final CFException ex = new CFException();
864          final CompletableFuture<Integer> f = new CompletableFuture<>();
865 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
866 <        final Noop r = new Noop();
867 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
868 <
869 <        g.complete(v2);
870 <        checkIncomplete(h);
871 <        assertFalse(r.ran);
872 <        f.complete(v1);
873 <
1020 <        checkCompletedNormally(h, null);
1021 <        assertTrue(r.ran);
1022 <        checkCompletedNormally(f, v1);
1023 <        checkCompletedNormally(g, v2);
1024 <        }
1025 <    }
865 >        if (!createIncomplete) f.completeExceptionally(ex);
866 >        final CompletableFuture<Integer> g = f.exceptionally
867 >            ((Throwable t) -> {
868 >                ExecutionMode.SYNC.checkExecutionMode();
869 >                threadAssertSame(t, ex);
870 >                a.getAndIncrement();
871 >                return v1;
872 >            });
873 >        if (createIncomplete) f.completeExceptionally(ex);
874  
875 <    public void testRunAfterBoth_normalCompletion3() {
876 <        for (ExecutionMode m : ExecutionMode.values())
877 <        for (Integer v1 : new Integer[] { 1, null })
1030 <        for (Integer v2 : new Integer[] { 2, null }) {
875 >        checkCompletedNormally(g, v1);
876 >        assertEquals(1, a.get());
877 >    }}
878  
879 +    /**
880 +     * If an "exceptionally action" throws an exception, it completes
881 +     * exceptionally with that exception
882 +     */
883 +    public void testExceptionally_exceptionalCompletionActionFailed() {
884 +        for (boolean createIncomplete : new boolean[] { true, false })
885 +    {
886 +        final AtomicInteger a = new AtomicInteger(0);
887 +        final CFException ex1 = new CFException();
888 +        final CFException ex2 = new CFException();
889          final CompletableFuture<Integer> f = new CompletableFuture<>();
890 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
891 <        final Noop r = new Noop();
892 <
893 <        g.complete(v2);
894 <        f.complete(v1);
895 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
896 <
897 <        checkCompletedNormally(h, null);
898 <        assertTrue(r.ran);
899 <        checkCompletedNormally(f, v1);
900 <        checkCompletedNormally(g, v2);
901 <        }
902 <    }
890 >        if (!createIncomplete) f.completeExceptionally(ex1);
891 >        final CompletableFuture<Integer> g = f.exceptionally
892 >            ((Throwable t) -> {
893 >                ExecutionMode.SYNC.checkExecutionMode();
894 >                threadAssertSame(t, ex1);
895 >                a.getAndIncrement();
896 >                throw ex2;
897 >            });
898 >        if (createIncomplete) f.completeExceptionally(ex1);
899 >
900 >        checkCompletedWithWrappedException(g, ex2);
901 >        checkCompletedExceptionally(f, ex1);
902 >        assertEquals(1, a.get());
903 >    }}
904  
905 <    public void testRunAfterBoth_normalCompletion4() {
905 >    /**
906 >     * whenComplete action executes on normal completion, propagating
907 >     * source result.
908 >     */
909 >    public void testWhenComplete_normalCompletion() {
910          for (ExecutionMode m : ExecutionMode.values())
911 +        for (boolean createIncomplete : new boolean[] { true, false })
912          for (Integer v1 : new Integer[] { 1, null })
913 <        for (Integer v2 : new Integer[] { 2, null }) {
914 <
913 >    {
914 >        final AtomicInteger a = new AtomicInteger(0);
915          final CompletableFuture<Integer> f = new CompletableFuture<>();
916 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
917 <        final Noop r = new Noop();
916 >        if (!createIncomplete) assertTrue(f.complete(v1));
917 >        final CompletableFuture<Integer> g = m.whenComplete
918 >            (f,
919 >             (Integer result, Throwable t) -> {
920 >                m.checkExecutionMode();
921 >                threadAssertSame(result, v1);
922 >                threadAssertNull(t);
923 >                a.getAndIncrement();
924 >            });
925 >        if (createIncomplete) assertTrue(f.complete(v1));
926  
927 <        f.complete(v1);
1057 <        g.complete(v2);
1058 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1059 <
1060 <        checkCompletedNormally(h, null);
1061 <        assertTrue(r.ran);
927 >        checkCompletedNormally(g, v1);
928          checkCompletedNormally(f, v1);
929 <        checkCompletedNormally(g, v2);
930 <        }
1065 <    }
929 >        assertEquals(1, a.get());
930 >    }}
931  
932      /**
933 <     * runAfterBoth result completes exceptionally after exceptional
934 <     * completion of either source
933 >     * whenComplete action executes on exceptional completion, propagating
934 >     * source result.
935       */
936 <    public void testRunAfterBoth_exceptionalCompletion1() {
936 >    public void testWhenComplete_exceptionalCompletion() {
937          for (ExecutionMode m : ExecutionMode.values())
938 <        for (Integer v1 : new Integer[] { 1, null }) {
939 <
940 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1076 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1077 <        final Noop r = new Noop();
1078 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
938 >        for (boolean createIncomplete : new boolean[] { true, false })
939 >    {
940 >        final AtomicInteger a = new AtomicInteger(0);
941          final CFException ex = new CFException();
942 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
943 +        if (!createIncomplete) f.completeExceptionally(ex);
944 +        final CompletableFuture<Integer> g = m.whenComplete
945 +            (f,
946 +             (Integer result, Throwable t) -> {
947 +                m.checkExecutionMode();
948 +                threadAssertNull(result);
949 +                threadAssertSame(t, ex);
950 +                a.getAndIncrement();
951 +            });
952 +        if (createIncomplete) f.completeExceptionally(ex);
953 +
954 +        checkCompletedWithWrappedException(g, ex);
955 +        checkCompletedExceptionally(f, ex);
956 +        assertEquals(1, a.get());
957 +    }}
958  
959 <        f.completeExceptionally(ex);
960 <        checkIncomplete(h);
961 <        g.complete(v1);
962 <
963 <        checkCompletedWithWrappedCFException(h, ex);
1086 <        checkCompletedWithWrappedCFException(f, ex);
1087 <        assertFalse(r.ran);
1088 <        checkCompletedNormally(g, v1);
1089 <        }
1090 <    }
1091 <
1092 <    public void testRunAfterBoth_exceptionalCompletion2() {
959 >    /**
960 >     * whenComplete action executes on cancelled source, propagating
961 >     * CancellationException.
962 >     */
963 >    public void testWhenComplete_sourceCancelled() {
964          for (ExecutionMode m : ExecutionMode.values())
965 <        for (Integer v1 : new Integer[] { 1, null }) {
966 <
965 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
966 >        for (boolean createIncomplete : new boolean[] { true, false })
967 >    {
968 >        final AtomicInteger a = new AtomicInteger(0);
969          final CompletableFuture<Integer> f = new CompletableFuture<>();
970 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
971 <        final Noop r = new Noop();
972 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
973 <        final CFException ex = new CFException();
970 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
971 >        final CompletableFuture<Integer> g = m.whenComplete
972 >            (f,
973 >             (Integer result, Throwable t) -> {
974 >                m.checkExecutionMode();
975 >                threadAssertNull(result);
976 >                threadAssertTrue(t instanceof CancellationException);
977 >                a.getAndIncrement();
978 >            });
979 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
980  
981 <        g.completeExceptionally(ex);
982 <        checkIncomplete(h);
983 <        f.complete(v1);
984 <
1106 <        checkCompletedWithWrappedCFException(h, ex);
1107 <        checkCompletedWithWrappedCFException(g, ex);
1108 <        assertFalse(r.ran);
1109 <        checkCompletedNormally(f, v1);
1110 <        }
1111 <    }
981 >        checkCompletedWithWrappedCancellationException(g);
982 >        checkCancelled(f);
983 >        assertEquals(1, a.get());
984 >    }}
985  
986 <    public void testRunAfterBoth_exceptionalCompletion3() {
986 >    /**
987 >     * If a whenComplete action throws an exception when triggered by
988 >     * a normal completion, it completes exceptionally
989 >     */
990 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
991 >        for (boolean createIncomplete : new boolean[] { true, false })
992          for (ExecutionMode m : ExecutionMode.values())
993 <        for (Integer v1 : new Integer[] { 1, null }) {
994 <
995 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1118 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1119 <        final Noop r = new Noop();
993 >        for (Integer v1 : new Integer[] { 1, null })
994 >    {
995 >        final AtomicInteger a = new AtomicInteger(0);
996          final CFException ex = new CFException();
997 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
998 +        if (!createIncomplete) assertTrue(f.complete(v1));
999 +        final CompletableFuture<Integer> g = m.whenComplete
1000 +            (f,
1001 +             (Integer result, Throwable t) -> {
1002 +                m.checkExecutionMode();
1003 +                threadAssertSame(result, v1);
1004 +                threadAssertNull(t);
1005 +                a.getAndIncrement();
1006 +                throw ex;
1007 +            });
1008 +        if (createIncomplete) assertTrue(f.complete(v1));
1009  
1010 <        g.completeExceptionally(ex);
1123 <        f.complete(v1);
1124 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1125 <
1126 <        checkCompletedWithWrappedCFException(h, ex);
1127 <        checkCompletedWithWrappedCFException(g, ex);
1128 <        assertFalse(r.ran);
1010 >        checkCompletedWithWrappedException(g, ex);
1011          checkCompletedNormally(f, v1);
1012 <        }
1013 <    }
1012 >        assertEquals(1, a.get());
1013 >    }}
1014  
1015 <    public void testRunAfterBoth_exceptionalCompletion4() {
1015 >    /**
1016 >     * If a whenComplete action throws an exception when triggered by
1017 >     * a source completion that also throws an exception, the source
1018 >     * exception takes precedence (unlike handle)
1019 >     */
1020 >    public void testWhenComplete_sourceFailedActionFailed() {
1021 >        for (boolean createIncomplete : new boolean[] { true, false })
1022          for (ExecutionMode m : ExecutionMode.values())
1023 <        for (Integer v1 : new Integer[] { 1, null }) {
1024 <
1023 >    {
1024 >        final AtomicInteger a = new AtomicInteger(0);
1025 >        final CFException ex1 = new CFException();
1026 >        final CFException ex2 = new CFException();
1027          final CompletableFuture<Integer> f = new CompletableFuture<>();
1138        final CompletableFuture<Integer> g = new CompletableFuture<>();
1139        final Noop r = new Noop();
1140        final CFException ex = new CFException();
1028  
1029 <        f.completeExceptionally(ex);
1030 <        g.complete(v1);
1031 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1032 <
1033 <        checkCompletedWithWrappedCFException(h, ex);
1034 <        checkCompletedWithWrappedCFException(f, ex);
1035 <        assertFalse(r.ran);
1036 <        checkCompletedNormally(g, v1);
1037 <        }
1038 <    }
1029 >        if (!createIncomplete) f.completeExceptionally(ex1);
1030 >        final CompletableFuture<Integer> g = m.whenComplete
1031 >            (f,
1032 >             (Integer result, Throwable t) -> {
1033 >                m.checkExecutionMode();
1034 >                threadAssertSame(t, ex1);
1035 >                threadAssertNull(result);
1036 >                a.getAndIncrement();
1037 >                throw ex2;
1038 >            });
1039 >        if (createIncomplete) f.completeExceptionally(ex1);
1040 >
1041 >        checkCompletedWithWrappedException(g, ex1);
1042 >        checkCompletedExceptionally(f, ex1);
1043 >        assertEquals(1, ex1.getSuppressed().length);
1044 >        assertSame(ex2, ex1.getSuppressed()[0]);
1045 >        assertEquals(1, a.get());
1046 >    }}
1047  
1048      /**
1049 <     * runAfterBoth result completes exceptionally if action does
1049 >     * handle action completes normally with function value on normal
1050 >     * completion of source
1051       */
1052 <    public void testRunAfterBoth_actionFailed1() {
1052 >    public void testHandle_normalCompletion() {
1053          for (ExecutionMode m : ExecutionMode.values())
1054 +        for (boolean createIncomplete : new boolean[] { true, false })
1055          for (Integer v1 : new Integer[] { 1, null })
1056 <        for (Integer v2 : new Integer[] { 2, null }) {
1160 <
1056 >    {
1057          final CompletableFuture<Integer> f = new CompletableFuture<>();
1058 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1059 <        final FailingNoop r = new FailingNoop();
1060 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1058 >        final AtomicInteger a = new AtomicInteger(0);
1059 >        if (!createIncomplete) assertTrue(f.complete(v1));
1060 >        final CompletableFuture<Integer> g = m.handle
1061 >            (f,
1062 >             (Integer result, Throwable t) -> {
1063 >                m.checkExecutionMode();
1064 >                threadAssertSame(result, v1);
1065 >                threadAssertNull(t);
1066 >                a.getAndIncrement();
1067 >                return inc(v1);
1068 >            });
1069 >        if (createIncomplete) assertTrue(f.complete(v1));
1070  
1071 <        f.complete(v1);
1167 <        checkIncomplete(h);
1168 <        g.complete(v2);
1169 <
1170 <        checkCompletedWithWrappedCFException(h);
1071 >        checkCompletedNormally(g, inc(v1));
1072          checkCompletedNormally(f, v1);
1073 <        checkCompletedNormally(g, v2);
1074 <        }
1174 <    }
1073 >        assertEquals(1, a.get());
1074 >    }}
1075  
1076 <    public void testRunAfterBoth_actionFailed2() {
1076 >    /**
1077 >     * handle action completes normally with function value on
1078 >     * exceptional completion of source
1079 >     */
1080 >    public void testHandle_exceptionalCompletion() {
1081          for (ExecutionMode m : ExecutionMode.values())
1082 +        for (boolean createIncomplete : new boolean[] { true, false })
1083          for (Integer v1 : new Integer[] { 1, null })
1084 <        for (Integer v2 : new Integer[] { 2, null }) {
1180 <
1084 >    {
1085          final CompletableFuture<Integer> f = new CompletableFuture<>();
1086 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1087 <        final FailingNoop r = new FailingNoop();
1088 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1089 <
1090 <        g.complete(v2);
1091 <        checkIncomplete(h);
1092 <        f.complete(v1);
1086 >        final AtomicInteger a = new AtomicInteger(0);
1087 >        final CFException ex = new CFException();
1088 >        if (!createIncomplete) f.completeExceptionally(ex);
1089 >        final CompletableFuture<Integer> g = m.handle
1090 >            (f,
1091 >             (Integer result, Throwable t) -> {
1092 >                m.checkExecutionMode();
1093 >                threadAssertNull(result);
1094 >                threadAssertSame(t, ex);
1095 >                a.getAndIncrement();
1096 >                return v1;
1097 >            });
1098 >        if (createIncomplete) f.completeExceptionally(ex);
1099  
1100 <        checkCompletedWithWrappedCFException(h);
1101 <        checkCompletedNormally(f, v1);
1102 <        checkCompletedNormally(g, v2);
1103 <        }
1194 <    }
1100 >        checkCompletedNormally(g, v1);
1101 >        checkCompletedExceptionally(f, ex);
1102 >        assertEquals(1, a.get());
1103 >    }}
1104  
1105      /**
1106 <     * runAfterBoth result completes exceptionally if either source cancelled
1106 >     * handle action completes normally with function value on
1107 >     * cancelled source
1108       */
1109 <    public void testRunAfterBoth_sourceCancelled1() {
1109 >    public void testHandle_sourceCancelled() {
1110          for (ExecutionMode m : ExecutionMode.values())
1111          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1112 <        for (Integer v1 : new Integer[] { 1, null }) {
1113 <
1112 >        for (boolean createIncomplete : new boolean[] { true, false })
1113 >        for (Integer v1 : new Integer[] { 1, null })
1114 >    {
1115          final CompletableFuture<Integer> f = new CompletableFuture<>();
1116 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1117 <        final Noop r = new Noop();
1118 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1116 >        final AtomicInteger a = new AtomicInteger(0);
1117 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1118 >        final CompletableFuture<Integer> g = m.handle
1119 >            (f,
1120 >             (Integer result, Throwable t) -> {
1121 >                m.checkExecutionMode();
1122 >                threadAssertNull(result);
1123 >                threadAssertTrue(t instanceof CancellationException);
1124 >                a.getAndIncrement();
1125 >                return v1;
1126 >            });
1127 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1128  
1209        assertTrue(f.cancel(mayInterruptIfRunning));
1210        checkIncomplete(h);
1211        g.complete(v1);
1212
1213        checkCompletedWithWrappedCancellationException(h);
1214        checkCancelled(f);
1215        assertFalse(r.ran);
1129          checkCompletedNormally(g, v1);
1217        }
1218    }
1219
1220    public void testRunAfterBoth_sourceCancelled2() {
1221        for (ExecutionMode m : ExecutionMode.values())
1222        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1223        for (Integer v1 : new Integer[] { 1, null }) {
1224
1225        final CompletableFuture<Integer> f = new CompletableFuture<>();
1226        final CompletableFuture<Integer> g = new CompletableFuture<>();
1227        final Noop r = new Noop();
1228        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1229
1230        assertTrue(g.cancel(mayInterruptIfRunning));
1231        checkIncomplete(h);
1232        f.complete(v1);
1233
1234        checkCompletedWithWrappedCancellationException(h);
1235        checkCancelled(g);
1236        assertFalse(r.ran);
1237        checkCompletedNormally(f, v1);
1238        }
1239    }
1240
1241    public void testRunAfterBoth_sourceCancelled3() {
1242        for (ExecutionMode m : ExecutionMode.values())
1243        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1244        for (Integer v1 : new Integer[] { 1, null }) {
1245
1246        final CompletableFuture<Integer> f = new CompletableFuture<>();
1247        final CompletableFuture<Integer> g = new CompletableFuture<>();
1248        final Noop r = new Noop();
1249
1250        assertTrue(g.cancel(mayInterruptIfRunning));
1251        f.complete(v1);
1252        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1253
1254        checkCompletedWithWrappedCancellationException(h);
1255        checkCancelled(g);
1256        assertFalse(r.ran);
1257        checkCompletedNormally(f, v1);
1258        }
1259    }
1260
1261    public void testRunAfterBoth_sourceCancelled4() {
1262        for (ExecutionMode m : ExecutionMode.values())
1263        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1264        for (Integer v1 : new Integer[] { 1, null }) {
1265
1266        final CompletableFuture<Integer> f = new CompletableFuture<>();
1267        final CompletableFuture<Integer> g = new CompletableFuture<>();
1268        final Noop r = new Noop();
1269
1270        assertTrue(f.cancel(mayInterruptIfRunning));
1271        g.complete(v1);
1272        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1273
1274        checkCompletedWithWrappedCancellationException(h);
1130          checkCancelled(f);
1131 <        assertFalse(r.ran);
1132 <        checkCompletedNormally(g, v1);
1278 <        }
1279 <    }
1131 >        assertEquals(1, a.get());
1132 >    }}
1133  
1134      /**
1135 <     * applyToEither result completes normally after normal completion
1136 <     * of either source
1135 >     * If a "handle action" throws an exception when triggered by
1136 >     * a normal completion, it completes exceptionally
1137       */
1138 <    public void testApplyToEither() {
1139 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1140 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1141 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1142 <        f.complete(one);
1143 <        checkCompletedNormally(g, two);
1144 <        f2.complete(one);
1145 <        checkCompletedNormally(g, two);
1138 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1139 >        for (ExecutionMode m : ExecutionMode.values())
1140 >        for (boolean createIncomplete : new boolean[] { true, false })
1141 >        for (Integer v1 : new Integer[] { 1, null })
1142 >    {
1143 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1144 >        final AtomicInteger a = new AtomicInteger(0);
1145 >        final CFException ex = new CFException();
1146 >        if (!createIncomplete) assertTrue(f.complete(v1));
1147 >        final CompletableFuture<Integer> g = m.handle
1148 >            (f,
1149 >             (Integer result, Throwable t) -> {
1150 >                m.checkExecutionMode();
1151 >                threadAssertSame(result, v1);
1152 >                threadAssertNull(t);
1153 >                a.getAndIncrement();
1154 >                throw ex;
1155 >            });
1156 >        if (createIncomplete) assertTrue(f.complete(v1));
1157  
1158 <        f = new CompletableFuture<>();
1159 <        f.complete(one);
1160 <        f2 = new CompletableFuture<>();
1161 <        g = f.applyToEither(f2, inc);
1298 <        checkCompletedNormally(g, two);
1299 <    }
1158 >        checkCompletedWithWrappedException(g, ex);
1159 >        checkCompletedNormally(f, v1);
1160 >        assertEquals(1, a.get());
1161 >    }}
1162  
1163      /**
1164 <     * applyToEither result completes exceptionally after exceptional
1165 <     * completion of either source
1164 >     * If a "handle action" throws an exception when triggered by
1165 >     * a source completion that also throws an exception, the action
1166 >     * exception takes precedence (unlike whenComplete)
1167       */
1168 <    public void testApplyToEither2() {
1169 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1170 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1171 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1172 <        f.completeExceptionally(new CFException());
1173 <        f2.complete(one);
1174 <        checkCompletedWithWrappedCFException(g);
1168 >    public void testHandle_sourceFailedActionFailed() {
1169 >        for (boolean createIncomplete : new boolean[] { true, false })
1170 >        for (ExecutionMode m : ExecutionMode.values())
1171 >    {
1172 >        final AtomicInteger a = new AtomicInteger(0);
1173 >        final CFException ex1 = new CFException();
1174 >        final CFException ex2 = new CFException();
1175 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1176  
1177 <        f = new CompletableFuture<>();
1178 <        f2 = new CompletableFuture<>();
1179 <        f2.completeExceptionally(new CFException());
1180 <        g = f.applyToEither(f2, inc);
1181 <        checkCompletedWithWrappedCFException(g);
1182 <    }
1177 >        if (!createIncomplete) f.completeExceptionally(ex1);
1178 >        final CompletableFuture<Integer> g = m.handle
1179 >            (f,
1180 >             (Integer result, Throwable t) -> {
1181 >                m.checkExecutionMode();
1182 >                threadAssertNull(result);
1183 >                threadAssertSame(ex1, t);
1184 >                a.getAndIncrement();
1185 >                throw ex2;
1186 >            });
1187 >        if (createIncomplete) f.completeExceptionally(ex1);
1188 >
1189 >        checkCompletedWithWrappedException(g, ex2);
1190 >        checkCompletedExceptionally(f, ex1);
1191 >        assertEquals(1, a.get());
1192 >    }}
1193  
1194      /**
1195 <     * applyToEither result completes exceptionally if action does
1195 >     * runAsync completes after running Runnable
1196       */
1197 <    public void testApplyToEither3() {
1198 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1199 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1200 <        FailingFunction r = new FailingFunction();
1201 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1202 <        f2.complete(two);
1203 <        checkCompletedWithWrappedCFException(g);
1204 <    }
1197 >    public void testRunAsync_normalCompletion() {
1198 >        ExecutionMode[] executionModes = {
1199 >            ExecutionMode.ASYNC,
1200 >            ExecutionMode.EXECUTOR,
1201 >        };
1202 >        for (ExecutionMode m : executionModes)
1203 >    {
1204 >        final Noop r = new Noop(m);
1205 >        final CompletableFuture<Void> f = m.runAsync(r);
1206 >        assertNull(f.join());
1207 >        checkCompletedNormally(f, null);
1208 >        r.assertInvoked();
1209 >    }}
1210  
1211      /**
1212 <     * applyToEither result completes exceptionally if either source cancelled
1212 >     * failing runAsync completes exceptionally after running Runnable
1213       */
1214 <    public void testApplyToEither4() {
1215 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1216 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1217 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1218 <        assertTrue(f.cancel(true));
1219 <        checkCompletedWithWrappedCancellationException(g);
1220 <        f = new CompletableFuture<>();
1221 <        f2 = new CompletableFuture<>();
1222 <        assertTrue(f2.cancel(true));
1223 <        checkCompletedWithWrappedCancellationException(g);
1224 <    }
1214 >    public void testRunAsync_exceptionalCompletion() {
1215 >        ExecutionMode[] executionModes = {
1216 >            ExecutionMode.ASYNC,
1217 >            ExecutionMode.EXECUTOR,
1218 >        };
1219 >        for (ExecutionMode m : executionModes)
1220 >    {
1221 >        final FailingRunnable r = new FailingRunnable(m);
1222 >        final CompletableFuture<Void> f = m.runAsync(r);
1223 >        checkCompletedWithWrappedCFException(f);
1224 >        r.assertInvoked();
1225 >    }}
1226  
1227      /**
1228 <     * acceptEither result completes normally after normal completion
1349 <     * of either source
1228 >     * supplyAsync completes with result of supplier
1229       */
1230 <    public void testAcceptEither() {
1231 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1232 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1233 <        IncAction r = new IncAction();
1234 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1235 <        f.complete(one);
1236 <        checkCompletedNormally(g, null);
1237 <        f2.complete(one);
1238 <        checkCompletedNormally(g, null);
1239 <        assertEquals(r.value, 2);
1240 <
1241 <        r = new IncAction();
1242 <        f = new CompletableFuture<>();
1243 <        f.complete(one);
1365 <        f2 = new CompletableFuture<>();
1366 <        g = f.acceptEither(f2, r);
1367 <        checkCompletedNormally(g, null);
1368 <        assertEquals(r.value, 2);
1369 <    }
1230 >    public void testSupplyAsync_normalCompletion() {
1231 >        ExecutionMode[] executionModes = {
1232 >            ExecutionMode.ASYNC,
1233 >            ExecutionMode.EXECUTOR,
1234 >        };
1235 >        for (ExecutionMode m : executionModes)
1236 >        for (Integer v1 : new Integer[] { 1, null })
1237 >    {
1238 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1239 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1240 >        assertSame(v1, f.join());
1241 >        checkCompletedNormally(f, v1);
1242 >        r.assertInvoked();
1243 >    }}
1244  
1245      /**
1246 <     * acceptEither result completes exceptionally after exceptional
1373 <     * completion of either source
1246 >     * Failing supplyAsync completes exceptionally
1247       */
1248 <    public void testAcceptEither2() {
1249 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1250 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1251 <        IncAction r = new IncAction();
1252 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1253 <        f.completeExceptionally(new CFException());
1254 <        f2.complete(one);
1255 <        checkCompletedWithWrappedCFException(g);
1248 >    public void testSupplyAsync_exceptionalCompletion() {
1249 >        ExecutionMode[] executionModes = {
1250 >            ExecutionMode.ASYNC,
1251 >            ExecutionMode.EXECUTOR,
1252 >        };
1253 >        for (ExecutionMode m : executionModes)
1254 >    {
1255 >        FailingSupplier r = new FailingSupplier(m);
1256 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1257 >        checkCompletedWithWrappedCFException(f);
1258 >        r.assertInvoked();
1259 >    }}
1260  
1261 <        r = new IncAction();
1385 <        f = new CompletableFuture<>();
1386 <        f2 = new CompletableFuture<>();
1387 <        f2.completeExceptionally(new CFException());
1388 <        g = f.acceptEither(f2, r);
1389 <        checkCompletedWithWrappedCFException(g);
1390 <    }
1261 >    // seq completion methods
1262  
1263      /**
1264 <     * acceptEither result completes exceptionally if action does
1264 >     * thenRun result completes normally after normal completion of source
1265       */
1266 <    public void testAcceptEither3() {
1267 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1268 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1269 <        FailingConsumer r = new FailingConsumer();
1270 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1271 <        f2.complete(two);
1272 <        checkCompletedWithWrappedCFException(g);
1402 <    }
1266 >    public void testThenRun_normalCompletion() {
1267 >        for (ExecutionMode m : ExecutionMode.values())
1268 >        for (Integer v1 : new Integer[] { 1, null })
1269 >    {
1270 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1271 >        final Noop[] rs = new Noop[6];
1272 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1273  
1274 <    /**
1275 <     * acceptEither result completes exceptionally if either source cancelled
1276 <     */
1277 <    public void testAcceptEither4() {
1278 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1279 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1280 <        IncAction r = new IncAction();
1281 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1282 <        assertTrue(f.cancel(true));
1283 <        checkCompletedWithWrappedCancellationException(g);
1284 <        f = new CompletableFuture<>();
1285 <        f2 = new CompletableFuture<>();
1286 <        assertTrue(f2.cancel(true));
1287 <        checkCompletedWithWrappedCancellationException(g);
1288 <    }
1274 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1275 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1276 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1277 >        checkIncomplete(h0);
1278 >        checkIncomplete(h1);
1279 >        checkIncomplete(h2);
1280 >        assertTrue(f.complete(v1));
1281 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1282 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1283 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1284 >
1285 >        checkCompletedNormally(h0, null);
1286 >        checkCompletedNormally(h1, null);
1287 >        checkCompletedNormally(h2, null);
1288 >        checkCompletedNormally(h3, null);
1289 >        checkCompletedNormally(h4, null);
1290 >        checkCompletedNormally(h5, null);
1291 >        checkCompletedNormally(f, v1);
1292 >        for (Noop r : rs) r.assertInvoked();
1293 >    }}
1294  
1295      /**
1296 <     * runAfterEither result completes normally after normal completion
1297 <     * of either source
1296 >     * thenRun result completes exceptionally after exceptional
1297 >     * completion of source
1298       */
1299 <    public void testRunAfterEither() {
1300 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1301 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1302 <        Noop r = new Noop();
1303 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1304 <        f.complete(one);
1305 <        checkCompletedNormally(g, null);
1431 <        f2.complete(one);
1432 <        checkCompletedNormally(g, null);
1433 <        assertTrue(r.ran);
1299 >    public void testThenRun_exceptionalCompletion() {
1300 >        for (ExecutionMode m : ExecutionMode.values())
1301 >    {
1302 >        final CFException ex = new CFException();
1303 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1304 >        final Noop[] rs = new Noop[6];
1305 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1306  
1307 <        r = new Noop();
1308 <        f = new CompletableFuture<>();
1309 <        f.complete(one);
1310 <        f2 = new CompletableFuture<>();
1311 <        g = f.runAfterEither(f2, r);
1312 <        checkCompletedNormally(g, null);
1313 <        assertTrue(r.ran);
1314 <    }
1307 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1308 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1309 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1310 >        checkIncomplete(h0);
1311 >        checkIncomplete(h1);
1312 >        checkIncomplete(h2);
1313 >        assertTrue(f.completeExceptionally(ex));
1314 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1315 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1316 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1317 >
1318 >        checkCompletedWithWrappedException(h0, ex);
1319 >        checkCompletedWithWrappedException(h1, ex);
1320 >        checkCompletedWithWrappedException(h2, ex);
1321 >        checkCompletedWithWrappedException(h3, ex);
1322 >        checkCompletedWithWrappedException(h4, ex);
1323 >        checkCompletedWithWrappedException(h5, ex);
1324 >        checkCompletedExceptionally(f, ex);
1325 >        for (Noop r : rs) r.assertNotInvoked();
1326 >    }}
1327  
1328      /**
1329 <     * runAfterEither result completes exceptionally after exceptional
1446 <     * completion of either source
1329 >     * thenRun result completes exceptionally if source cancelled
1330       */
1331 <    public void testRunAfterEither2() {
1332 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1333 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1334 <        Noop r = new Noop();
1335 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1336 <        f.completeExceptionally(new CFException());
1337 <        f2.complete(one);
1455 <        checkCompletedWithWrappedCFException(g);
1331 >    public void testThenRun_sourceCancelled() {
1332 >        for (ExecutionMode m : ExecutionMode.values())
1333 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1334 >    {
1335 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1336 >        final Noop[] rs = new Noop[6];
1337 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1338  
1339 <        r = new Noop();
1340 <        f = new CompletableFuture<>();
1341 <        f2 = new CompletableFuture<>();
1342 <        f2.completeExceptionally(new CFException());
1343 <        g = f.runAfterEither(f2, r);
1344 <        checkCompletedWithWrappedCFException(g);
1345 <    }
1339 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1340 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1341 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1342 >        checkIncomplete(h0);
1343 >        checkIncomplete(h1);
1344 >        checkIncomplete(h2);
1345 >        assertTrue(f.cancel(mayInterruptIfRunning));
1346 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1347 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1348 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1349 >
1350 >        checkCompletedWithWrappedCancellationException(h0);
1351 >        checkCompletedWithWrappedCancellationException(h1);
1352 >        checkCompletedWithWrappedCancellationException(h2);
1353 >        checkCompletedWithWrappedCancellationException(h3);
1354 >        checkCompletedWithWrappedCancellationException(h4);
1355 >        checkCompletedWithWrappedCancellationException(h5);
1356 >        checkCancelled(f);
1357 >        for (Noop r : rs) r.assertNotInvoked();
1358 >    }}
1359  
1360      /**
1361 <     * runAfterEither result completes exceptionally if action does
1361 >     * thenRun result completes exceptionally if action does
1362       */
1363 <    public void testRunAfterEither3() {
1364 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1365 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1366 <        FailingNoop r = new FailingNoop();
1367 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1368 <        f2.complete(two);
1369 <        checkCompletedWithWrappedCFException(g);
1475 <    }
1363 >    public void testThenRun_actionFailed() {
1364 >        for (ExecutionMode m : ExecutionMode.values())
1365 >        for (Integer v1 : new Integer[] { 1, null })
1366 >    {
1367 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1368 >        final FailingRunnable[] rs = new FailingRunnable[6];
1369 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1370  
1371 <    /**
1372 <     * runAfterEither result completes exceptionally if either source cancelled
1373 <     */
1374 <    public void testRunAfterEither4() {
1375 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1376 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1377 <        Noop r = new Noop();
1378 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1379 <        assertTrue(f.cancel(true));
1380 <        checkCompletedWithWrappedCancellationException(g);
1381 <        f = new CompletableFuture<>();
1382 <        f2 = new CompletableFuture<>();
1383 <        assertTrue(f2.cancel(true));
1384 <        checkCompletedWithWrappedCancellationException(g);
1385 <    }
1371 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1372 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1373 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1374 >        assertTrue(f.complete(v1));
1375 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1376 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1377 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1378 >
1379 >        checkCompletedWithWrappedCFException(h0);
1380 >        checkCompletedWithWrappedCFException(h1);
1381 >        checkCompletedWithWrappedCFException(h2);
1382 >        checkCompletedWithWrappedCFException(h3);
1383 >        checkCompletedWithWrappedCFException(h4);
1384 >        checkCompletedWithWrappedCFException(h5);
1385 >        checkCompletedNormally(f, v1);
1386 >    }}
1387  
1388      /**
1389 <     * thenCompose result completes normally after normal completion of source
1389 >     * thenApply result completes normally after normal completion of source
1390       */
1391 <    public void testThenCompose() {
1392 <        CompletableFuture<Integer> f, g;
1393 <        CompletableFutureInc r;
1394 <
1395 <        f = new CompletableFuture<>();
1396 <        g = f.thenCompose(r = new CompletableFutureInc());
1397 <        f.complete(one);
1503 <        checkCompletedNormally(g, two);
1504 <        assertTrue(r.ran);
1391 >    public void testThenApply_normalCompletion() {
1392 >        for (ExecutionMode m : ExecutionMode.values())
1393 >        for (Integer v1 : new Integer[] { 1, null })
1394 >    {
1395 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1396 >        final IncFunction[] rs = new IncFunction[4];
1397 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1398  
1399 <        f = new CompletableFuture<>();
1400 <        f.complete(one);
1401 <        g = f.thenCompose(r = new CompletableFutureInc());
1402 <        checkCompletedNormally(g, two);
1403 <        assertTrue(r.ran);
1404 <    }
1399 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1400 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1401 >        checkIncomplete(h0);
1402 >        checkIncomplete(h1);
1403 >        assertTrue(f.complete(v1));
1404 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1405 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1406 >
1407 >        checkCompletedNormally(h0, inc(v1));
1408 >        checkCompletedNormally(h1, inc(v1));
1409 >        checkCompletedNormally(h2, inc(v1));
1410 >        checkCompletedNormally(h3, inc(v1));
1411 >        checkCompletedNormally(f, v1);
1412 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1413 >    }}
1414  
1415      /**
1416 <     * thenCompose result completes exceptionally after exceptional
1416 >     * thenApply result completes exceptionally after exceptional
1417       * completion of source
1418       */
1419 <    public void testThenCompose2() {
1420 <        CompletableFuture<Integer> f, g;
1421 <        CompletableFutureInc r;
1422 <
1423 <        f = new CompletableFuture<>();
1424 <        g = f.thenCompose(r = new CompletableFutureInc());
1425 <        f.completeExceptionally(new CFException());
1524 <        checkCompletedWithWrappedCFException(g);
1525 <
1526 <        f = new CompletableFuture<>();
1527 <        f.completeExceptionally(new CFException());
1528 <        g = f.thenCompose(r = new CompletableFutureInc());
1529 <        checkCompletedWithWrappedCFException(g);
1530 <    }
1531 <
1532 <    /**
1533 <     * thenCompose result completes exceptionally if action does
1534 <     */
1535 <    public void testThenCompose3() {
1536 <        CompletableFuture<Integer> f, g;
1537 <        FailingCompletableFutureFunction r;
1538 <
1539 <        f = new CompletableFuture<>();
1540 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1541 <        f.complete(one);
1542 <        checkCompletedWithWrappedCFException(g);
1419 >    public void testThenApply_exceptionalCompletion() {
1420 >        for (ExecutionMode m : ExecutionMode.values())
1421 >    {
1422 >        final CFException ex = new CFException();
1423 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1424 >        final IncFunction[] rs = new IncFunction[4];
1425 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1426  
1427 <        f = new CompletableFuture<>();
1428 <        f.complete(one);
1429 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1430 <        checkCompletedWithWrappedCFException(g);
1431 <    }
1427 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1428 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1429 >        assertTrue(f.completeExceptionally(ex));
1430 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1431 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1432 >
1433 >        checkCompletedWithWrappedException(h0, ex);
1434 >        checkCompletedWithWrappedException(h1, ex);
1435 >        checkCompletedWithWrappedException(h2, ex);
1436 >        checkCompletedWithWrappedException(h3, ex);
1437 >        checkCompletedExceptionally(f, ex);
1438 >        for (IncFunction r : rs) r.assertNotInvoked();
1439 >    }}
1440  
1441      /**
1442 <     * thenCompose result completes exceptionally if source cancelled
1442 >     * thenApply result completes exceptionally if source cancelled
1443       */
1444 <    public void testThenCompose4() {
1445 <        CompletableFuture<Integer> f, g;
1446 <        CompletableFutureInc r;
1447 <
1448 <        f = new CompletableFuture<>();
1449 <        g = f.thenCompose(r = new CompletableFutureInc());
1450 <        assertTrue(f.cancel(true));
1560 <        checkCompletedWithWrappedCancellationException(g);
1561 <
1562 <        f = new CompletableFuture<>();
1563 <        assertTrue(f.cancel(true));
1564 <        g = f.thenCompose(r = new CompletableFutureInc());
1565 <        checkCompletedWithWrappedCancellationException(g);
1566 <    }
1567 <
1568 <    // asyncs
1444 >    public void testThenApply_sourceCancelled() {
1445 >        for (ExecutionMode m : ExecutionMode.values())
1446 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1447 >    {
1448 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1449 >        final IncFunction[] rs = new IncFunction[4];
1450 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1451  
1452 <    /**
1453 <     * thenRunAsync result completes normally after normal completion of source
1454 <     */
1455 <    public void testThenRunAsync() {
1456 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1575 <        Noop r = new Noop();
1576 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1577 <        f.complete(null);
1578 <        checkCompletedNormally(g, null);
1452 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1453 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1454 >        assertTrue(f.cancel(mayInterruptIfRunning));
1455 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1456 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1457  
1458 <        // reordered version
1459 <        f = new CompletableFuture<>();
1460 <        f.complete(null);
1461 <        r = new Noop();
1462 <        g = f.thenRunAsync(r);
1463 <        checkCompletedNormally(g, null);
1464 <    }
1458 >        checkCompletedWithWrappedCancellationException(h0);
1459 >        checkCompletedWithWrappedCancellationException(h1);
1460 >        checkCompletedWithWrappedCancellationException(h2);
1461 >        checkCompletedWithWrappedCancellationException(h3);
1462 >        checkCancelled(f);
1463 >        for (IncFunction r : rs) r.assertNotInvoked();
1464 >    }}
1465  
1466      /**
1467 <     * thenRunAsync result completes exceptionally after exceptional
1590 <     * completion of source
1467 >     * thenApply result completes exceptionally if action does
1468       */
1469 <    public void testThenRunAsync2() {
1470 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1471 <        Noop r = new Noop();
1472 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1473 <        f.completeExceptionally(new CFException());
1474 <        try {
1475 <            g.join();
1599 <            shouldThrow();
1600 <        } catch (CompletionException success) {}
1601 <        checkCompletedWithWrappedCFException(g);
1602 <    }
1469 >    public void testThenApply_actionFailed() {
1470 >        for (ExecutionMode m : ExecutionMode.values())
1471 >        for (Integer v1 : new Integer[] { 1, null })
1472 >    {
1473 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1474 >        final FailingFunction[] rs = new FailingFunction[4];
1475 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1476  
1477 <    /**
1478 <     * thenRunAsync result completes exceptionally if action does
1479 <     */
1480 <    public void testThenRunAsync3() {
1481 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1482 <        FailingNoop r = new FailingNoop();
1483 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1484 <        f.complete(null);
1485 <        checkCompletedWithWrappedCFException(g);
1486 <    }
1477 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1478 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1479 >        assertTrue(f.complete(v1));
1480 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1481 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1482 >
1483 >        checkCompletedWithWrappedCFException(h0);
1484 >        checkCompletedWithWrappedCFException(h1);
1485 >        checkCompletedWithWrappedCFException(h2);
1486 >        checkCompletedWithWrappedCFException(h3);
1487 >        checkCompletedNormally(f, v1);
1488 >    }}
1489  
1490      /**
1491 <     * thenRunAsync result completes exceptionally if source cancelled
1491 >     * thenAccept result completes normally after normal completion of source
1492       */
1493 <    public void testThenRunAsync4() {
1494 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1495 <        Noop r = new Noop();
1496 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1497 <        assertTrue(f.cancel(true));
1498 <        checkCompletedWithWrappedCancellationException(g);
1499 <    }
1493 >    public void testThenAccept_normalCompletion() {
1494 >        for (ExecutionMode m : ExecutionMode.values())
1495 >        for (Integer v1 : new Integer[] { 1, null })
1496 >    {
1497 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1498 >        final NoopConsumer[] rs = new NoopConsumer[4];
1499 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1500  
1501 <    /**
1502 <     * thenApplyAsync result completes normally after normal completion of source
1503 <     */
1504 <    public void testThenApplyAsync() {
1505 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1506 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1507 <        f.complete(one);
1508 <        checkCompletedNormally(g, two);
1509 <    }
1501 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1502 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1503 >        checkIncomplete(h0);
1504 >        checkIncomplete(h1);
1505 >        assertTrue(f.complete(v1));
1506 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1507 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1508 >
1509 >        checkCompletedNormally(h0, null);
1510 >        checkCompletedNormally(h1, null);
1511 >        checkCompletedNormally(h2, null);
1512 >        checkCompletedNormally(h3, null);
1513 >        checkCompletedNormally(f, v1);
1514 >        for (NoopConsumer r : rs) r.assertValue(v1);
1515 >    }}
1516  
1517      /**
1518 <     * thenApplyAsync result completes exceptionally after exceptional
1518 >     * thenAccept result completes exceptionally after exceptional
1519       * completion of source
1520       */
1521 <    public void testThenApplyAsync2() {
1522 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1523 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1524 <        f.completeExceptionally(new CFException());
1525 <        checkCompletedWithWrappedCFException(g);
1526 <    }
1521 >    public void testThenAccept_exceptionalCompletion() {
1522 >        for (ExecutionMode m : ExecutionMode.values())
1523 >    {
1524 >        final CFException ex = new CFException();
1525 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1526 >        final NoopConsumer[] rs = new NoopConsumer[4];
1527 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1528  
1529 <    /**
1530 <     * thenApplyAsync result completes exceptionally if action does
1531 <     */
1532 <    public void testThenApplyAsync3() {
1533 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1534 <        FailingFunction r = new FailingFunction();
1535 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1536 <        f.complete(null);
1537 <        checkCompletedWithWrappedCFException(g);
1538 <    }
1529 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1530 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1531 >        assertTrue(f.completeExceptionally(ex));
1532 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1533 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1534 >
1535 >        checkCompletedWithWrappedException(h0, ex);
1536 >        checkCompletedWithWrappedException(h1, ex);
1537 >        checkCompletedWithWrappedException(h2, ex);
1538 >        checkCompletedWithWrappedException(h3, ex);
1539 >        checkCompletedExceptionally(f, ex);
1540 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1541 >    }}
1542  
1543      /**
1544 <     * thenApplyAsync result completes exceptionally if source cancelled
1544 >     * thenAccept result completes exceptionally if source cancelled
1545       */
1546 <    public void testThenApplyAsync4() {
1547 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1548 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1549 <        assertTrue(f.cancel(true));
1550 <        checkCompletedWithWrappedCancellationException(g);
1551 <    }
1546 >    public void testThenAccept_sourceCancelled() {
1547 >        for (ExecutionMode m : ExecutionMode.values())
1548 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1549 >    {
1550 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1551 >        final NoopConsumer[] rs = new NoopConsumer[4];
1552 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1553  
1554 <    /**
1555 <     * thenAcceptAsync result completes normally after normal
1556 <     * completion of source
1557 <     */
1558 <    public void testThenAcceptAsync() {
1673 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1674 <        IncAction r = new IncAction();
1675 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1676 <        f.complete(one);
1677 <        checkCompletedNormally(g, null);
1678 <        assertEquals(r.value, 2);
1679 <    }
1554 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1555 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1556 >        assertTrue(f.cancel(mayInterruptIfRunning));
1557 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1558 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1559  
1560 <    /**
1561 <     * thenAcceptAsync result completes exceptionally after exceptional
1562 <     * completion of source
1563 <     */
1564 <    public void testThenAcceptAsync2() {
1565 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1566 <        IncAction r = new IncAction();
1688 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1689 <        f.completeExceptionally(new CFException());
1690 <        checkCompletedWithWrappedCFException(g);
1691 <    }
1560 >        checkCompletedWithWrappedCancellationException(h0);
1561 >        checkCompletedWithWrappedCancellationException(h1);
1562 >        checkCompletedWithWrappedCancellationException(h2);
1563 >        checkCompletedWithWrappedCancellationException(h3);
1564 >        checkCancelled(f);
1565 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1566 >    }}
1567  
1568      /**
1569 <     * thenAcceptAsync result completes exceptionally if action does
1569 >     * thenAccept result completes exceptionally if action does
1570       */
1571 <    public void testThenAcceptAsync3() {
1572 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1573 <        FailingConsumer r = new FailingConsumer();
1574 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1575 <        f.complete(null);
1576 <        checkCompletedWithWrappedCFException(g);
1577 <    }
1571 >    public void testThenAccept_actionFailed() {
1572 >        for (ExecutionMode m : ExecutionMode.values())
1573 >        for (Integer v1 : new Integer[] { 1, null })
1574 >    {
1575 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1576 >        final FailingConsumer[] rs = new FailingConsumer[4];
1577 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1578  
1579 <    /**
1580 <     * thenAcceptAsync result completes exceptionally if source cancelled
1581 <     */
1582 <    public void testThenAcceptAsync4() {
1583 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1584 <        IncAction r = new IncAction();
1585 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1586 <        assertTrue(f.cancel(true));
1587 <        checkCompletedWithWrappedCancellationException(g);
1588 <    }
1579 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1580 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1581 >        assertTrue(f.complete(v1));
1582 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1583 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1584 >
1585 >        checkCompletedWithWrappedCFException(h0);
1586 >        checkCompletedWithWrappedCFException(h1);
1587 >        checkCompletedWithWrappedCFException(h2);
1588 >        checkCompletedWithWrappedCFException(h3);
1589 >        checkCompletedNormally(f, v1);
1590 >    }}
1591  
1592      /**
1593 <     * thenCombineAsync result completes normally after normal
1594 <     * completion of sources
1593 >     * thenCombine result completes normally after normal completion
1594 >     * of sources
1595       */
1596 <    public void testThenCombineAsync() {
1597 <        CompletableFuture<Integer> f, g, h;
1598 <
1599 <        f = new CompletableFuture<>();
1600 <        g = new CompletableFuture<>();
1601 <        h = f.thenCombineAsync(g, subtract);
1602 <        f.complete(3);
1603 <        checkIncomplete(h);
1604 <        g.complete(1);
1605 <        checkCompletedNormally(h, 2);
1596 >    public void testThenCombine_normalCompletion() {
1597 >        for (ExecutionMode m : ExecutionMode.values())
1598 >        for (boolean fFirst : new boolean[] { true, false })
1599 >        for (Integer v1 : new Integer[] { 1, null })
1600 >        for (Integer v2 : new Integer[] { 2, null })
1601 >    {
1602 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1603 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1604 >        final SubtractFunction[] rs = new SubtractFunction[6];
1605 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1606  
1607 <        f = new CompletableFuture<>();
1608 <        g = new CompletableFuture<>();
1609 <        h = f.thenCombineAsync(g, subtract);
1610 <        g.complete(1);
1611 <        checkIncomplete(h);
1612 <        f.complete(3);
1613 <        checkCompletedNormally(h, 2);
1607 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1608 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1609 >        final Integer w1 =  fFirst ? v1 : v2;
1610 >        final Integer w2 = !fFirst ? v1 : v2;
1611 >
1612 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1613 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1614 >        assertTrue(fst.complete(w1));
1615 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1616 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1617 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1618 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1619 >        checkCompletedNormally(h1, subtract(w1, w1));
1620 >        checkCompletedNormally(h3, subtract(w1, w1));
1621 >        rs[1].assertValue(subtract(w1, w1));
1622 >        rs[3].assertValue(subtract(w1, w1));
1623 >        assertTrue(snd.complete(w2));
1624 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1625 >
1626 >        checkCompletedNormally(h0, subtract(v1, v2));
1627 >        checkCompletedNormally(h2, subtract(v1, v2));
1628 >        checkCompletedNormally(h4, subtract(v1, v2));
1629 >        rs[0].assertValue(subtract(v1, v2));
1630 >        rs[2].assertValue(subtract(v1, v2));
1631 >        rs[4].assertValue(subtract(v1, v2));
1632  
1633 <        f = new CompletableFuture<>();
1634 <        g = new CompletableFuture<>();
1635 <        g.complete(1);
1741 <        f.complete(3);
1742 <        h = f.thenCombineAsync(g, subtract);
1743 <        checkCompletedNormally(h, 2);
1744 <    }
1633 >        checkCompletedNormally(f, v1);
1634 >        checkCompletedNormally(g, v2);
1635 >    }}
1636  
1637      /**
1638 <     * thenCombineAsync result completes exceptionally after exceptional
1638 >     * thenCombine result completes exceptionally after exceptional
1639       * completion of either source
1640       */
1641 <    public void testThenCombineAsync2() {
1642 <        CompletableFuture<Integer> f, g, h;
1643 <
1644 <        f = new CompletableFuture<>();
1645 <        g = new CompletableFuture<>();
1646 <        h = f.thenCombineAsync(g, subtract);
1647 <        f.completeExceptionally(new CFException());
1648 <        checkIncomplete(h);
1649 <        g.complete(1);
1650 <        checkCompletedWithWrappedCFException(h);
1651 <
1652 <        f = new CompletableFuture<>();
1653 <        g = new CompletableFuture<>();
1654 <        h = f.thenCombineAsync(g, subtract);
1655 <        g.completeExceptionally(new CFException());
1656 <        checkIncomplete(h);
1657 <        f.complete(3);
1658 <        checkCompletedWithWrappedCFException(h);
1659 <
1660 <        f = new CompletableFuture<>();
1661 <        g = new CompletableFuture<>();
1662 <        g.completeExceptionally(new CFException());
1663 <        f.complete(3);
1664 <        h = f.thenCombineAsync(g, subtract);
1665 <        checkCompletedWithWrappedCFException(h);
1666 <    }
1667 <
1668 <    /**
1669 <     * thenCombineAsync result completes exceptionally if action does
1670 <     */
1671 <    public void testThenCombineAsync3() {
1672 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1673 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1674 <        FailingBiFunction r = new FailingBiFunction();
1675 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1676 <        f.complete(one);
1677 <        checkIncomplete(g);
1678 <        assertFalse(r.ran);
1679 <        f2.complete(two);
1789 <        checkCompletedWithWrappedCFException(g);
1790 <        assertTrue(r.ran);
1791 <    }
1792 <
1793 <    /**
1794 <     * thenCombineAsync result completes exceptionally if either source cancelled
1795 <     */
1796 <    public void testThenCombineAsync4() {
1797 <        CompletableFuture<Integer> f, g, h;
1798 <
1799 <        f = new CompletableFuture<>();
1800 <        g = new CompletableFuture<>();
1801 <        h = f.thenCombineAsync(g, subtract);
1802 <        assertTrue(f.cancel(true));
1803 <        checkIncomplete(h);
1804 <        g.complete(1);
1805 <        checkCompletedWithWrappedCancellationException(h);
1806 <
1807 <        f = new CompletableFuture<>();
1808 <        g = new CompletableFuture<>();
1809 <        h = f.thenCombineAsync(g, subtract);
1810 <        assertTrue(g.cancel(true));
1811 <        checkIncomplete(h);
1812 <        f.complete(3);
1813 <        checkCompletedWithWrappedCancellationException(h);
1814 <
1815 <        f = new CompletableFuture<>();
1816 <        g = new CompletableFuture<>();
1817 <        g.complete(3);
1818 <        assertTrue(f.cancel(true));
1819 <        h = f.thenCombineAsync(g, subtract);
1820 <        checkCompletedWithWrappedCancellationException(h);
1821 <
1822 <        f = new CompletableFuture<>();
1823 <        g = new CompletableFuture<>();
1824 <        f.complete(3);
1825 <        assertTrue(g.cancel(true));
1826 <        h = f.thenCombineAsync(g, subtract);
1827 <        checkCompletedWithWrappedCancellationException(h);
1828 <    }
1829 <
1830 <    /**
1831 <     * thenAcceptBothAsync result completes normally after normal
1832 <     * completion of sources
1833 <     */
1834 <    public void testThenAcceptBothAsync() {
1835 <        CompletableFuture<Integer> f, g;
1836 <        CompletableFuture<Void> h;
1837 <        SubtractAction r;
1838 <
1839 <        f = new CompletableFuture<>();
1840 <        g = new CompletableFuture<>();
1841 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1842 <        f.complete(3);
1843 <        checkIncomplete(h);
1844 <        g.complete(1);
1845 <        checkCompletedNormally(h, null);
1846 <        assertEquals(r.value, 2);
1847 <
1848 <        f = new CompletableFuture<>();
1849 <        g = new CompletableFuture<>();
1850 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1851 <        g.complete(1);
1852 <        checkIncomplete(h);
1853 <        f.complete(3);
1854 <        checkCompletedNormally(h, null);
1855 <        assertEquals(r.value, 2);
1856 <
1857 <        f = new CompletableFuture<>();
1858 <        g = new CompletableFuture<>();
1859 <        g.complete(1);
1860 <        f.complete(3);
1861 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1862 <        checkCompletedNormally(h, null);
1863 <        assertEquals(r.value, 2);
1864 <    }
1865 <
1866 <    /**
1867 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1868 <     * completion of source
1869 <     */
1870 <    public void testThenAcceptBothAsync2() {
1871 <        CompletableFuture<Integer> f, g;
1872 <        CompletableFuture<Void> h;
1873 <        SubtractAction r;
1874 <
1875 <        f = new CompletableFuture<>();
1876 <        g = new CompletableFuture<>();
1877 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1878 <        f.completeExceptionally(new CFException());
1879 <        checkIncomplete(h);
1880 <        g.complete(1);
1881 <        checkCompletedWithWrappedCFException(h);
1882 <
1883 <        f = new CompletableFuture<>();
1884 <        g = new CompletableFuture<>();
1885 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1886 <        g.completeExceptionally(new CFException());
1887 <        checkIncomplete(h);
1888 <        f.complete(3);
1889 <        checkCompletedWithWrappedCFException(h);
1890 <
1891 <        f = new CompletableFuture<>();
1892 <        g = new CompletableFuture<>();
1893 <        f.complete(3);
1894 <        g.completeExceptionally(new CFException());
1895 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1896 <        checkCompletedWithWrappedCFException(h);
1897 <
1898 <        f = new CompletableFuture<>();
1899 <        g = new CompletableFuture<>();
1900 <        f.completeExceptionally(new CFException());
1901 <        g.complete(3);
1902 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1903 <        checkCompletedWithWrappedCFException(h);
1904 <    }
1905 <
1906 <    /**
1907 <     * thenAcceptBothAsync result completes exceptionally if action does
1908 <     */
1909 <    public void testThenAcceptBothAsync3() {
1910 <        CompletableFuture<Integer> f, g;
1911 <        CompletableFuture<Void> h;
1912 <        FailingBiConsumer r;
1913 <
1914 <        f = new CompletableFuture<>();
1915 <        g = new CompletableFuture<>();
1916 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1917 <        f.complete(3);
1918 <        checkIncomplete(h);
1919 <        g.complete(1);
1920 <        checkCompletedWithWrappedCFException(h);
1921 <
1922 <        f = new CompletableFuture<>();
1923 <        g = new CompletableFuture<>();
1924 <        f.complete(3);
1925 <        g.complete(1);
1926 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1927 <        checkCompletedWithWrappedCFException(h);
1928 <    }
1929 <
1930 <    /**
1931 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1932 <     */
1933 <    public void testThenAcceptBothAsync4() {
1934 <        CompletableFuture<Integer> f, g;
1935 <        CompletableFuture<Void> h;
1936 <        SubtractAction r;
1937 <
1938 <        f = new CompletableFuture<>();
1939 <        g = new CompletableFuture<>();
1940 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1941 <        assertTrue(f.cancel(true));
1942 <        checkIncomplete(h);
1943 <        g.complete(1);
1944 <        checkCompletedWithWrappedCancellationException(h);
1945 <
1946 <        f = new CompletableFuture<>();
1947 <        g = new CompletableFuture<>();
1948 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1949 <        assertTrue(g.cancel(true));
1950 <        checkIncomplete(h);
1951 <        f.complete(3);
1952 <        checkCompletedWithWrappedCancellationException(h);
1953 <
1954 <        f = new CompletableFuture<>();
1955 <        g = new CompletableFuture<>();
1956 <        f.complete(3);
1957 <        assertTrue(g.cancel(true));
1958 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1959 <        checkCompletedWithWrappedCancellationException(h);
1960 <
1961 <        f = new CompletableFuture<>();
1962 <        g = new CompletableFuture<>();
1963 <        assertTrue(f.cancel(true));
1964 <        g.complete(3);
1965 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1966 <        checkCompletedWithWrappedCancellationException(h);
1967 <    }
1968 <
1969 <    /**
1970 <     * applyToEitherAsync result completes normally after normal
1971 <     * completion of sources
1972 <     */
1973 <    public void testApplyToEitherAsync() {
1974 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1975 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1976 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1977 <        f.complete(one);
1978 <        checkCompletedNormally(g, two);
1979 <
1980 <        f = new CompletableFuture<>();
1981 <        f.complete(one);
1982 <        f2 = new CompletableFuture<>();
1983 <        g = f.applyToEitherAsync(f2, inc);
1984 <        checkCompletedNormally(g, two);
1985 <    }
1986 <
1987 <    /**
1988 <     * applyToEitherAsync result completes exceptionally after exceptional
1989 <     * completion of source
1990 <     */
1991 <    public void testApplyToEitherAsync2() {
1992 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1993 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1994 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1995 <        f.completeExceptionally(new CFException());
1996 <        checkCompletedWithWrappedCFException(g);
1997 <
1998 <        f = new CompletableFuture<>();
1999 <        f2 = new CompletableFuture<>();
2000 <        f2.completeExceptionally(new CFException());
2001 <        g = f.applyToEitherAsync(f2, inc);
2002 <        f.complete(one);
2003 <        checkCompletedWithWrappedCFException(g);
2004 <    }
1641 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1642 >        for (ExecutionMode m : ExecutionMode.values())
1643 >        for (boolean fFirst : new boolean[] { true, false })
1644 >        for (boolean failFirst : new boolean[] { true, false })
1645 >        for (Integer v1 : new Integer[] { 1, null })
1646 >    {
1647 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1648 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1649 >        final CFException ex = new CFException();
1650 >        final SubtractFunction r1 = new SubtractFunction(m);
1651 >        final SubtractFunction r2 = new SubtractFunction(m);
1652 >        final SubtractFunction r3 = new SubtractFunction(m);
1653 >
1654 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1655 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1656 >        final Callable<Boolean> complete1 = failFirst ?
1657 >            () -> fst.completeExceptionally(ex) :
1658 >            () -> fst.complete(v1);
1659 >        final Callable<Boolean> complete2 = failFirst ?
1660 >            () -> snd.complete(v1) :
1661 >            () -> snd.completeExceptionally(ex);
1662 >
1663 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1664 >        assertTrue(complete1.call());
1665 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1666 >        checkIncomplete(h1);
1667 >        checkIncomplete(h2);
1668 >        assertTrue(complete2.call());
1669 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1670 >
1671 >        checkCompletedWithWrappedException(h1, ex);
1672 >        checkCompletedWithWrappedException(h2, ex);
1673 >        checkCompletedWithWrappedException(h3, ex);
1674 >        r1.assertNotInvoked();
1675 >        r2.assertNotInvoked();
1676 >        r3.assertNotInvoked();
1677 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1678 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1679 >    }}
1680  
1681      /**
1682 <     * applyToEitherAsync result completes exceptionally if action does
1682 >     * thenCombine result completes exceptionally if either source cancelled
1683       */
1684 <    public void testApplyToEitherAsync3() {
1685 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1686 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1687 <        FailingFunction r = new FailingFunction();
1688 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1689 <        f.complete(one);
1690 <        checkCompletedWithWrappedCFException(g);
1691 <    }
1684 >    public void testThenCombine_sourceCancelled() throws Throwable {
1685 >        for (ExecutionMode m : ExecutionMode.values())
1686 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1687 >        for (boolean fFirst : new boolean[] { true, false })
1688 >        for (boolean failFirst : new boolean[] { true, false })
1689 >        for (Integer v1 : new Integer[] { 1, null })
1690 >    {
1691 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1692 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1693 >        final SubtractFunction r1 = new SubtractFunction(m);
1694 >        final SubtractFunction r2 = new SubtractFunction(m);
1695 >        final SubtractFunction r3 = new SubtractFunction(m);
1696 >
1697 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1698 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1699 >        final Callable<Boolean> complete1 = failFirst ?
1700 >            () -> fst.cancel(mayInterruptIfRunning) :
1701 >            () -> fst.complete(v1);
1702 >        final Callable<Boolean> complete2 = failFirst ?
1703 >            () -> snd.complete(v1) :
1704 >            () -> snd.cancel(mayInterruptIfRunning);
1705 >
1706 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1707 >        assertTrue(complete1.call());
1708 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1709 >        checkIncomplete(h1);
1710 >        checkIncomplete(h2);
1711 >        assertTrue(complete2.call());
1712 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1713 >
1714 >        checkCompletedWithWrappedCancellationException(h1);
1715 >        checkCompletedWithWrappedCancellationException(h2);
1716 >        checkCompletedWithWrappedCancellationException(h3);
1717 >        r1.assertNotInvoked();
1718 >        r2.assertNotInvoked();
1719 >        r3.assertNotInvoked();
1720 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1721 >        checkCancelled(failFirst ? fst : snd);
1722 >    }}
1723  
1724      /**
1725 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1725 >     * thenCombine result completes exceptionally if action does
1726       */
1727 <    public void testApplyToEitherAsync4() {
1728 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1729 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1730 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1731 <        assertTrue(f.cancel(true));
1732 <        checkCompletedWithWrappedCancellationException(g);
1733 <
1734 <        f = new CompletableFuture<>();
1735 <        f2 = new CompletableFuture<>();
1736 <        assertTrue(f2.cancel(true));
1737 <        g = f.applyToEitherAsync(f2, inc);
1738 <        checkCompletedWithWrappedCancellationException(g);
1739 <    }
1727 >    public void testThenCombine_actionFailed() {
1728 >        for (ExecutionMode m : ExecutionMode.values())
1729 >        for (boolean fFirst : new boolean[] { true, false })
1730 >        for (Integer v1 : new Integer[] { 1, null })
1731 >        for (Integer v2 : new Integer[] { 2, null })
1732 >    {
1733 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1734 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1735 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1736 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1737 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1738 >
1739 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1740 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1741 >        final Integer w1 =  fFirst ? v1 : v2;
1742 >        final Integer w2 = !fFirst ? v1 : v2;
1743 >
1744 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1745 >        assertTrue(fst.complete(w1));
1746 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1747 >        assertTrue(snd.complete(w2));
1748 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1749 >
1750 >        checkCompletedWithWrappedCFException(h1);
1751 >        checkCompletedWithWrappedCFException(h2);
1752 >        checkCompletedWithWrappedCFException(h3);
1753 >        r1.assertInvoked();
1754 >        r2.assertInvoked();
1755 >        r3.assertInvoked();
1756 >        checkCompletedNormally(f, v1);
1757 >        checkCompletedNormally(g, v2);
1758 >    }}
1759  
1760      /**
1761 <     * acceptEitherAsync result completes normally after normal
1761 >     * thenAcceptBoth result completes normally after normal
1762       * completion of sources
1763       */
1764 <    public void testAcceptEitherAsync() {
1765 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1766 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1767 <        IncAction r = new IncAction();
1768 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1769 <        f.complete(one);
1770 <        checkCompletedNormally(g, null);
1771 <        assertEquals(r.value, 2);
1772 <
1773 <        r = new IncAction();
1774 <        f = new CompletableFuture<>();
1775 <        f.complete(one);
1776 <        f2 = new CompletableFuture<>();
1777 <        g = f.acceptEitherAsync(f2, r);
1778 <        checkCompletedNormally(g, null);
1779 <        assertEquals(r.value, 2);
1780 <    }
1764 >    public void testThenAcceptBoth_normalCompletion() {
1765 >        for (ExecutionMode m : ExecutionMode.values())
1766 >        for (boolean fFirst : new boolean[] { true, false })
1767 >        for (Integer v1 : new Integer[] { 1, null })
1768 >        for (Integer v2 : new Integer[] { 2, null })
1769 >    {
1770 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1771 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1772 >        final SubtractAction r1 = new SubtractAction(m);
1773 >        final SubtractAction r2 = new SubtractAction(m);
1774 >        final SubtractAction r3 = new SubtractAction(m);
1775 >
1776 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1777 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1778 >        final Integer w1 =  fFirst ? v1 : v2;
1779 >        final Integer w2 = !fFirst ? v1 : v2;
1780 >
1781 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1782 >        assertTrue(fst.complete(w1));
1783 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1784 >        checkIncomplete(h1);
1785 >        checkIncomplete(h2);
1786 >        r1.assertNotInvoked();
1787 >        r2.assertNotInvoked();
1788 >        assertTrue(snd.complete(w2));
1789 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1790 >
1791 >        checkCompletedNormally(h1, null);
1792 >        checkCompletedNormally(h2, null);
1793 >        checkCompletedNormally(h3, null);
1794 >        r1.assertValue(subtract(v1, v2));
1795 >        r2.assertValue(subtract(v1, v2));
1796 >        r3.assertValue(subtract(v1, v2));
1797 >        checkCompletedNormally(f, v1);
1798 >        checkCompletedNormally(g, v2);
1799 >    }}
1800  
1801      /**
1802 <     * acceptEitherAsync result completes exceptionally after exceptional
1803 <     * completion of source
1802 >     * thenAcceptBoth result completes exceptionally after exceptional
1803 >     * completion of either source
1804       */
1805 <    public void testAcceptEitherAsync2() {
1806 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1807 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1808 <        IncAction r = new IncAction();
1809 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1810 <        f.completeExceptionally(new CFException());
1811 <        checkCompletedWithWrappedCFException(g);
1812 <
1813 <        r = new IncAction();
1814 <        f = new CompletableFuture<>();
1815 <        f2 = new CompletableFuture<>();
1816 <        f2.completeExceptionally(new CFException());
1817 <        g = f.acceptEitherAsync(f2, r);
1818 <        f.complete(one);
1819 <        checkCompletedWithWrappedCFException(g);
1820 <    }
1805 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1806 >        for (ExecutionMode m : ExecutionMode.values())
1807 >        for (boolean fFirst : new boolean[] { true, false })
1808 >        for (boolean failFirst : new boolean[] { true, false })
1809 >        for (Integer v1 : new Integer[] { 1, null })
1810 >    {
1811 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1812 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1813 >        final CFException ex = new CFException();
1814 >        final SubtractAction r1 = new SubtractAction(m);
1815 >        final SubtractAction r2 = new SubtractAction(m);
1816 >        final SubtractAction r3 = new SubtractAction(m);
1817 >
1818 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1819 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1820 >        final Callable<Boolean> complete1 = failFirst ?
1821 >            () -> fst.completeExceptionally(ex) :
1822 >            () -> fst.complete(v1);
1823 >        final Callable<Boolean> complete2 = failFirst ?
1824 >            () -> snd.complete(v1) :
1825 >            () -> snd.completeExceptionally(ex);
1826 >
1827 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1828 >        assertTrue(complete1.call());
1829 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1830 >        checkIncomplete(h1);
1831 >        checkIncomplete(h2);
1832 >        assertTrue(complete2.call());
1833 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1834 >
1835 >        checkCompletedWithWrappedException(h1, ex);
1836 >        checkCompletedWithWrappedException(h2, ex);
1837 >        checkCompletedWithWrappedException(h3, ex);
1838 >        r1.assertNotInvoked();
1839 >        r2.assertNotInvoked();
1840 >        r3.assertNotInvoked();
1841 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1842 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1843 >    }}
1844  
1845      /**
1846 <     * acceptEitherAsync result completes exceptionally if action does
1846 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1847       */
1848 <    public void testAcceptEitherAsync3() {
1849 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1850 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1851 <        FailingConsumer r = new FailingConsumer();
1852 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1853 <        f.complete(one);
1854 <        checkCompletedWithWrappedCFException(g);
1855 <    }
1848 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1849 >        for (ExecutionMode m : ExecutionMode.values())
1850 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1851 >        for (boolean fFirst : new boolean[] { true, false })
1852 >        for (boolean failFirst : new boolean[] { true, false })
1853 >        for (Integer v1 : new Integer[] { 1, null })
1854 >    {
1855 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1856 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1857 >        final SubtractAction r1 = new SubtractAction(m);
1858 >        final SubtractAction r2 = new SubtractAction(m);
1859 >        final SubtractAction r3 = new SubtractAction(m);
1860 >
1861 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1862 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1863 >        final Callable<Boolean> complete1 = failFirst ?
1864 >            () -> fst.cancel(mayInterruptIfRunning) :
1865 >            () -> fst.complete(v1);
1866 >        final Callable<Boolean> complete2 = failFirst ?
1867 >            () -> snd.complete(v1) :
1868 >            () -> snd.cancel(mayInterruptIfRunning);
1869 >
1870 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1871 >        assertTrue(complete1.call());
1872 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1873 >        checkIncomplete(h1);
1874 >        checkIncomplete(h2);
1875 >        assertTrue(complete2.call());
1876 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1877 >
1878 >        checkCompletedWithWrappedCancellationException(h1);
1879 >        checkCompletedWithWrappedCancellationException(h2);
1880 >        checkCompletedWithWrappedCancellationException(h3);
1881 >        r1.assertNotInvoked();
1882 >        r2.assertNotInvoked();
1883 >        r3.assertNotInvoked();
1884 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1885 >        checkCancelled(failFirst ? fst : snd);
1886 >    }}
1887  
1888      /**
1889 <     * acceptEitherAsync result completes exceptionally if either
2092 <     * source cancelled
1889 >     * thenAcceptBoth result completes exceptionally if action does
1890       */
1891 <    public void testAcceptEitherAsync4() {
1892 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1893 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1894 <        IncAction r = new IncAction();
1895 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1896 <        assertTrue(f.cancel(true));
1897 <        checkCompletedWithWrappedCancellationException(g);
1898 <
1899 <        r = new IncAction();
1900 <        f = new CompletableFuture<>();
1901 <        f2 = new CompletableFuture<>();
1902 <        assertTrue(f2.cancel(true));
1903 <        g = f.acceptEitherAsync(f2, r);
1904 <        checkCompletedWithWrappedCancellationException(g);
1905 <    }
1891 >    public void testThenAcceptBoth_actionFailed() {
1892 >        for (ExecutionMode m : ExecutionMode.values())
1893 >        for (boolean fFirst : new boolean[] { true, false })
1894 >        for (Integer v1 : new Integer[] { 1, null })
1895 >        for (Integer v2 : new Integer[] { 2, null })
1896 >    {
1897 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1898 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1899 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1900 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1901 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1902 >
1903 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1904 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1905 >        final Integer w1 =  fFirst ? v1 : v2;
1906 >        final Integer w2 = !fFirst ? v1 : v2;
1907 >
1908 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1909 >        assertTrue(fst.complete(w1));
1910 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1911 >        assertTrue(snd.complete(w2));
1912 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1913 >
1914 >        checkCompletedWithWrappedCFException(h1);
1915 >        checkCompletedWithWrappedCFException(h2);
1916 >        checkCompletedWithWrappedCFException(h3);
1917 >        r1.assertInvoked();
1918 >        r2.assertInvoked();
1919 >        r3.assertInvoked();
1920 >        checkCompletedNormally(f, v1);
1921 >        checkCompletedNormally(g, v2);
1922 >    }}
1923  
1924      /**
1925 <     * runAfterEitherAsync result completes normally after normal
1925 >     * runAfterBoth result completes normally after normal
1926       * completion of sources
1927       */
1928 <    public void testRunAfterEitherAsync() {
1929 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1930 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1931 <        Noop r = new Noop();
1932 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1933 <        f.complete(one);
1934 <        checkCompletedNormally(g, null);
1935 <        assertTrue(r.ran);
1936 <
1937 <        r = new Noop();
1938 <        f = new CompletableFuture<>();
1939 <        f.complete(one);
1940 <        f2 = new CompletableFuture<>();
1941 <        g = f.runAfterEitherAsync(f2, r);
1942 <        checkCompletedNormally(g, null);
1943 <        assertTrue(r.ran);
1944 <    }
1928 >    public void testRunAfterBoth_normalCompletion() {
1929 >        for (ExecutionMode m : ExecutionMode.values())
1930 >        for (boolean fFirst : new boolean[] { true, false })
1931 >        for (Integer v1 : new Integer[] { 1, null })
1932 >        for (Integer v2 : new Integer[] { 2, null })
1933 >    {
1934 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1935 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1936 >        final Noop r1 = new Noop(m);
1937 >        final Noop r2 = new Noop(m);
1938 >        final Noop r3 = new Noop(m);
1939 >
1940 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1941 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1942 >        final Integer w1 =  fFirst ? v1 : v2;
1943 >        final Integer w2 = !fFirst ? v1 : v2;
1944 >
1945 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1946 >        assertTrue(fst.complete(w1));
1947 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1948 >        checkIncomplete(h1);
1949 >        checkIncomplete(h2);
1950 >        r1.assertNotInvoked();
1951 >        r2.assertNotInvoked();
1952 >        assertTrue(snd.complete(w2));
1953 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1954 >
1955 >        checkCompletedNormally(h1, null);
1956 >        checkCompletedNormally(h2, null);
1957 >        checkCompletedNormally(h3, null);
1958 >        r1.assertInvoked();
1959 >        r2.assertInvoked();
1960 >        r3.assertInvoked();
1961 >        checkCompletedNormally(f, v1);
1962 >        checkCompletedNormally(g, v2);
1963 >    }}
1964  
1965      /**
1966 <     * runAfterEitherAsync result completes exceptionally after exceptional
1967 <     * completion of source
1966 >     * runAfterBoth result completes exceptionally after exceptional
1967 >     * completion of either source
1968       */
1969 <    public void testRunAfterEitherAsync2() {
1970 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1971 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1972 <        Noop r = new Noop();
1973 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1974 <        f.completeExceptionally(new CFException());
1975 <        checkCompletedWithWrappedCFException(g);
1976 <
1977 <        r = new Noop();
1978 <        f = new CompletableFuture<>();
1979 <        f2 = new CompletableFuture<>();
1980 <        f2.completeExceptionally(new CFException());
1981 <        g = f.runAfterEitherAsync(f2, r);
1982 <        f.complete(one);
1983 <        checkCompletedWithWrappedCFException(g);
1984 <    }
1969 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1970 >        for (ExecutionMode m : ExecutionMode.values())
1971 >        for (boolean fFirst : new boolean[] { true, false })
1972 >        for (boolean failFirst : new boolean[] { true, false })
1973 >        for (Integer v1 : new Integer[] { 1, null })
1974 >    {
1975 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1976 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1977 >        final CFException ex = new CFException();
1978 >        final Noop r1 = new Noop(m);
1979 >        final Noop r2 = new Noop(m);
1980 >        final Noop r3 = new Noop(m);
1981 >
1982 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1983 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1984 >        final Callable<Boolean> complete1 = failFirst ?
1985 >            () -> fst.completeExceptionally(ex) :
1986 >            () -> fst.complete(v1);
1987 >        final Callable<Boolean> complete2 = failFirst ?
1988 >            () -> snd.complete(v1) :
1989 >            () -> snd.completeExceptionally(ex);
1990 >
1991 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1992 >        assertTrue(complete1.call());
1993 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1994 >        checkIncomplete(h1);
1995 >        checkIncomplete(h2);
1996 >        assertTrue(complete2.call());
1997 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1998 >
1999 >        checkCompletedWithWrappedException(h1, ex);
2000 >        checkCompletedWithWrappedException(h2, ex);
2001 >        checkCompletedWithWrappedException(h3, ex);
2002 >        r1.assertNotInvoked();
2003 >        r2.assertNotInvoked();
2004 >        r3.assertNotInvoked();
2005 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2006 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2007 >    }}
2008  
2009      /**
2010 <     * runAfterEitherAsync result completes exceptionally if action does
2010 >     * runAfterBoth result completes exceptionally if either source cancelled
2011       */
2012 <    public void testRunAfterEitherAsync3() {
2013 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2014 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2015 <        FailingNoop r = new FailingNoop();
2016 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2017 <        f.complete(one);
2018 <        checkCompletedWithWrappedCFException(g);
2019 <    }
2012 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2013 >        for (ExecutionMode m : ExecutionMode.values())
2014 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2015 >        for (boolean fFirst : new boolean[] { true, false })
2016 >        for (boolean failFirst : new boolean[] { true, false })
2017 >        for (Integer v1 : new Integer[] { 1, null })
2018 >    {
2019 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2020 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2021 >        final Noop r1 = new Noop(m);
2022 >        final Noop r2 = new Noop(m);
2023 >        final Noop r3 = new Noop(m);
2024 >
2025 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2026 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2027 >        final Callable<Boolean> complete1 = failFirst ?
2028 >            () -> fst.cancel(mayInterruptIfRunning) :
2029 >            () -> fst.complete(v1);
2030 >        final Callable<Boolean> complete2 = failFirst ?
2031 >            () -> snd.complete(v1) :
2032 >            () -> snd.cancel(mayInterruptIfRunning);
2033 >
2034 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2035 >        assertTrue(complete1.call());
2036 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2037 >        checkIncomplete(h1);
2038 >        checkIncomplete(h2);
2039 >        assertTrue(complete2.call());
2040 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2041 >
2042 >        checkCompletedWithWrappedCancellationException(h1);
2043 >        checkCompletedWithWrappedCancellationException(h2);
2044 >        checkCompletedWithWrappedCancellationException(h3);
2045 >        r1.assertNotInvoked();
2046 >        r2.assertNotInvoked();
2047 >        r3.assertNotInvoked();
2048 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2049 >        checkCancelled(failFirst ? fst : snd);
2050 >    }}
2051  
2052      /**
2053 <     * runAfterEitherAsync result completes exceptionally if either
2167 <     * source cancelled
2053 >     * runAfterBoth result completes exceptionally if action does
2054       */
2055 <    public void testRunAfterEitherAsync4() {
2056 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2057 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2058 <        Noop r = new Noop();
2059 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2060 <        assertTrue(f.cancel(true));
2061 <        checkCompletedWithWrappedCancellationException(g);
2062 <
2063 <        r = new Noop();
2064 <        f = new CompletableFuture<>();
2065 <        f2 = new CompletableFuture<>();
2066 <        assertTrue(f2.cancel(true));
2067 <        g = f.runAfterEitherAsync(f2, r);
2068 <        checkCompletedWithWrappedCancellationException(g);
2069 <    }
2055 >    public void testRunAfterBoth_actionFailed() {
2056 >        for (ExecutionMode m : ExecutionMode.values())
2057 >        for (boolean fFirst : new boolean[] { true, false })
2058 >        for (Integer v1 : new Integer[] { 1, null })
2059 >        for (Integer v2 : new Integer[] { 2, null })
2060 >    {
2061 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2062 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2063 >        final FailingRunnable r1 = new FailingRunnable(m);
2064 >        final FailingRunnable r2 = new FailingRunnable(m);
2065 >        final FailingRunnable r3 = new FailingRunnable(m);
2066 >
2067 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2068 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2069 >        final Integer w1 =  fFirst ? v1 : v2;
2070 >        final Integer w2 = !fFirst ? v1 : v2;
2071 >
2072 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2073 >        assertTrue(fst.complete(w1));
2074 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2075 >        assertTrue(snd.complete(w2));
2076 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2077 >
2078 >        checkCompletedWithWrappedCFException(h1);
2079 >        checkCompletedWithWrappedCFException(h2);
2080 >        checkCompletedWithWrappedCFException(h3);
2081 >        r1.assertInvoked();
2082 >        r2.assertInvoked();
2083 >        r3.assertInvoked();
2084 >        checkCompletedNormally(f, v1);
2085 >        checkCompletedNormally(g, v2);
2086 >    }}
2087  
2088      /**
2089 <     * thenComposeAsync result completes normally after normal
2090 <     * completion of source
2089 >     * applyToEither result completes normally after normal completion
2090 >     * of either source
2091       */
2092 <    public void testThenComposeAsync() {
2093 <        CompletableFuture<Integer> f, g;
2094 <        CompletableFutureInc r;
2095 <
2096 <        f = new CompletableFuture<>();
2097 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2098 <        f.complete(one);
2099 <        checkCompletedNormally(g, two);
2100 <
2198 <        f = new CompletableFuture<>();
2199 <        f.complete(one);
2200 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2201 <        checkCompletedNormally(g, two);
2202 <    }
2092 >    public void testApplyToEither_normalCompletion() {
2093 >        for (ExecutionMode m : ExecutionMode.values())
2094 >        for (Integer v1 : new Integer[] { 1, null })
2095 >        for (Integer v2 : new Integer[] { 2, null })
2096 >    {
2097 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2098 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2099 >        final IncFunction[] rs = new IncFunction[6];
2100 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2101  
2102 <    /**
2103 <     * thenComposeAsync result completes exceptionally after
2104 <     * exceptional completion of source
2105 <     */
2106 <    public void testThenComposeAsync2() {
2107 <        CompletableFuture<Integer> f, g;
2108 <        CompletableFutureInc r;
2102 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2103 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2104 >        checkIncomplete(h0);
2105 >        checkIncomplete(h1);
2106 >        rs[0].assertNotInvoked();
2107 >        rs[1].assertNotInvoked();
2108 >        f.complete(v1);
2109 >        checkCompletedNormally(h0, inc(v1));
2110 >        checkCompletedNormally(h1, inc(v1));
2111 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2112 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2113 >        checkCompletedNormally(h2, inc(v1));
2114 >        checkCompletedNormally(h3, inc(v1));
2115 >        g.complete(v2);
2116  
2117 <        f = new CompletableFuture<>();
2118 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2119 <        f.completeExceptionally(new CFException());
2120 <        checkCompletedWithWrappedCFException(g);
2121 <        assertFalse(r.ran);
2117 >        // unspecified behavior - both source completions available
2118 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2119 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2120 >        rs[4].assertValue(h4.join());
2121 >        rs[5].assertValue(h5.join());
2122 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2123 >                   Objects.equals(inc(v2), h4.join()));
2124 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2125 >                   Objects.equals(inc(v2), h5.join()));
2126  
2127 <        f = new CompletableFuture<>();
2128 <        f.completeExceptionally(new CFException());
2129 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2130 <        checkCompletedWithWrappedCFException(g);
2131 <        assertFalse(r.ran);
2132 <    }
2127 >        checkCompletedNormally(f, v1);
2128 >        checkCompletedNormally(g, v2);
2129 >        checkCompletedNormally(h0, inc(v1));
2130 >        checkCompletedNormally(h1, inc(v1));
2131 >        checkCompletedNormally(h2, inc(v1));
2132 >        checkCompletedNormally(h3, inc(v1));
2133 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2134 >    }}
2135  
2136      /**
2137 <     * thenComposeAsync result completes exceptionally if action does
2137 >     * applyToEither result completes exceptionally after exceptional
2138 >     * completion of either source
2139       */
2140 <    public void testThenComposeAsync3() {
2141 <        CompletableFuture<Integer> f, g;
2142 <        FailingCompletableFutureFunction r;
2140 >    public void testApplyToEither_exceptionalCompletion() {
2141 >        for (ExecutionMode m : ExecutionMode.values())
2142 >        for (Integer v1 : new Integer[] { 1, null })
2143 >    {
2144 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2145 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2146 >        final CFException ex = new CFException();
2147 >        final IncFunction[] rs = new IncFunction[6];
2148 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2149  
2150 <        f = new CompletableFuture<>();
2151 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2152 <        f.complete(one);
2153 <        checkCompletedWithWrappedCFException(g);
2150 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2151 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2152 >        checkIncomplete(h0);
2153 >        checkIncomplete(h1);
2154 >        rs[0].assertNotInvoked();
2155 >        rs[1].assertNotInvoked();
2156 >        f.completeExceptionally(ex);
2157 >        checkCompletedWithWrappedException(h0, ex);
2158 >        checkCompletedWithWrappedException(h1, ex);
2159 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2160 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2161 >        checkCompletedWithWrappedException(h2, ex);
2162 >        checkCompletedWithWrappedException(h3, ex);
2163 >        g.complete(v1);
2164  
2165 <        f = new CompletableFuture<>();
2166 <        f.complete(one);
2167 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2168 <        checkCompletedWithWrappedCFException(g);
2169 <    }
2165 >        // unspecified behavior - both source completions available
2166 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2167 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2168 >        try {
2169 >            assertEquals(inc(v1), h4.join());
2170 >            rs[4].assertValue(inc(v1));
2171 >        } catch (CompletionException ok) {
2172 >            checkCompletedWithWrappedException(h4, ex);
2173 >            rs[4].assertNotInvoked();
2174 >        }
2175 >        try {
2176 >            assertEquals(inc(v1), h5.join());
2177 >            rs[5].assertValue(inc(v1));
2178 >        } catch (CompletionException ok) {
2179 >            checkCompletedWithWrappedException(h5, ex);
2180 >            rs[5].assertNotInvoked();
2181 >        }
2182  
2183 <    /**
2184 <     * thenComposeAsync result completes exceptionally if source cancelled
2185 <     */
2186 <    public void testThenComposeAsync4() {
2187 <        CompletableFuture<Integer> f, g;
2188 <        CompletableFutureInc r;
2183 >        checkCompletedExceptionally(f, ex);
2184 >        checkCompletedNormally(g, v1);
2185 >        checkCompletedWithWrappedException(h0, ex);
2186 >        checkCompletedWithWrappedException(h1, ex);
2187 >        checkCompletedWithWrappedException(h2, ex);
2188 >        checkCompletedWithWrappedException(h3, ex);
2189 >        checkCompletedWithWrappedException(h4, ex);
2190 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2191 >    }}
2192  
2193 <        f = new CompletableFuture<>();
2194 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2195 <        assertTrue(f.cancel(true));
2196 <        checkCompletedWithWrappedCancellationException(g);
2193 >    public void testApplyToEither_exceptionalCompletion2() {
2194 >        for (ExecutionMode m : ExecutionMode.values())
2195 >        for (boolean fFirst : new boolean[] { true, false })
2196 >        for (Integer v1 : new Integer[] { 1, null })
2197 >    {
2198 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2199 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2200 >        final CFException ex = new CFException();
2201 >        final IncFunction[] rs = new IncFunction[6];
2202 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2203  
2204 <        f = new CompletableFuture<>();
2205 <        assertTrue(f.cancel(true));
2206 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2207 <        checkCompletedWithWrappedCancellationException(g);
2208 <    }
2204 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2205 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2206 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2207 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2208 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2209 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2210 >
2211 >        // unspecified behavior - both source completions available
2212 >        try {
2213 >            assertEquals(inc(v1), h0.join());
2214 >            rs[0].assertValue(inc(v1));
2215 >        } catch (CompletionException ok) {
2216 >            checkCompletedWithWrappedException(h0, ex);
2217 >            rs[0].assertNotInvoked();
2218 >        }
2219 >        try {
2220 >            assertEquals(inc(v1), h1.join());
2221 >            rs[1].assertValue(inc(v1));
2222 >        } catch (CompletionException ok) {
2223 >            checkCompletedWithWrappedException(h1, ex);
2224 >            rs[1].assertNotInvoked();
2225 >        }
2226 >        try {
2227 >            assertEquals(inc(v1), h2.join());
2228 >            rs[2].assertValue(inc(v1));
2229 >        } catch (CompletionException ok) {
2230 >            checkCompletedWithWrappedException(h2, ex);
2231 >            rs[2].assertNotInvoked();
2232 >        }
2233 >        try {
2234 >            assertEquals(inc(v1), h3.join());
2235 >            rs[3].assertValue(inc(v1));
2236 >        } catch (CompletionException ok) {
2237 >            checkCompletedWithWrappedException(h3, ex);
2238 >            rs[3].assertNotInvoked();
2239 >        }
2240  
2241 <    // async with explicit executors
2241 >        checkCompletedNormally(f, v1);
2242 >        checkCompletedExceptionally(g, ex);
2243 >    }}
2244  
2245      /**
2246 <     * thenRunAsync result completes normally after normal completion of source
2246 >     * applyToEither result completes exceptionally if either source cancelled
2247       */
2248 <    public void testThenRunAsyncE() {
2249 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2250 <        Noop r = new Noop();
2251 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2252 <        f.complete(null);
2253 <        checkCompletedNormally(g, null);
2254 <
2255 <        // reordered version
2256 <        f = new CompletableFuture<>();
2275 <        f.complete(null);
2276 <        r = new Noop();
2277 <        g = f.thenRunAsync(r, new ThreadExecutor());
2278 <        checkCompletedNormally(g, null);
2279 <    }
2248 >    public void testApplyToEither_sourceCancelled() {
2249 >        for (ExecutionMode m : ExecutionMode.values())
2250 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2251 >        for (Integer v1 : new Integer[] { 1, null })
2252 >    {
2253 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2254 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2255 >        final IncFunction[] rs = new IncFunction[6];
2256 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2257  
2258 <    /**
2259 <     * thenRunAsync result completes exceptionally after exceptional
2260 <     * completion of source
2261 <     */
2262 <    public void testThenRunAsync2E() {
2263 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2264 <        Noop r = new Noop();
2265 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2266 <        f.completeExceptionally(new CFException());
2267 <        try {
2268 <            g.join();
2269 <            shouldThrow();
2270 <        } catch (CompletionException success) {}
2271 <        checkCompletedWithWrappedCFException(g);
2295 <    }
2258 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2259 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2260 >        checkIncomplete(h0);
2261 >        checkIncomplete(h1);
2262 >        rs[0].assertNotInvoked();
2263 >        rs[1].assertNotInvoked();
2264 >        f.cancel(mayInterruptIfRunning);
2265 >        checkCompletedWithWrappedCancellationException(h0);
2266 >        checkCompletedWithWrappedCancellationException(h1);
2267 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2268 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2269 >        checkCompletedWithWrappedCancellationException(h2);
2270 >        checkCompletedWithWrappedCancellationException(h3);
2271 >        g.complete(v1);
2272  
2273 <    /**
2274 <     * thenRunAsync result completes exceptionally if action does
2275 <     */
2276 <    public void testThenRunAsync3E() {
2277 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2278 <        FailingNoop r = new FailingNoop();
2279 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2280 <        f.complete(null);
2281 <        checkCompletedWithWrappedCFException(g);
2282 <    }
2273 >        // unspecified behavior - both source completions available
2274 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2275 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2276 >        try {
2277 >            assertEquals(inc(v1), h4.join());
2278 >            rs[4].assertValue(inc(v1));
2279 >        } catch (CompletionException ok) {
2280 >            checkCompletedWithWrappedCancellationException(h4);
2281 >            rs[4].assertNotInvoked();
2282 >        }
2283 >        try {
2284 >            assertEquals(inc(v1), h5.join());
2285 >            rs[5].assertValue(inc(v1));
2286 >        } catch (CompletionException ok) {
2287 >            checkCompletedWithWrappedCancellationException(h5);
2288 >            rs[5].assertNotInvoked();
2289 >        }
2290  
2291 <    /**
2292 <     * thenRunAsync result completes exceptionally if source cancelled
2293 <     */
2294 <    public void testThenRunAsync4E() {
2295 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2296 <        Noop r = new Noop();
2297 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2298 <        assertTrue(f.cancel(true));
2316 <        checkCompletedWithWrappedCancellationException(g);
2317 <    }
2291 >        checkCancelled(f);
2292 >        checkCompletedNormally(g, v1);
2293 >        checkCompletedWithWrappedCancellationException(h0);
2294 >        checkCompletedWithWrappedCancellationException(h1);
2295 >        checkCompletedWithWrappedCancellationException(h2);
2296 >        checkCompletedWithWrappedCancellationException(h3);
2297 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2298 >    }}
2299  
2300 <    /**
2301 <     * thenApplyAsync result completes normally after normal completion of source
2302 <     */
2303 <    public void testThenApplyAsyncE() {
2304 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2305 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2306 <        f.complete(one);
2307 <        checkCompletedNormally(g, two);
2308 <    }
2300 >    public void testApplyToEither_sourceCancelled2() {
2301 >        for (ExecutionMode m : ExecutionMode.values())
2302 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2303 >        for (boolean fFirst : new boolean[] { true, false })
2304 >        for (Integer v1 : new Integer[] { 1, null })
2305 >    {
2306 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2307 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2308 >        final IncFunction[] rs = new IncFunction[6];
2309 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2310  
2311 <    /**
2312 <     * thenApplyAsync result completes exceptionally after exceptional
2313 <     * completion of source
2314 <     */
2315 <    public void testThenApplyAsync2E() {
2316 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2317 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2318 <        f.completeExceptionally(new CFException());
2319 <        checkCompletedWithWrappedCFException(g);
2320 <    }
2311 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2312 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2313 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2314 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2315 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2316 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2317 >
2318 >        // unspecified behavior - both source completions available
2319 >        try {
2320 >            assertEquals(inc(v1), h0.join());
2321 >            rs[0].assertValue(inc(v1));
2322 >        } catch (CompletionException ok) {
2323 >            checkCompletedWithWrappedCancellationException(h0);
2324 >            rs[0].assertNotInvoked();
2325 >        }
2326 >        try {
2327 >            assertEquals(inc(v1), h1.join());
2328 >            rs[1].assertValue(inc(v1));
2329 >        } catch (CompletionException ok) {
2330 >            checkCompletedWithWrappedCancellationException(h1);
2331 >            rs[1].assertNotInvoked();
2332 >        }
2333 >        try {
2334 >            assertEquals(inc(v1), h2.join());
2335 >            rs[2].assertValue(inc(v1));
2336 >        } catch (CompletionException ok) {
2337 >            checkCompletedWithWrappedCancellationException(h2);
2338 >            rs[2].assertNotInvoked();
2339 >        }
2340 >        try {
2341 >            assertEquals(inc(v1), h3.join());
2342 >            rs[3].assertValue(inc(v1));
2343 >        } catch (CompletionException ok) {
2344 >            checkCompletedWithWrappedCancellationException(h3);
2345 >            rs[3].assertNotInvoked();
2346 >        }
2347  
2348 <    /**
2349 <     * thenApplyAsync result completes exceptionally if action does
2350 <     */
2343 <    public void testThenApplyAsync3E() {
2344 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2345 <        FailingFunction r = new FailingFunction();
2346 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2347 <        f.complete(null);
2348 <        checkCompletedWithWrappedCFException(g);
2349 <    }
2348 >        checkCompletedNormally(f, v1);
2349 >        checkCancelled(g);
2350 >    }}
2351  
2352      /**
2353 <     * thenApplyAsync result completes exceptionally if source cancelled
2353 >     * applyToEither result completes exceptionally if action does
2354       */
2355 <    public void testThenApplyAsync4E() {
2356 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2357 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2358 <        assertTrue(f.cancel(true));
2359 <        checkCompletedWithWrappedCancellationException(g);
2360 <    }
2355 >    public void testApplyToEither_actionFailed() {
2356 >        for (ExecutionMode m : ExecutionMode.values())
2357 >        for (Integer v1 : new Integer[] { 1, null })
2358 >        for (Integer v2 : new Integer[] { 2, null })
2359 >    {
2360 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2361 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2362 >        final FailingFunction[] rs = new FailingFunction[6];
2363 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2364  
2365 <    /**
2366 <     * thenAcceptAsync result completes normally after normal
2367 <     * completion of source
2368 <     */
2369 <    public void testThenAcceptAsyncE() {
2370 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2371 <        IncAction r = new IncAction();
2372 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2373 <        f.complete(one);
2374 <        checkCompletedNormally(g, null);
2371 <        assertEquals(r.value, 2);
2372 <    }
2365 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2366 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2367 >        f.complete(v1);
2368 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2369 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2370 >        checkCompletedWithWrappedCFException(h0);
2371 >        checkCompletedWithWrappedCFException(h1);
2372 >        checkCompletedWithWrappedCFException(h2);
2373 >        checkCompletedWithWrappedCFException(h3);
2374 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2375  
2376 <    /**
2375 <     * thenAcceptAsync result completes exceptionally after exceptional
2376 <     * completion of source
2377 <     */
2378 <    public void testThenAcceptAsync2E() {
2379 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2380 <        IncAction r = new IncAction();
2381 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2382 <        f.completeExceptionally(new CFException());
2383 <        checkCompletedWithWrappedCFException(g);
2384 <    }
2376 >        g.complete(v2);
2377  
2378 <    /**
2379 <     * thenAcceptAsync result completes exceptionally if action does
2380 <     */
2381 <    public void testThenAcceptAsync3E() {
2382 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2383 <        FailingConsumer r = new FailingConsumer();
2384 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2385 <        f.complete(null);
2386 <        checkCompletedWithWrappedCFException(g);
2387 <    }
2378 >        // unspecified behavior - both source completions available
2379 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2380 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2381 >
2382 >        checkCompletedWithWrappedCFException(h4);
2383 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2384 >                   Objects.equals(v2, rs[4].value));
2385 >        checkCompletedWithWrappedCFException(h5);
2386 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2387 >                   Objects.equals(v2, rs[5].value));
2388  
2389 <    /**
2390 <     * thenAcceptAsync result completes exceptionally if source cancelled
2391 <     */
2400 <    public void testThenAcceptAsync4E() {
2401 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2402 <        IncAction r = new IncAction();
2403 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2404 <        assertTrue(f.cancel(true));
2405 <        checkCompletedWithWrappedCancellationException(g);
2406 <    }
2389 >        checkCompletedNormally(f, v1);
2390 >        checkCompletedNormally(g, v2);
2391 >    }}
2392  
2393      /**
2394 <     * thenCombineAsync result completes normally after normal
2395 <     * completion of sources
2394 >     * acceptEither result completes normally after normal completion
2395 >     * of either source
2396       */
2397 <    public void testThenCombineAsyncE() {
2398 <        CompletableFuture<Integer> f, g, h;
2399 <        ThreadExecutor e = new ThreadExecutor();
2400 <        int count = 0;
2397 >    public void testAcceptEither_normalCompletion() {
2398 >        for (ExecutionMode m : ExecutionMode.values())
2399 >        for (Integer v1 : new Integer[] { 1, null })
2400 >        for (Integer v2 : new Integer[] { 2, null })
2401 >    {
2402 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2403 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2404 >        final NoopConsumer[] rs = new NoopConsumer[6];
2405 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2406  
2407 <        f = new CompletableFuture<>();
2408 <        g = new CompletableFuture<>();
2409 <        h = f.thenCombineAsync(g, subtract, e);
2410 <        f.complete(3);
2411 <        checkIncomplete(h);
2412 <        g.complete(1);
2413 <        checkCompletedNormally(h, 2);
2414 <        assertEquals(++count, e.count.get());
2407 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2408 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2409 >        checkIncomplete(h0);
2410 >        checkIncomplete(h1);
2411 >        rs[0].assertNotInvoked();
2412 >        rs[1].assertNotInvoked();
2413 >        f.complete(v1);
2414 >        checkCompletedNormally(h0, null);
2415 >        checkCompletedNormally(h1, null);
2416 >        rs[0].assertValue(v1);
2417 >        rs[1].assertValue(v1);
2418 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2419 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2420 >        checkCompletedNormally(h2, null);
2421 >        checkCompletedNormally(h3, null);
2422 >        rs[2].assertValue(v1);
2423 >        rs[3].assertValue(v1);
2424 >        g.complete(v2);
2425  
2426 <        f = new CompletableFuture<>();
2427 <        g = new CompletableFuture<>();
2428 <        h = f.thenCombineAsync(g, subtract, e);
2429 <        g.complete(1);
2430 <        checkIncomplete(h);
2431 <        f.complete(3);
2432 <        checkCompletedNormally(h, 2);
2433 <        assertEquals(++count, e.count.get());
2426 >        // unspecified behavior - both source completions available
2427 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2428 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2429 >        checkCompletedNormally(h4, null);
2430 >        checkCompletedNormally(h5, null);
2431 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2432 >                   Objects.equals(v2, rs[4].value));
2433 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2434 >                   Objects.equals(v2, rs[5].value));
2435  
2436 <        f = new CompletableFuture<>();
2437 <        g = new CompletableFuture<>();
2438 <        g.complete(1);
2439 <        f.complete(3);
2440 <        h = f.thenCombineAsync(g, subtract, e);
2441 <        checkCompletedNormally(h, 2);
2442 <        assertEquals(++count, e.count.get());
2443 <    }
2436 >        checkCompletedNormally(f, v1);
2437 >        checkCompletedNormally(g, v2);
2438 >        checkCompletedNormally(h0, null);
2439 >        checkCompletedNormally(h1, null);
2440 >        checkCompletedNormally(h2, null);
2441 >        checkCompletedNormally(h3, null);
2442 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2443 >    }}
2444  
2445      /**
2446 <     * thenCombineAsync result completes exceptionally after exceptional
2446 >     * acceptEither result completes exceptionally after exceptional
2447       * completion of either source
2448       */
2449 <    public void testThenCombineAsync2E() {
2450 <        CompletableFuture<Integer> f, g, h;
2451 <        ThreadExecutor e = new ThreadExecutor();
2452 <        int count = 0;
2453 <
2454 <        f = new CompletableFuture<>();
2455 <        g = new CompletableFuture<>();
2456 <        h = f.thenCombineAsync(g, subtract, e);
2457 <        f.completeExceptionally(new CFException());
2457 <        checkIncomplete(h);
2458 <        g.complete(1);
2459 <        checkCompletedWithWrappedCFException(h);
2460 <
2461 <        f = new CompletableFuture<>();
2462 <        g = new CompletableFuture<>();
2463 <        h = f.thenCombineAsync(g, subtract, e);
2464 <        g.completeExceptionally(new CFException());
2465 <        checkIncomplete(h);
2466 <        f.complete(3);
2467 <        checkCompletedWithWrappedCFException(h);
2468 <
2469 <        f = new CompletableFuture<>();
2470 <        g = new CompletableFuture<>();
2471 <        g.completeExceptionally(new CFException());
2472 <        h = f.thenCombineAsync(g, subtract, e);
2473 <        checkIncomplete(h);
2474 <        f.complete(3);
2475 <        checkCompletedWithWrappedCFException(h);
2476 <
2477 <        assertEquals(0, e.count.get());
2478 <    }
2449 >    public void testAcceptEither_exceptionalCompletion() {
2450 >        for (ExecutionMode m : ExecutionMode.values())
2451 >        for (Integer v1 : new Integer[] { 1, null })
2452 >    {
2453 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2454 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2455 >        final CFException ex = new CFException();
2456 >        final NoopConsumer[] rs = new NoopConsumer[6];
2457 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2458  
2459 <    /**
2460 <     * thenCombineAsync result completes exceptionally if action does
2461 <     */
2462 <    public void testThenCombineAsync3E() {
2463 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2464 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2465 <        FailingBiFunction r = new FailingBiFunction();
2466 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2467 <        f.complete(one);
2468 <        checkIncomplete(g);
2469 <        assertFalse(r.ran);
2470 <        f2.complete(two);
2471 <        checkCompletedWithWrappedCFException(g);
2493 <        assertTrue(r.ran);
2494 <    }
2459 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2460 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2461 >        checkIncomplete(h0);
2462 >        checkIncomplete(h1);
2463 >        rs[0].assertNotInvoked();
2464 >        rs[1].assertNotInvoked();
2465 >        f.completeExceptionally(ex);
2466 >        checkCompletedWithWrappedException(h0, ex);
2467 >        checkCompletedWithWrappedException(h1, ex);
2468 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2469 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2470 >        checkCompletedWithWrappedException(h2, ex);
2471 >        checkCompletedWithWrappedException(h3, ex);
2472  
2473 <    /**
2497 <     * thenCombineAsync result completes exceptionally if either source cancelled
2498 <     */
2499 <    public void testThenCombineAsync4E() {
2500 <        CompletableFuture<Integer> f, g, h;
2501 <        ThreadExecutor e = new ThreadExecutor();
2473 >        g.complete(v1);
2474  
2475 <        f = new CompletableFuture<>();
2476 <        g = new CompletableFuture<>();
2477 <        h = f.thenCombineAsync(g, subtract, e);
2478 <        assertTrue(f.cancel(true));
2479 <        checkIncomplete(h);
2480 <        g.complete(1);
2481 <        checkCompletedWithWrappedCancellationException(h);
2475 >        // unspecified behavior - both source completions available
2476 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2477 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2478 >        try {
2479 >            assertNull(h4.join());
2480 >            rs[4].assertValue(v1);
2481 >        } catch (CompletionException ok) {
2482 >            checkCompletedWithWrappedException(h4, ex);
2483 >            rs[4].assertNotInvoked();
2484 >        }
2485 >        try {
2486 >            assertNull(h5.join());
2487 >            rs[5].assertValue(v1);
2488 >        } catch (CompletionException ok) {
2489 >            checkCompletedWithWrappedException(h5, ex);
2490 >            rs[5].assertNotInvoked();
2491 >        }
2492  
2493 <        f = new CompletableFuture<>();
2494 <        g = new CompletableFuture<>();
2495 <        h = f.thenCombineAsync(g, subtract, e);
2496 <        assertTrue(g.cancel(true));
2497 <        checkIncomplete(h);
2498 <        f.complete(3);
2499 <        checkCompletedWithWrappedCancellationException(h);
2493 >        checkCompletedExceptionally(f, ex);
2494 >        checkCompletedNormally(g, v1);
2495 >        checkCompletedWithWrappedException(h0, ex);
2496 >        checkCompletedWithWrappedException(h1, ex);
2497 >        checkCompletedWithWrappedException(h2, ex);
2498 >        checkCompletedWithWrappedException(h3, ex);
2499 >        checkCompletedWithWrappedException(h4, ex);
2500 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2501 >    }}
2502  
2503 <        f = new CompletableFuture<>();
2504 <        g = new CompletableFuture<>();
2505 <        assertTrue(g.cancel(true));
2506 <        h = f.thenCombineAsync(g, subtract, e);
2507 <        checkIncomplete(h);
2508 <        f.complete(3);
2509 <        checkCompletedWithWrappedCancellationException(h);
2503 >    public void testAcceptEither_exceptionalCompletion2() {
2504 >        for (ExecutionMode m : ExecutionMode.values())
2505 >        for (boolean fFirst : new boolean[] { true, false })
2506 >        for (Integer v1 : new Integer[] { 1, null })
2507 >    {
2508 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2509 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2510 >        final CFException ex = new CFException();
2511 >        final NoopConsumer[] rs = new NoopConsumer[6];
2512 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2513  
2514 <        f = new CompletableFuture<>();
2515 <        g = new CompletableFuture<>();
2516 <        assertTrue(f.cancel(true));
2517 <        assertTrue(g.cancel(true));
2518 <        h = f.thenCombineAsync(g, subtract, e);
2519 <        checkCompletedWithWrappedCancellationException(h);
2514 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2515 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2516 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2517 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2518 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2519 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2520 >
2521 >        // unspecified behavior - both source completions available
2522 >        try {
2523 >            assertEquals(null, h0.join());
2524 >            rs[0].assertValue(v1);
2525 >        } catch (CompletionException ok) {
2526 >            checkCompletedWithWrappedException(h0, ex);
2527 >            rs[0].assertNotInvoked();
2528 >        }
2529 >        try {
2530 >            assertEquals(null, h1.join());
2531 >            rs[1].assertValue(v1);
2532 >        } catch (CompletionException ok) {
2533 >            checkCompletedWithWrappedException(h1, ex);
2534 >            rs[1].assertNotInvoked();
2535 >        }
2536 >        try {
2537 >            assertEquals(null, h2.join());
2538 >            rs[2].assertValue(v1);
2539 >        } catch (CompletionException ok) {
2540 >            checkCompletedWithWrappedException(h2, ex);
2541 >            rs[2].assertNotInvoked();
2542 >        }
2543 >        try {
2544 >            assertEquals(null, h3.join());
2545 >            rs[3].assertValue(v1);
2546 >        } catch (CompletionException ok) {
2547 >            checkCompletedWithWrappedException(h3, ex);
2548 >            rs[3].assertNotInvoked();
2549 >        }
2550  
2551 <        assertEquals(0, e.count.get());
2552 <    }
2551 >        checkCompletedNormally(f, v1);
2552 >        checkCompletedExceptionally(g, ex);
2553 >    }}
2554  
2555      /**
2556 <     * thenAcceptBothAsync result completes normally after normal
2539 <     * completion of sources
2556 >     * acceptEither result completes exceptionally if either source cancelled
2557       */
2558 <    public void testThenAcceptBothAsyncE() {
2559 <        CompletableFuture<Integer> f, g;
2560 <        CompletableFuture<Void> h;
2561 <        SubtractAction r;
2562 <        ThreadExecutor e = new ThreadExecutor();
2558 >    public void testAcceptEither_sourceCancelled() {
2559 >        for (ExecutionMode m : ExecutionMode.values())
2560 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2561 >        for (Integer v1 : new Integer[] { 1, null })
2562 >    {
2563 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2564 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2565 >        final NoopConsumer[] rs = new NoopConsumer[6];
2566 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2567  
2568 <        f = new CompletableFuture<>();
2569 <        g = new CompletableFuture<>();
2570 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2571 <        f.complete(3);
2572 <        checkIncomplete(h);
2573 <        g.complete(1);
2574 <        checkCompletedNormally(h, null);
2575 <        assertEquals(r.value, 2);
2568 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2569 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2570 >        checkIncomplete(h0);
2571 >        checkIncomplete(h1);
2572 >        rs[0].assertNotInvoked();
2573 >        rs[1].assertNotInvoked();
2574 >        f.cancel(mayInterruptIfRunning);
2575 >        checkCompletedWithWrappedCancellationException(h0);
2576 >        checkCompletedWithWrappedCancellationException(h1);
2577 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2578 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2579 >        checkCompletedWithWrappedCancellationException(h2);
2580 >        checkCompletedWithWrappedCancellationException(h3);
2581  
2582 <        f = new CompletableFuture<>();
2557 <        g = new CompletableFuture<>();
2558 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2559 <        g.complete(1);
2560 <        checkIncomplete(h);
2561 <        f.complete(3);
2562 <        checkCompletedNormally(h, null);
2563 <        assertEquals(r.value, 2);
2582 >        g.complete(v1);
2583  
2584 <        f = new CompletableFuture<>();
2585 <        g = new CompletableFuture<>();
2586 <        g.complete(1);
2587 <        f.complete(3);
2588 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2589 <        checkCompletedNormally(h, null);
2590 <        assertEquals(r.value, 2);
2584 >        // unspecified behavior - both source completions available
2585 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2586 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2587 >        try {
2588 >            assertNull(h4.join());
2589 >            rs[4].assertValue(v1);
2590 >        } catch (CompletionException ok) {
2591 >            checkCompletedWithWrappedCancellationException(h4);
2592 >            rs[4].assertNotInvoked();
2593 >        }
2594 >        try {
2595 >            assertNull(h5.join());
2596 >            rs[5].assertValue(v1);
2597 >        } catch (CompletionException ok) {
2598 >            checkCompletedWithWrappedCancellationException(h5);
2599 >            rs[5].assertNotInvoked();
2600 >        }
2601  
2602 <        assertEquals(3, e.count.get());
2603 <    }
2602 >        checkCancelled(f);
2603 >        checkCompletedNormally(g, v1);
2604 >        checkCompletedWithWrappedCancellationException(h0);
2605 >        checkCompletedWithWrappedCancellationException(h1);
2606 >        checkCompletedWithWrappedCancellationException(h2);
2607 >        checkCompletedWithWrappedCancellationException(h3);
2608 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2609 >    }}
2610  
2611      /**
2612 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2578 <     * completion of source
2612 >     * acceptEither result completes exceptionally if action does
2613       */
2614 <    public void testThenAcceptBothAsync2E() {
2615 <        CompletableFuture<Integer> f, g;
2616 <        CompletableFuture<Void> h;
2617 <        SubtractAction r;
2618 <        ThreadExecutor e = new ThreadExecutor();
2619 <
2620 <        f = new CompletableFuture<>();
2621 <        g = new CompletableFuture<>();
2622 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2589 <        f.completeExceptionally(new CFException());
2590 <        checkIncomplete(h);
2591 <        g.complete(1);
2592 <        checkCompletedWithWrappedCFException(h);
2593 <
2594 <        f = new CompletableFuture<>();
2595 <        g = new CompletableFuture<>();
2596 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2597 <        g.completeExceptionally(new CFException());
2598 <        checkIncomplete(h);
2599 <        f.complete(3);
2600 <        checkCompletedWithWrappedCFException(h);
2601 <
2602 <        f = new CompletableFuture<>();
2603 <        g = new CompletableFuture<>();
2604 <        f.complete(3);
2605 <        g.completeExceptionally(new CFException());
2606 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2607 <        checkCompletedWithWrappedCFException(h);
2608 <
2609 <        f = new CompletableFuture<>();
2610 <        g = new CompletableFuture<>();
2611 <        f.completeExceptionally(new CFException());
2612 <        g.complete(3);
2613 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2614 <        checkCompletedWithWrappedCFException(h);
2615 <
2616 <        assertEquals(0, e.count.get());
2617 <    }
2614 >    public void testAcceptEither_actionFailed() {
2615 >        for (ExecutionMode m : ExecutionMode.values())
2616 >        for (Integer v1 : new Integer[] { 1, null })
2617 >        for (Integer v2 : new Integer[] { 2, null })
2618 >    {
2619 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2620 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2621 >        final FailingConsumer[] rs = new FailingConsumer[6];
2622 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2623  
2624 <    /**
2625 <     * thenAcceptBothAsync result completes exceptionally if action does
2626 <     */
2627 <    public void testThenAcceptBothAsync3E() {
2628 <        CompletableFuture<Integer> f, g;
2629 <        CompletableFuture<Void> h;
2630 <        FailingBiConsumer r;
2631 <        ThreadExecutor e = new ThreadExecutor();
2624 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2625 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2626 >        f.complete(v1);
2627 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2628 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2629 >        checkCompletedWithWrappedCFException(h0);
2630 >        checkCompletedWithWrappedCFException(h1);
2631 >        checkCompletedWithWrappedCFException(h2);
2632 >        checkCompletedWithWrappedCFException(h3);
2633 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2634  
2635 <        f = new CompletableFuture<>();
2629 <        g = new CompletableFuture<>();
2630 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2631 <        f.complete(3);
2632 <        checkIncomplete(h);
2633 <        g.complete(1);
2634 <        checkCompletedWithWrappedCFException(h);
2635 >        g.complete(v2);
2636  
2637 <        f = new CompletableFuture<>();
2638 <        g = new CompletableFuture<>();
2639 <        f.complete(3);
2640 <        g.complete(1);
2641 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2642 <        checkCompletedWithWrappedCFException(h);
2637 >        // unspecified behavior - both source completions available
2638 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2639 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2640 >
2641 >        checkCompletedWithWrappedCFException(h4);
2642 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2643 >                   Objects.equals(v2, rs[4].value));
2644 >        checkCompletedWithWrappedCFException(h5);
2645 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2646 >                   Objects.equals(v2, rs[5].value));
2647  
2648 <        assertEquals(2, e.count.get());
2649 <    }
2648 >        checkCompletedNormally(f, v1);
2649 >        checkCompletedNormally(g, v2);
2650 >    }}
2651  
2652      /**
2653 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2653 >     * runAfterEither result completes normally after normal completion
2654 >     * of either source
2655       */
2656 <    public void testThenAcceptBothAsync4E() {
2657 <        CompletableFuture<Integer> f, g;
2658 <        CompletableFuture<Void> h;
2659 <        SubtractAction r;
2660 <        ThreadExecutor e = new ThreadExecutor();
2661 <
2662 <        f = new CompletableFuture<>();
2663 <        g = new CompletableFuture<>();
2664 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2658 <        assertTrue(f.cancel(true));
2659 <        checkIncomplete(h);
2660 <        g.complete(1);
2661 <        checkCompletedWithWrappedCancellationException(h);
2656 >    public void testRunAfterEither_normalCompletion() {
2657 >        for (ExecutionMode m : ExecutionMode.values())
2658 >        for (Integer v1 : new Integer[] { 1, null })
2659 >        for (Integer v2 : new Integer[] { 2, null })
2660 >    {
2661 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2662 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2663 >        final Noop[] rs = new Noop[6];
2664 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2665  
2666 <        f = new CompletableFuture<>();
2667 <        g = new CompletableFuture<>();
2668 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2669 <        assertTrue(g.cancel(true));
2670 <        checkIncomplete(h);
2671 <        f.complete(3);
2672 <        checkCompletedWithWrappedCancellationException(h);
2666 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2667 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2668 >        checkIncomplete(h0);
2669 >        checkIncomplete(h1);
2670 >        rs[0].assertNotInvoked();
2671 >        rs[1].assertNotInvoked();
2672 >        f.complete(v1);
2673 >        checkCompletedNormally(h0, null);
2674 >        checkCompletedNormally(h1, null);
2675 >        rs[0].assertInvoked();
2676 >        rs[1].assertInvoked();
2677 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2678 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2679 >        checkCompletedNormally(h2, null);
2680 >        checkCompletedNormally(h3, null);
2681 >        rs[2].assertInvoked();
2682 >        rs[3].assertInvoked();
2683  
2684 <        f = new CompletableFuture<>();
2672 <        g = new CompletableFuture<>();
2673 <        f.complete(3);
2674 <        assertTrue(g.cancel(true));
2675 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2676 <        checkCompletedWithWrappedCancellationException(h);
2684 >        g.complete(v2);
2685  
2686 <        f = new CompletableFuture<>();
2687 <        g = new CompletableFuture<>();
2680 <        assertTrue(f.cancel(true));
2681 <        g.complete(3);
2682 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2683 <        checkCompletedWithWrappedCancellationException(h);
2686 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2687 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2688  
2689 <        assertEquals(0, e.count.get());
2690 <    }
2689 >        checkCompletedNormally(f, v1);
2690 >        checkCompletedNormally(g, v2);
2691 >        checkCompletedNormally(h0, null);
2692 >        checkCompletedNormally(h1, null);
2693 >        checkCompletedNormally(h2, null);
2694 >        checkCompletedNormally(h3, null);
2695 >        checkCompletedNormally(h4, null);
2696 >        checkCompletedNormally(h5, null);
2697 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2698 >    }}
2699  
2700      /**
2701 <     * applyToEitherAsync result completes normally after normal
2702 <     * completion of sources
2701 >     * runAfterEither result completes exceptionally after exceptional
2702 >     * completion of either source
2703       */
2704 <    public void testApplyToEitherAsyncE() {
2705 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2706 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2707 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2708 <        f.complete(one);
2709 <        checkCompletedNormally(g, two);
2710 <
2711 <        f = new CompletableFuture<>();
2712 <        f.complete(one);
2701 <        f2 = new CompletableFuture<>();
2702 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2703 <        checkCompletedNormally(g, two);
2704 <    }
2704 >    public void testRunAfterEither_exceptionalCompletion() {
2705 >        for (ExecutionMode m : ExecutionMode.values())
2706 >        for (Integer v1 : new Integer[] { 1, null })
2707 >    {
2708 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2709 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2710 >        final CFException ex = new CFException();
2711 >        final Noop[] rs = new Noop[6];
2712 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2713  
2714 <    /**
2715 <     * applyToEitherAsync result completes exceptionally after exceptional
2716 <     * completion of source
2717 <     */
2718 <    public void testApplyToEitherAsync2E() {
2719 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2720 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2721 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2722 <        f.completeExceptionally(new CFException());
2723 <        checkCompletedWithWrappedCFException(g);
2714 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2715 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2716 >        checkIncomplete(h0);
2717 >        checkIncomplete(h1);
2718 >        rs[0].assertNotInvoked();
2719 >        rs[1].assertNotInvoked();
2720 >        assertTrue(f.completeExceptionally(ex));
2721 >        checkCompletedWithWrappedException(h0, ex);
2722 >        checkCompletedWithWrappedException(h1, ex);
2723 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2724 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2725 >        checkCompletedWithWrappedException(h2, ex);
2726 >        checkCompletedWithWrappedException(h3, ex);
2727 >
2728 >        assertTrue(g.complete(v1));
2729 >
2730 >        // unspecified behavior - both source completions available
2731 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2732 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2733 >        try {
2734 >            assertNull(h4.join());
2735 >            rs[4].assertInvoked();
2736 >        } catch (CompletionException ok) {
2737 >            checkCompletedWithWrappedException(h4, ex);
2738 >            rs[4].assertNotInvoked();
2739 >        }
2740 >        try {
2741 >            assertNull(h5.join());
2742 >            rs[5].assertInvoked();
2743 >        } catch (CompletionException ok) {
2744 >            checkCompletedWithWrappedException(h5, ex);
2745 >            rs[5].assertNotInvoked();
2746 >        }
2747  
2748 <        f = new CompletableFuture<>();
2749 <        f2 = new CompletableFuture<>();
2750 <        f2.completeExceptionally(new CFException());
2751 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2752 <        f.complete(one);
2753 <        checkCompletedWithWrappedCFException(g);
2754 <    }
2748 >        checkCompletedExceptionally(f, ex);
2749 >        checkCompletedNormally(g, v1);
2750 >        checkCompletedWithWrappedException(h0, ex);
2751 >        checkCompletedWithWrappedException(h1, ex);
2752 >        checkCompletedWithWrappedException(h2, ex);
2753 >        checkCompletedWithWrappedException(h3, ex);
2754 >        checkCompletedWithWrappedException(h4, ex);
2755 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2756 >    }}
2757  
2758 <    /**
2759 <     * applyToEitherAsync result completes exceptionally if action does
2760 <     */
2761 <    public void testApplyToEitherAsync3E() {
2762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2763 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2764 <        FailingFunction r = new FailingFunction();
2765 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2766 <        f.complete(one);
2767 <        checkCompletedWithWrappedCFException(g);
2735 <    }
2758 >    public void testRunAfterEither_exceptionalCompletion2() {
2759 >        for (ExecutionMode m : ExecutionMode.values())
2760 >        for (boolean fFirst : new boolean[] { true, false })
2761 >        for (Integer v1 : new Integer[] { 1, null })
2762 >    {
2763 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2764 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2765 >        final CFException ex = new CFException();
2766 >        final Noop[] rs = new Noop[6];
2767 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2768  
2769 <    /**
2770 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2771 <     */
2772 <    public void testApplyToEitherAsync4E() {
2773 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2774 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2775 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2776 <        assertTrue(f.cancel(true));
2777 <        checkCompletedWithWrappedCancellationException(g);
2769 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2770 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2771 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2772 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2773 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2774 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2775 >
2776 >        // unspecified behavior - both source completions available
2777 >        try {
2778 >            assertEquals(null, h0.join());
2779 >            rs[0].assertInvoked();
2780 >        } catch (CompletionException ok) {
2781 >            checkCompletedWithWrappedException(h0, ex);
2782 >            rs[0].assertNotInvoked();
2783 >        }
2784 >        try {
2785 >            assertEquals(null, h1.join());
2786 >            rs[1].assertInvoked();
2787 >        } catch (CompletionException ok) {
2788 >            checkCompletedWithWrappedException(h1, ex);
2789 >            rs[1].assertNotInvoked();
2790 >        }
2791 >        try {
2792 >            assertEquals(null, h2.join());
2793 >            rs[2].assertInvoked();
2794 >        } catch (CompletionException ok) {
2795 >            checkCompletedWithWrappedException(h2, ex);
2796 >            rs[2].assertNotInvoked();
2797 >        }
2798 >        try {
2799 >            assertEquals(null, h3.join());
2800 >            rs[3].assertInvoked();
2801 >        } catch (CompletionException ok) {
2802 >            checkCompletedWithWrappedException(h3, ex);
2803 >            rs[3].assertNotInvoked();
2804 >        }
2805  
2806 <        f = new CompletableFuture<>();
2807 <        f2 = new CompletableFuture<>();
2808 <        assertTrue(f2.cancel(true));
2750 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2751 <        checkCompletedWithWrappedCancellationException(g);
2752 <    }
2806 >        checkCompletedNormally(f, v1);
2807 >        checkCompletedExceptionally(g, ex);
2808 >    }}
2809  
2810      /**
2811 <     * acceptEitherAsync result completes normally after normal
2756 <     * completion of sources
2811 >     * runAfterEither result completes exceptionally if either source cancelled
2812       */
2813 <    public void testAcceptEitherAsyncE() {
2814 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2815 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2816 <        IncAction r = new IncAction();
2817 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2818 <        f.complete(one);
2819 <        checkCompletedNormally(g, null);
2820 <        assertEquals(r.value, 2);
2821 <
2767 <        r = new IncAction();
2768 <        f = new CompletableFuture<>();
2769 <        f.complete(one);
2770 <        f2 = new CompletableFuture<>();
2771 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2772 <        checkCompletedNormally(g, null);
2773 <        assertEquals(r.value, 2);
2774 <    }
2813 >    public void testRunAfterEither_sourceCancelled() {
2814 >        for (ExecutionMode m : ExecutionMode.values())
2815 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2816 >        for (Integer v1 : new Integer[] { 1, null })
2817 >    {
2818 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2819 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2820 >        final Noop[] rs = new Noop[6];
2821 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2822  
2823 <    /**
2824 <     * acceptEitherAsync result completes exceptionally after exceptional
2825 <     * completion of source
2826 <     */
2827 <    public void testAcceptEitherAsync2E() {
2828 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2829 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2830 <        IncAction r = new IncAction();
2831 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2832 <        f.completeExceptionally(new CFException());
2833 <        checkCompletedWithWrappedCFException(g);
2823 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2824 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2825 >        checkIncomplete(h0);
2826 >        checkIncomplete(h1);
2827 >        rs[0].assertNotInvoked();
2828 >        rs[1].assertNotInvoked();
2829 >        f.cancel(mayInterruptIfRunning);
2830 >        checkCompletedWithWrappedCancellationException(h0);
2831 >        checkCompletedWithWrappedCancellationException(h1);
2832 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2833 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2834 >        checkCompletedWithWrappedCancellationException(h2);
2835 >        checkCompletedWithWrappedCancellationException(h3);
2836 >
2837 >        assertTrue(g.complete(v1));
2838 >
2839 >        // unspecified behavior - both source completions available
2840 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2841 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2842 >        try {
2843 >            assertNull(h4.join());
2844 >            rs[4].assertInvoked();
2845 >        } catch (CompletionException ok) {
2846 >            checkCompletedWithWrappedCancellationException(h4);
2847 >            rs[4].assertNotInvoked();
2848 >        }
2849 >        try {
2850 >            assertNull(h5.join());
2851 >            rs[5].assertInvoked();
2852 >        } catch (CompletionException ok) {
2853 >            checkCompletedWithWrappedCancellationException(h5);
2854 >            rs[5].assertNotInvoked();
2855 >        }
2856  
2857 <        r = new IncAction();
2858 <        f = new CompletableFuture<>();
2859 <        f2 = new CompletableFuture<>();
2860 <        f2.completeExceptionally(new CFException());
2861 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2862 <        f.complete(one);
2863 <        checkCompletedWithWrappedCFException(g);
2864 <    }
2857 >        checkCancelled(f);
2858 >        checkCompletedNormally(g, v1);
2859 >        checkCompletedWithWrappedCancellationException(h0);
2860 >        checkCompletedWithWrappedCancellationException(h1);
2861 >        checkCompletedWithWrappedCancellationException(h2);
2862 >        checkCompletedWithWrappedCancellationException(h3);
2863 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2864 >    }}
2865  
2866      /**
2867 <     * acceptEitherAsync result completes exceptionally if action does
2867 >     * runAfterEither result completes exceptionally if action does
2868       */
2869 <    public void testAcceptEitherAsync3E() {
2870 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2871 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2872 <        FailingConsumer r = new FailingConsumer();
2873 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2874 <        f.complete(one);
2875 <        checkCompletedWithWrappedCFException(g);
2876 <    }
2869 >    public void testRunAfterEither_actionFailed() {
2870 >        for (ExecutionMode m : ExecutionMode.values())
2871 >        for (Integer v1 : new Integer[] { 1, null })
2872 >        for (Integer v2 : new Integer[] { 2, null })
2873 >    {
2874 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2875 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2876 >        final FailingRunnable[] rs = new FailingRunnable[6];
2877 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2878  
2879 <    /**
2880 <     * acceptEitherAsync result completes exceptionally if either
2881 <     * source cancelled
2882 <     */
2883 <    public void testAcceptEitherAsync4E() {
2884 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2885 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2886 <        IncAction r = new IncAction();
2887 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2888 <        assertTrue(f.cancel(true));
2889 <        checkCompletedWithWrappedCancellationException(g);
2879 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2880 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2881 >        assertTrue(f.complete(v1));
2882 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2883 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2884 >        checkCompletedWithWrappedCFException(h0);
2885 >        checkCompletedWithWrappedCFException(h1);
2886 >        checkCompletedWithWrappedCFException(h2);
2887 >        checkCompletedWithWrappedCFException(h3);
2888 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2889 >        assertTrue(g.complete(v2));
2890 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2891 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2892 >        checkCompletedWithWrappedCFException(h4);
2893 >        checkCompletedWithWrappedCFException(h5);
2894  
2895 <        r = new IncAction();
2896 <        f = new CompletableFuture<>();
2897 <        f2 = new CompletableFuture<>();
2898 <        assertTrue(f2.cancel(true));
2825 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2826 <        checkCompletedWithWrappedCancellationException(g);
2827 <    }
2895 >        checkCompletedNormally(f, v1);
2896 >        checkCompletedNormally(g, v2);
2897 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2898 >    }}
2899  
2900      /**
2901 <     * runAfterEitherAsync result completes normally after normal
2831 <     * completion of sources
2901 >     * thenCompose result completes normally after normal completion of source
2902       */
2903 <    public void testRunAfterEitherAsyncE() {
2904 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2905 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2906 <        Noop r = new Noop();
2907 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2908 <        f.complete(one);
2909 <        checkCompletedNormally(g, null);
2910 <        assertTrue(r.ran);
2903 >    public void testThenCompose_normalCompletion() {
2904 >        for (ExecutionMode m : ExecutionMode.values())
2905 >        for (boolean createIncomplete : new boolean[] { true, false })
2906 >        for (Integer v1 : new Integer[] { 1, null })
2907 >    {
2908 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2909 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2910 >        if (!createIncomplete) assertTrue(f.complete(v1));
2911 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2912 >        if (createIncomplete) assertTrue(f.complete(v1));
2913  
2914 <        r = new Noop();
2915 <        f = new CompletableFuture<>();
2916 <        f.complete(one);
2917 <        f2 = new CompletableFuture<>();
2846 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2847 <        checkCompletedNormally(g, null);
2848 <        assertTrue(r.ran);
2849 <    }
2914 >        checkCompletedNormally(g, inc(v1));
2915 >        checkCompletedNormally(f, v1);
2916 >        r.assertValue(v1);
2917 >    }}
2918  
2919      /**
2920 <     * runAfterEitherAsync result completes exceptionally after exceptional
2920 >     * thenCompose result completes exceptionally after exceptional
2921       * completion of source
2922       */
2923 <    public void testRunAfterEitherAsync2E() {
2924 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2925 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2926 <        Noop r = new Noop();
2927 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2928 <        f.completeExceptionally(new CFException());
2929 <        checkCompletedWithWrappedCFException(g);
2930 <
2931 <        r = new Noop();
2932 <        f = new CompletableFuture<>();
2933 <        f2 = new CompletableFuture<>();
2934 <        f2.completeExceptionally(new CFException());
2935 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2936 <        f.complete(one);
2937 <        checkCompletedWithWrappedCFException(g);
2870 <    }
2923 >    public void testThenCompose_exceptionalCompletion() {
2924 >        for (ExecutionMode m : ExecutionMode.values())
2925 >        for (boolean createIncomplete : new boolean[] { true, false })
2926 >    {
2927 >        final CFException ex = new CFException();
2928 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2929 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2930 >        if (!createIncomplete) f.completeExceptionally(ex);
2931 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2932 >        if (createIncomplete) f.completeExceptionally(ex);
2933 >
2934 >        checkCompletedWithWrappedException(g, ex);
2935 >        checkCompletedExceptionally(f, ex);
2936 >        r.assertNotInvoked();
2937 >    }}
2938  
2939      /**
2940 <     * runAfterEitherAsync result completes exceptionally if action does
2940 >     * thenCompose result completes exceptionally if action does
2941       */
2942 <    public void testRunAfterEitherAsync3E() {
2943 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2944 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2945 <        FailingNoop r = new FailingNoop();
2946 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2947 <        f.complete(one);
2942 >    public void testThenCompose_actionFailed() {
2943 >        for (ExecutionMode m : ExecutionMode.values())
2944 >        for (boolean createIncomplete : new boolean[] { true, false })
2945 >        for (Integer v1 : new Integer[] { 1, null })
2946 >    {
2947 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2948 >        final FailingCompletableFutureFunction r
2949 >            = new FailingCompletableFutureFunction(m);
2950 >        if (!createIncomplete) assertTrue(f.complete(v1));
2951 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2952 >        if (createIncomplete) assertTrue(f.complete(v1));
2953 >
2954          checkCompletedWithWrappedCFException(g);
2955 <    }
2955 >        checkCompletedNormally(f, v1);
2956 >    }}
2957  
2958      /**
2959 <     * runAfterEitherAsync result completes exceptionally if either
2886 <     * source cancelled
2959 >     * thenCompose result completes exceptionally if source cancelled
2960       */
2961 <    public void testRunAfterEitherAsync4E() {
2962 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2963 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2964 <        Noop r = new Noop();
2965 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2966 <        assertTrue(f.cancel(true));
2967 <        checkCompletedWithWrappedCancellationException(g);
2961 >    public void testThenCompose_sourceCancelled() {
2962 >        for (ExecutionMode m : ExecutionMode.values())
2963 >        for (boolean createIncomplete : new boolean[] { true, false })
2964 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2965 >    {
2966 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2967 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2968 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2969 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2970 >        if (createIncomplete) {
2971 >            checkIncomplete(g);
2972 >            assertTrue(f.cancel(mayInterruptIfRunning));
2973 >        }
2974  
2896        r = new Noop();
2897        f = new CompletableFuture<>();
2898        f2 = new CompletableFuture<>();
2899        assertTrue(f2.cancel(true));
2900        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2975          checkCompletedWithWrappedCancellationException(g);
2976 <    }
2977 <
2904 <    /**
2905 <     * thenComposeAsync result completes normally after normal
2906 <     * completion of source
2907 <     */
2908 <    public void testThenComposeAsyncE() {
2909 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2910 <        CompletableFutureInc r = new CompletableFutureInc();
2911 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2912 <        f.complete(one);
2913 <        checkCompletedNormally(g, two);
2914 <    }
2915 <
2916 <    /**
2917 <     * thenComposeAsync result completes exceptionally after
2918 <     * exceptional completion of source
2919 <     */
2920 <    public void testThenComposeAsync2E() {
2921 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2922 <        CompletableFutureInc r = new CompletableFutureInc();
2923 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2924 <        f.completeExceptionally(new CFException());
2925 <        checkCompletedWithWrappedCFException(g);
2926 <    }
2976 >        checkCancelled(f);
2977 >    }}
2978  
2979      /**
2980 <     * thenComposeAsync result completes exceptionally if action does
2980 >     * thenCompose result completes exceptionally if the result of the action does
2981       */
2982 <    public void testThenComposeAsync3E() {
2983 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2984 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2985 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2986 <        f.complete(one);
2987 <        checkCompletedWithWrappedCFException(g);
2988 <    }
2982 >    public void testThenCompose_actionReturnsFailingFuture() {
2983 >        for (ExecutionMode m : ExecutionMode.values())
2984 >        for (int order = 0; order < 6; order++)
2985 >        for (Integer v1 : new Integer[] { 1, null })
2986 >    {
2987 >        final CFException ex = new CFException();
2988 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2989 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2990 >        final CompletableFuture<Integer> h;
2991 >        // Test all permutations of orders
2992 >        switch (order) {
2993 >        case 0:
2994 >            assertTrue(f.complete(v1));
2995 >            assertTrue(g.completeExceptionally(ex));
2996 >            h = m.thenCompose(f, (x -> g));
2997 >            break;
2998 >        case 1:
2999 >            assertTrue(f.complete(v1));
3000 >            h = m.thenCompose(f, (x -> g));
3001 >            assertTrue(g.completeExceptionally(ex));
3002 >            break;
3003 >        case 2:
3004 >            assertTrue(g.completeExceptionally(ex));
3005 >            assertTrue(f.complete(v1));
3006 >            h = m.thenCompose(f, (x -> g));
3007 >            break;
3008 >        case 3:
3009 >            assertTrue(g.completeExceptionally(ex));
3010 >            h = m.thenCompose(f, (x -> g));
3011 >            assertTrue(f.complete(v1));
3012 >            break;
3013 >        case 4:
3014 >            h = m.thenCompose(f, (x -> g));
3015 >            assertTrue(f.complete(v1));
3016 >            assertTrue(g.completeExceptionally(ex));
3017 >            break;
3018 >        case 5:
3019 >            h = m.thenCompose(f, (x -> g));
3020 >            assertTrue(f.complete(v1));
3021 >            assertTrue(g.completeExceptionally(ex));
3022 >            break;
3023 >        default: throw new AssertionError();
3024 >        }
3025  
3026 <    /**
3027 <     * thenComposeAsync result completes exceptionally if source cancelled
3028 <     */
3029 <    public void testThenComposeAsync4E() {
2943 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2944 <        CompletableFutureInc r = new CompletableFutureInc();
2945 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2946 <        assertTrue(f.cancel(true));
2947 <        checkCompletedWithWrappedCancellationException(g);
2948 <    }
3026 >        checkCompletedExceptionally(g, ex);
3027 >        checkCompletedWithWrappedException(h, ex);
3028 >        checkCompletedNormally(f, v1);
3029 >    }}
3030  
3031      // other static methods
3032  
# Line 2963 | Line 3044 | public class CompletableFutureTest exten
3044       * when all components complete normally
3045       */
3046      public void testAllOf_normal() throws Exception {
3047 <        for (int k = 1; k < 20; ++k) {
3048 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3049 <            for (int i = 0; i < k; ++i)
3047 >        for (int k = 1; k < 10; k++) {
3048 >            CompletableFuture<Integer>[] fs
3049 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3050 >            for (int i = 0; i < k; i++)
3051 >                fs[i] = new CompletableFuture<>();
3052 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3053 >            for (int i = 0; i < k; i++) {
3054 >                checkIncomplete(f);
3055 >                checkIncomplete(CompletableFuture.allOf(fs));
3056 >                fs[i].complete(one);
3057 >            }
3058 >            checkCompletedNormally(f, null);
3059 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3060 >        }
3061 >    }
3062 >
3063 >    public void testAllOf_backwards() throws Exception {
3064 >        for (int k = 1; k < 10; k++) {
3065 >            CompletableFuture<Integer>[] fs
3066 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3067 >            for (int i = 0; i < k; i++)
3068                  fs[i] = new CompletableFuture<>();
3069              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3070 <            for (int i = 0; i < k; ++i) {
3070 >            for (int i = k - 1; i >= 0; i--) {
3071                  checkIncomplete(f);
3072                  checkIncomplete(CompletableFuture.allOf(fs));
3073                  fs[i].complete(one);
# Line 2978 | Line 3077 | public class CompletableFutureTest exten
3077          }
3078      }
3079  
3080 +    public void testAllOf_exceptional() throws Exception {
3081 +        for (int k = 1; k < 10; k++) {
3082 +            CompletableFuture<Integer>[] fs
3083 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3084 +            CFException ex = new CFException();
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++) {
3089 +                checkIncomplete(f);
3090 +                checkIncomplete(CompletableFuture.allOf(fs));
3091 +                if (i != k / 2) {
3092 +                    fs[i].complete(i);
3093 +                    checkCompletedNormally(fs[i], i);
3094 +                } else {
3095 +                    fs[i].completeExceptionally(ex);
3096 +                    checkCompletedExceptionally(fs[i], ex);
3097 +                }
3098 +            }
3099 +            checkCompletedWithWrappedException(f, ex);
3100 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3101 +        }
3102 +    }
3103 +
3104      /**
3105       * anyOf(no component futures) returns an incomplete future
3106       */
3107      public void testAnyOf_empty() throws Exception {
3108 +        for (Integer v1 : new Integer[] { 1, null })
3109 +    {
3110          CompletableFuture<Object> f = CompletableFuture.anyOf();
3111          checkIncomplete(f);
3112 <    }
3112 >
3113 >        f.complete(v1);
3114 >        checkCompletedNormally(f, v1);
3115 >    }}
3116  
3117      /**
3118       * anyOf returns a future completed normally with a value when
3119       * a component future does
3120       */
3121      public void testAnyOf_normal() throws Exception {
3122 <        for (int k = 0; k < 10; ++k) {
3122 >        for (int k = 0; k < 10; k++) {
3123              CompletableFuture[] fs = new CompletableFuture[k];
3124 <            for (int i = 0; i < k; ++i)
3124 >            for (int i = 0; i < k; i++)
3125                  fs[i] = new CompletableFuture<>();
3126              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3127              checkIncomplete(f);
3128 <            for (int i = 0; i < k; ++i) {
3129 <                fs[i].complete(one);
3130 <                checkCompletedNormally(f, one);
3131 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3128 >            for (int i = 0; i < k; i++) {
3129 >                fs[i].complete(i);
3130 >                checkCompletedNormally(f, 0);
3131 >                int x = (int) CompletableFuture.anyOf(fs).join();
3132 >                assertTrue(0 <= x && x <= i);
3133 >            }
3134 >        }
3135 >    }
3136 >    public void testAnyOf_normal_backwards() throws Exception {
3137 >        for (int k = 0; k < 10; k++) {
3138 >            CompletableFuture[] fs = new CompletableFuture[k];
3139 >            for (int i = 0; i < k; i++)
3140 >                fs[i] = new CompletableFuture<>();
3141 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3142 >            checkIncomplete(f);
3143 >            for (int i = k - 1; i >= 0; i--) {
3144 >                fs[i].complete(i);
3145 >                checkCompletedNormally(f, k - 1);
3146 >                int x = (int) CompletableFuture.anyOf(fs).join();
3147 >                assertTrue(i <= x && x <= k - 1);
3148              }
3149          }
3150      }
# Line 3009 | Line 3153 | public class CompletableFutureTest exten
3153       * anyOf result completes exceptionally when any component does.
3154       */
3155      public void testAnyOf_exceptional() throws Exception {
3156 <        for (int k = 0; k < 10; ++k) {
3156 >        for (int k = 0; k < 10; k++) {
3157              CompletableFuture[] fs = new CompletableFuture[k];
3158 <            for (int i = 0; i < k; ++i)
3158 >            CFException[] exs = new CFException[k];
3159 >            for (int i = 0; i < k; i++) {
3160                  fs[i] = new CompletableFuture<>();
3161 +                exs[i] = new CFException();
3162 +            }
3163 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3164 +            checkIncomplete(f);
3165 +            for (int i = 0; i < k; i++) {
3166 +                fs[i].completeExceptionally(exs[i]);
3167 +                checkCompletedWithWrappedException(f, exs[0]);
3168 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3169 +            }
3170 +        }
3171 +    }
3172 +
3173 +    public void testAnyOf_exceptional_backwards() throws Exception {
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(new CFException());
3185 <                checkCompletedWithWrappedCFException(f);
3183 >            for (int i = k - 1; i >= 0; i--) {
3184 >                fs[i].completeExceptionally(exs[i]);
3185 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3186                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3187              }
3188          }
# Line 3030 | Line 3195 | public class CompletableFutureTest exten
3195          CompletableFuture<Integer> f = new CompletableFuture<>();
3196          CompletableFuture<Integer> g = new CompletableFuture<>();
3197          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3033        CompletableFuture<?> h;
3198          ThreadExecutor exec = new ThreadExecutor();
3199  
3200          Runnable[] throwingActions = {
3201              () -> CompletableFuture.supplyAsync(null),
3202              () -> CompletableFuture.supplyAsync(null, exec),
3203 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3203 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3204  
3205              () -> CompletableFuture.runAsync(null),
3206              () -> CompletableFuture.runAsync(null, exec),
# Line 3109 | Line 3273 | public class CompletableFutureTest exten
3273  
3274              () -> f.thenCompose(null),
3275              () -> f.thenComposeAsync(null),
3276 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3276 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3277              () -> f.thenComposeAsync(null, exec),
3278  
3279              () -> f.exceptionally(null),
# Line 3127 | Line 3291 | public class CompletableFutureTest exten
3291              () -> CompletableFuture.anyOf(null, f),
3292  
3293              () -> f.obtrudeException(null),
3294 +
3295 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3296 +            () -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
3297 +            () -> CompletableFuture.delayedExecutor(1L, null),
3298 +
3299 +            () -> f.orTimeout(1L, null),
3300 +            () -> f.completeOnTimeout(42, 1L, null),
3301 +
3302 +            () -> CompletableFuture.failedFuture(null),
3303 +            () -> CompletableFuture.failedStage(null),
3304          };
3305  
3306          assertThrows(NullPointerException.class, throwingActions);
# Line 3141 | Line 3315 | public class CompletableFutureTest exten
3315          assertSame(f, f.toCompletableFuture());
3316      }
3317  
3318 +    // jdk9
3319 +
3320      /**
3321 <     * whenComplete action executes on normal completion, propagating
3146 <     * source result.
3321 >     * newIncompleteFuture returns an incomplete CompletableFuture
3322       */
3323 <    public void testWhenComplete1() {
3324 <        final AtomicInteger a = new AtomicInteger();
3323 >    public void testNewIncompleteFuture() {
3324 >        for (Integer v1 : new Integer[] { 1, null })
3325 >    {
3326          CompletableFuture<Integer> f = new CompletableFuture<>();
3327 <        CompletableFuture<Integer> g =
3328 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3329 <        f.complete(three);
3330 <        checkCompletedNormally(f, three);
3331 <        checkCompletedNormally(g, three);
3332 <        assertEquals(a.get(), 1);
3327 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3328 >        checkIncomplete(f);
3329 >        checkIncomplete(g);
3330 >        f.complete(v1);
3331 >        checkCompletedNormally(f, v1);
3332 >        checkIncomplete(g);
3333 >        g.complete(v1);
3334 >        checkCompletedNormally(g, v1);
3335 >        assertSame(g.getClass(), CompletableFuture.class);
3336 >    }}
3337 >
3338 >    /**
3339 >     * completedStage returns a completed CompletionStage
3340 >     */
3341 >    public void testCompletedStage() {
3342 >        AtomicInteger x = new AtomicInteger(0);
3343 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3344 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3345 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3346 >        assertEquals(x.get(), 1);
3347 >        assertNull(r.get());
3348      }
3349  
3350      /**
3351 <     * whenComplete action executes on exceptional completion, propagating
3352 <     * source result.
3351 >     * defaultExecutor by default returns the commonPool if
3352 >     * it supports more than one thread.
3353       */
3354 <    public void testWhenComplete2() {
3164 <        final AtomicInteger a = new AtomicInteger();
3354 >    public void testDefaultExecutor() {
3355          CompletableFuture<Integer> f = new CompletableFuture<>();
3356 <        CompletableFuture<Integer> g =
3357 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3358 <        f.completeExceptionally(new CFException());
3359 <        assertTrue(f.isCompletedExceptionally());
3360 <        assertTrue(g.isCompletedExceptionally());
3361 <        assertEquals(a.get(), 1);
3356 >        Executor e = f.defaultExecutor();
3357 >        Executor c = ForkJoinPool.commonPool();
3358 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3359 >            assertSame(e, c);
3360 >        else
3361 >            assertNotSame(e, c);
3362      }
3363  
3364      /**
3365 <     * If a whenComplete action throws an exception when triggered by
3366 <     * a normal completion, it completes exceptionally
3365 >     * failedFuture returns a CompletableFuture completed
3366 >     * exceptionally with the given Exception
3367       */
3368 <    public void testWhenComplete3() {
3369 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3370 <        CompletableFuture<Integer> g =
3371 <            f.whenComplete((Integer x, Throwable t) ->
3182 <                           { throw new CFException(); } );
3183 <        f.complete(three);
3184 <        checkCompletedNormally(f, three);
3185 <        assertTrue(g.isCompletedExceptionally());
3186 <        checkCompletedWithWrappedCFException(g);
3368 >    public void testFailedFuture() {
3369 >        CFException ex = new CFException();
3370 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3371 >        checkCompletedExceptionally(f, ex);
3372      }
3373  
3374      /**
3375 <     * whenCompleteAsync action executes on normal completion, propagating
3191 <     * source result.
3375 >     * failedFuture(null) throws NPE
3376       */
3377 <    public void testWhenCompleteAsync1() {
3378 <        final AtomicInteger a = new AtomicInteger();
3379 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3380 <        CompletableFuture<Integer> g =
3381 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3198 <        f.complete(three);
3199 <        checkCompletedNormally(f, three);
3200 <        checkCompletedNormally(g, three);
3201 <        assertEquals(a.get(), 1);
3377 >    public void testFailedFuture_null() {
3378 >        try {
3379 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3380 >            shouldThrow();
3381 >        } catch (NullPointerException success) {}
3382      }
3383  
3384      /**
3385 <     * whenCompleteAsync action executes on exceptional completion, propagating
3386 <     * source result.
3385 >     * copy returns a CompletableFuture that is completed normally,
3386 >     * with the same value, when source is.
3387       */
3388 <    public void testWhenCompleteAsync2() {
3209 <        final AtomicInteger a = new AtomicInteger();
3388 >    public void testCopy() {
3389          CompletableFuture<Integer> f = new CompletableFuture<>();
3390 <        CompletableFuture<Integer> g =
3391 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3392 <        f.completeExceptionally(new CFException());
3393 <        checkCompletedWithWrappedCFException(f);
3394 <        checkCompletedWithWrappedCFException(g);
3390 >        CompletableFuture<Integer> g = f.copy();
3391 >        checkIncomplete(f);
3392 >        checkIncomplete(g);
3393 >        f.complete(1);
3394 >        checkCompletedNormally(f, 1);
3395 >        checkCompletedNormally(g, 1);
3396      }
3397  
3398      /**
3399 <     * If a whenCompleteAsync action throws an exception when
3400 <     * triggered by a normal completion, it completes exceptionally
3399 >     * copy returns a CompletableFuture that is completed exceptionally
3400 >     * when source is.
3401       */
3402 <    public void testWhenCompleteAsync3() {
3402 >    public void testCopy2() {
3403          CompletableFuture<Integer> f = new CompletableFuture<>();
3404 <        CompletableFuture<Integer> g =
3405 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3406 <                           { throw new CFException(); } );
3407 <        f.complete(three);
3408 <        checkCompletedNormally(f, three);
3409 <        checkCompletedWithWrappedCFException(g);
3404 >        CompletableFuture<Integer> g = f.copy();
3405 >        checkIncomplete(f);
3406 >        checkIncomplete(g);
3407 >        CFException ex = new CFException();
3408 >        f.completeExceptionally(ex);
3409 >        checkCompletedExceptionally(f, ex);
3410 >        checkCompletedWithWrappedException(g, ex);
3411      }
3412  
3413      /**
3414 <     * whenCompleteAsync action executes on normal completion, propagating
3415 <     * source result.
3414 >     * minimalCompletionStage returns a CompletableFuture that is
3415 >     * completed normally, with the same value, when source is.
3416       */
3417 <    public void testWhenCompleteAsync1e() {
3237 <        final AtomicInteger a = new AtomicInteger();
3238 <        ThreadExecutor exec = new ThreadExecutor();
3417 >    public void testMinimalCompletionStage() {
3418          CompletableFuture<Integer> f = new CompletableFuture<>();
3419 <        CompletableFuture<Integer> g =
3420 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3421 <                                exec);
3422 <        f.complete(three);
3423 <        checkCompletedNormally(f, three);
3424 <        checkCompletedNormally(g, three);
3425 <        assertEquals(a.get(), 1);
3419 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3420 >        AtomicInteger x = new AtomicInteger(0);
3421 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3422 >        checkIncomplete(f);
3423 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3424 >        f.complete(1);
3425 >        checkCompletedNormally(f, 1);
3426 >        assertEquals(x.get(), 1);
3427 >        assertNull(r.get());
3428      }
3429  
3430      /**
3431 <     * whenCompleteAsync action executes on exceptional completion, propagating
3432 <     * source result.
3431 >     * minimalCompletionStage returns a CompletableFuture that is
3432 >     * completed exceptionally when source is.
3433       */
3434 <    public void testWhenCompleteAsync2e() {
3254 <        final AtomicInteger a = new AtomicInteger();
3255 <        ThreadExecutor exec = new ThreadExecutor();
3434 >    public void testMinimalCompletionStage2() {
3435          CompletableFuture<Integer> f = new CompletableFuture<>();
3436 <        CompletableFuture<Integer> g =
3437 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3438 <                                exec);
3439 <        f.completeExceptionally(new CFException());
3440 <        checkCompletedWithWrappedCFException(f);
3441 <        checkCompletedWithWrappedCFException(g);
3436 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3437 >        AtomicInteger x = new AtomicInteger(0);
3438 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3439 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3440 >        checkIncomplete(f);
3441 >        CFException ex = new CFException();
3442 >        f.completeExceptionally(ex);
3443 >        checkCompletedExceptionally(f, ex);
3444 >        assertEquals(x.get(), 0);
3445 >        assertEquals(r.get().getCause(), ex);
3446      }
3447  
3448      /**
3449 <     * If a whenCompleteAsync action throws an exception when triggered
3450 <     * by a normal completion, it completes exceptionally
3449 >     * failedStage returns a CompletionStage completed
3450 >     * exceptionally with the given Exception
3451       */
3452 <    public void testWhenCompleteAsync3e() {
3453 <        ThreadExecutor exec = new ThreadExecutor();
3452 >    public void testFailedStage() {
3453 >        CFException ex = new CFException();
3454 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3455 >        AtomicInteger x = new AtomicInteger(0);
3456 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3457 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3458 >        assertEquals(x.get(), 0);
3459 >        assertEquals(r.get(), ex);
3460 >    }
3461 >
3462 >    /**
3463 >     * completeAsync completes with value of given supplier
3464 >     */
3465 >    public void testCompleteAsync() {
3466 >        for (Integer v1 : new Integer[] { 1, null })
3467 >    {
3468          CompletableFuture<Integer> f = new CompletableFuture<>();
3469 <        CompletableFuture<Integer> g =
3470 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3471 <                                { throw new CFException(); },
3472 <                                exec);
3473 <        f.complete(three);
3474 <        checkCompletedNormally(f, three);
3475 <        checkCompletedWithWrappedCFException(g);
3469 >        f.completeAsync(() -> v1);
3470 >        f.join();
3471 >        checkCompletedNormally(f, v1);
3472 >    }}
3473 >
3474 >    /**
3475 >     * completeAsync completes exceptionally if given supplier throws
3476 >     */
3477 >    public void testCompleteAsync2() {
3478 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3479 >        CFException ex = new CFException();
3480 >        f.completeAsync(() -> {if (true) throw ex; return 1;});
3481 >        try {
3482 >            f.join();
3483 >            shouldThrow();
3484 >        } catch (CompletionException success) {}
3485 >        checkCompletedWithWrappedException(f, ex);
3486      }
3487  
3488      /**
3489 <     * handleAsync action completes normally with function value on
3283 <     * either normal or exceptional completion of source
3489 >     * completeAsync with given executor completes with value of given supplier
3490       */
3491 <    public void testHandleAsync() {
3492 <        CompletableFuture<Integer> f, g;
3493 <        IntegerHandler r;
3491 >    public void testCompleteAsync3() {
3492 >        for (Integer v1 : new Integer[] { 1, null })
3493 >    {
3494 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3495 >        ThreadExecutor executor = new ThreadExecutor();
3496 >        f.completeAsync(() -> v1, executor);
3497 >        assertSame(v1, f.join());
3498 >        checkCompletedNormally(f, v1);
3499 >        assertEquals(1, executor.count.get());
3500 >    }}
3501  
3502 <        f = new CompletableFuture<>();
3503 <        g = f.handleAsync(r = new IntegerHandler());
3504 <        assertFalse(r.ran);
3505 <        f.completeExceptionally(new CFException());
3506 <        checkCompletedWithWrappedCFException(f);
3507 <        checkCompletedNormally(g, three);
3508 <        assertTrue(r.ran);
3502 >    /**
3503 >     * completeAsync with given executor completes exceptionally if
3504 >     * given supplier throws
3505 >     */
3506 >    public void testCompleteAsync4() {
3507 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3508 >        CFException ex = new CFException();
3509 >        ThreadExecutor executor = new ThreadExecutor();
3510 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3511 >        try {
3512 >            f.join();
3513 >            shouldThrow();
3514 >        } catch (CompletionException success) {}
3515 >        checkCompletedWithWrappedException(f, ex);
3516 >        assertEquals(1, executor.count.get());
3517 >    }
3518  
3519 <        f = new CompletableFuture<>();
3520 <        g = f.handleAsync(r = new IntegerHandler());
3521 <        assertFalse(r.ran);
3522 <        f.completeExceptionally(new CFException());
3523 <        checkCompletedWithWrappedCFException(f);
3524 <        checkCompletedNormally(g, three);
3525 <        assertTrue(r.ran);
3519 >    /**
3520 >     * orTimeout completes with TimeoutException if not complete
3521 >     */
3522 >    public void testOrTimeout_timesOut() {
3523 >        long timeoutMillis = timeoutMillis();
3524 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3525 >        long startTime = System.nanoTime();
3526 >        f.orTimeout(timeoutMillis, MILLISECONDS);
3527 >        checkCompletedWithTimeoutException(f);
3528 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3529 >    }
3530  
3531 <        f = new CompletableFuture<>();
3532 <        g = f.handleAsync(r = new IntegerHandler());
3533 <        assertFalse(r.ran);
3534 <        f.complete(one);
3535 <        checkCompletedNormally(f, one);
3536 <        checkCompletedNormally(g, two);
3537 <        assertTrue(r.ran);
3531 >    /**
3532 >     * orTimeout completes normally if completed before timeout
3533 >     */
3534 >    public void testOrTimeout_completed() {
3535 >        for (Integer v1 : new Integer[] { 1, null })
3536 >    {
3537 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3538 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3539 >        long startTime = System.nanoTime();
3540 >        f.complete(v1);
3541 >        f.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3542 >        g.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3543 >        g.complete(v1);
3544 >        checkCompletedNormally(f, v1);
3545 >        checkCompletedNormally(g, v1);
3546 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3547 >    }}
3548  
3549 <        f = new CompletableFuture<>();
3550 <        g = f.handleAsync(r = new IntegerHandler());
3551 <        assertFalse(r.ran);
3552 <        f.complete(one);
3553 <        checkCompletedNormally(f, one);
3554 <        checkCompletedNormally(g, two);
3555 <        assertTrue(r.ran);
3549 >    /**
3550 >     * completeOnTimeout completes with given value if not complete
3551 >     */
3552 >    public void testCompleteOnTimeout_timesOut() {
3553 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3554 >                       () -> testCompleteOnTimeout_timesOut(null));
3555 >    }
3556 >
3557 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3558 >        long timeoutMillis = timeoutMillis();
3559 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3560 >        long startTime = System.nanoTime();
3561 >        f.completeOnTimeout(v, timeoutMillis, MILLISECONDS);
3562 >        assertSame(v, f.join());
3563 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3564 >        f.complete(99);         // should have no effect
3565 >        checkCompletedNormally(f, v);
3566      }
3567  
3568      /**
3569 <     * handleAsync action with Executor completes normally with
3324 <     * function value on either normal or exceptional completion of
3325 <     * source
3569 >     * completeOnTimeout has no effect if completed within timeout
3570       */
3571 <    public void testHandleAsync2() {
3572 <        CompletableFuture<Integer> f, g;
3573 <        ThreadExecutor exec = new ThreadExecutor();
3574 <        IntegerHandler r;
3571 >    public void testCompleteOnTimeout_completed() {
3572 >        for (Integer v1 : new Integer[] { 1, null })
3573 >    {
3574 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3575 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3576 >        long startTime = System.nanoTime();
3577 >        f.complete(v1);
3578 >        f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3579 >        g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3580 >        g.complete(v1);
3581 >        checkCompletedNormally(f, v1);
3582 >        checkCompletedNormally(g, v1);
3583 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3584 >    }}
3585  
3586 <        f = new CompletableFuture<>();
3587 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3588 <        assertFalse(r.ran);
3589 <        f.completeExceptionally(new CFException());
3590 <        checkCompletedWithWrappedCFException(f);
3591 <        checkCompletedNormally(g, three);
3592 <        assertTrue(r.ran);
3586 >    /**
3587 >     * delayedExecutor returns an executor that delays submission
3588 >     */
3589 >    public void testDelayedExecutor() {
3590 >        testInParallel(() -> testDelayedExecutor(null, null),
3591 >                       () -> testDelayedExecutor(null, 1),
3592 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3593 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3594 >    }
3595 >
3596 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3597 >        long timeoutMillis = timeoutMillis();
3598 >        // Use an "unreasonably long" long timeout to catch lingering threads
3599 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3600 >        final Executor delayer, longDelayer;
3601 >        if (executor == null) {
3602 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3603 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3604 >        } else {
3605 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3606 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3607 >        }
3608 >        long startTime = System.nanoTime();
3609 >        CompletableFuture<Integer> f =
3610 >            CompletableFuture.supplyAsync(() -> v, delayer);
3611 >        CompletableFuture<Integer> g =
3612 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3613  
3614 <        f = new CompletableFuture<>();
3341 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3342 <        assertFalse(r.ran);
3343 <        f.completeExceptionally(new CFException());
3344 <        checkCompletedWithWrappedCFException(f);
3345 <        checkCompletedNormally(g, three);
3346 <        assertTrue(r.ran);
3614 >        assertNull(g.getNow(null));
3615  
3616 <        f = new CompletableFuture<>();
3617 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3618 <        assertFalse(r.ran);
3619 <        f.complete(one);
3352 <        checkCompletedNormally(f, one);
3353 <        checkCompletedNormally(g, two);
3354 <        assertTrue(r.ran);
3616 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3617 >        long millisElapsed = millisElapsedSince(startTime);
3618 >        assertTrue(millisElapsed >= timeoutMillis);
3619 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3620  
3621 <        f = new CompletableFuture<>();
3622 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3623 <        assertFalse(r.ran);
3624 <        f.complete(one);
3625 <        checkCompletedNormally(f, one);
3626 <        checkCompletedNormally(g, two);
3627 <        assertTrue(r.ran);
3621 >        checkCompletedNormally(f, v);
3622 >
3623 >        checkIncomplete(g);
3624 >        assertTrue(g.cancel(true));
3625 >    }
3626 >
3627 >    //--- tests of implementation details; not part of official tck ---
3628 >
3629 >    Object resultOf(CompletableFuture<?> f) {
3630 >        try {
3631 >            java.lang.reflect.Field resultField
3632 >                = CompletableFuture.class.getDeclaredField("result");
3633 >            resultField.setAccessible(true);
3634 >            return resultField.get(f);
3635 >        } catch (Throwable t) { throw new AssertionError(t); }
3636 >    }
3637 >
3638 >    public void testExceptionPropagationReusesResultObject() {
3639 >        if (!testImplementationDetails) return;
3640 >        for (ExecutionMode m : ExecutionMode.values())
3641 >    {
3642 >        final CFException ex = new CFException();
3643 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3644 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3645 >
3646 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3647 >            = new ArrayList<>();
3648 >
3649 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3650 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3651 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3652 >
3653 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3654 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3655 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3656 >
3657 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3658 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3659 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3660 >
3661 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3662 >
3663 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3664 >
3665 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3666 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3667 >
3668 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3669 >                 fun : funs) {
3670 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3671 >            f.completeExceptionally(ex);
3672 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3673 >            checkCompletedWithWrappedException(src, ex);
3674 >            CompletableFuture<?> dep = fun.apply(src);
3675 >            checkCompletedWithWrappedException(dep, ex);
3676 >            assertSame(resultOf(src), resultOf(dep));
3677 >        }
3678 >
3679 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3680 >                 fun : funs) {
3681 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3682 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3683 >            CompletableFuture<?> dep = fun.apply(src);
3684 >            f.completeExceptionally(ex);
3685 >            checkCompletedWithWrappedException(src, ex);
3686 >            checkCompletedWithWrappedException(dep, ex);
3687 >            assertSame(resultOf(src), resultOf(dep));
3688 >        }
3689 >
3690 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3691 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3692 >                 fun : funs) {
3693 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3694 >            f.cancel(mayInterruptIfRunning);
3695 >            checkCancelled(f);
3696 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3697 >            checkCompletedWithWrappedCancellationException(src);
3698 >            CompletableFuture<?> dep = fun.apply(src);
3699 >            checkCompletedWithWrappedCancellationException(dep);
3700 >            assertSame(resultOf(src), resultOf(dep));
3701 >        }
3702 >
3703 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3704 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3705 >                 fun : funs) {
3706 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3707 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3708 >            CompletableFuture<?> dep = fun.apply(src);
3709 >            f.cancel(mayInterruptIfRunning);
3710 >            checkCancelled(f);
3711 >            checkCompletedWithWrappedCancellationException(src);
3712 >            checkCompletedWithWrappedCancellationException(dep);
3713 >            assertSame(resultOf(src), resultOf(dep));
3714 >        }
3715 >    }}
3716 >
3717 >    /**
3718 >     * Minimal completion stages throw UOE for all non-CompletionStage methods
3719 >     */
3720 >    public void testMinimalCompletionStage_minimality() {
3721 >        if (!testImplementationDetails) return;
3722 >        Function<Method, String> toSignature =
3723 >            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3724 >        Predicate<Method> isNotStatic =
3725 >            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3726 >        List<Method> minimalMethods =
3727 >            Stream.of(Object.class, CompletionStage.class)
3728 >            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3729 >            .filter(isNotStatic)
3730 >            .collect(Collectors.toList());
3731 >        // Methods from CompletableFuture permitted NOT to throw UOE
3732 >        String[] signatureWhitelist = {
3733 >            "newIncompleteFuture[]",
3734 >            "defaultExecutor[]",
3735 >            "minimalCompletionStage[]",
3736 >            "copy[]",
3737 >        };
3738 >        Set<String> permittedMethodSignatures =
3739 >            Stream.concat(minimalMethods.stream().map(toSignature),
3740 >                          Stream.of(signatureWhitelist))
3741 >            .collect(Collectors.toSet());
3742 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3743 >            .filter(isNotStatic)
3744 >            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3745 >            .collect(Collectors.toList());
3746 >
3747 >        CompletionStage<Integer> minimalStage =
3748 >            new CompletableFuture<Integer>().minimalCompletionStage();
3749 >
3750 >        List<Method> bugs = new ArrayList<>();
3751 >        for (Method method : allMethods) {
3752 >            Class<?>[] parameterTypes = method.getParameterTypes();
3753 >            Object[] args = new Object[parameterTypes.length];
3754 >            // Manufacture boxed primitives for primitive params
3755 >            for (int i = 0; i < args.length; i++) {
3756 >                Class<?> type = parameterTypes[i];
3757 >                if (parameterTypes[i] == boolean.class)
3758 >                    args[i] = false;
3759 >                else if (parameterTypes[i] == int.class)
3760 >                    args[i] = 0;
3761 >                else if (parameterTypes[i] == long.class)
3762 >                    args[i] = 0L;
3763 >            }
3764 >            try {
3765 >                method.invoke(minimalStage, args);
3766 >                bugs.add(method);
3767 >            }
3768 >            catch (java.lang.reflect.InvocationTargetException expected) {
3769 >                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3770 >                    bugs.add(method);
3771 >                    // expected.getCause().printStackTrace();
3772 >                }
3773 >            }
3774 >            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3775 >        }
3776 >        if (!bugs.isEmpty())
3777 >            throw new Error("Methods did not throw UOE: " + bugs.toString());
3778      }
3779  
3780 +    static class Monad {
3781 +        static class ZeroException extends RuntimeException {
3782 +            public ZeroException() { super("monadic zero"); }
3783 +        }
3784 +        // "return", "unit"
3785 +        static <T> CompletableFuture<T> unit(T value) {
3786 +            return completedFuture(value);
3787 +        }
3788 +        // monadic zero ?
3789 +        static <T> CompletableFuture<T> zero() {
3790 +            return failedFuture(new ZeroException());
3791 +        }
3792 +        // >=>
3793 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
3794 +            (Function<T, CompletableFuture<U>> f,
3795 +             Function<U, CompletableFuture<V>> g) {
3796 +            return (x) -> f.apply(x).thenCompose(g);
3797 +        }
3798 +
3799 +        static void assertZero(CompletableFuture<?> f) {
3800 +            try {
3801 +                f.getNow(null);
3802 +                throw new AssertionFailedError("should throw");
3803 +            } catch (CompletionException success) {
3804 +                assertTrue(success.getCause() instanceof ZeroException);
3805 +            }
3806 +        }
3807 +
3808 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
3809 +                                           CompletableFuture<T> g) {
3810 +            T fval = null, gval = null;
3811 +            Throwable fex = null, gex = null;
3812 +
3813 +            try { fval = f.get(); }
3814 +            catch (ExecutionException ex) { fex = ex.getCause(); }
3815 +            catch (Throwable ex) { fex = ex; }
3816 +
3817 +            try { gval = g.get(); }
3818 +            catch (ExecutionException ex) { gex = ex.getCause(); }
3819 +            catch (Throwable ex) { gex = ex; }
3820 +
3821 +            if (fex != null || gex != null)
3822 +                assertSame(fex.getClass(), gex.getClass());
3823 +            else
3824 +                assertEquals(fval, gval);
3825 +        }
3826 +
3827 +        static class PlusFuture<T> extends CompletableFuture<T> {
3828 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
3829 +        }
3830 +
3831 +        /** Implements "monadic plus". */
3832 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
3833 +                                             CompletableFuture<? extends T> g) {
3834 +            PlusFuture<T> plus = new PlusFuture<T>();
3835 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
3836 +                try {
3837 +                    if (ex == null) {
3838 +                        if (plus.complete(result))
3839 +                            if (plus.firstFailure.get() != null)
3840 +                                plus.firstFailure.set(null);
3841 +                    }
3842 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
3843 +                        if (plus.isDone())
3844 +                            plus.firstFailure.set(null);
3845 +                    }
3846 +                    else {
3847 +                        // first failure has precedence
3848 +                        Throwable first = plus.firstFailure.getAndSet(null);
3849 +
3850 +                        // may fail with "Self-suppression not permitted"
3851 +                        try { first.addSuppressed(ex); }
3852 +                        catch (Exception ignored) {}
3853 +
3854 +                        plus.completeExceptionally(first);
3855 +                    }
3856 +                } catch (Throwable unexpected) {
3857 +                    plus.completeExceptionally(unexpected);
3858 +                }
3859 +            };
3860 +            f.whenComplete(action);
3861 +            g.whenComplete(action);
3862 +            return plus;
3863 +        }
3864 +    }
3865 +
3866 +    /**
3867 +     * CompletableFuture is an additive monad - sort of.
3868 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
3869 +     */
3870 +    public void testAdditiveMonad() throws Throwable {
3871 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
3872 +        CompletableFuture<Long> zero = Monad.zero();
3873 +
3874 +        // Some mutually non-commutative functions
3875 +        Function<Long, CompletableFuture<Long>> triple
3876 +            = (x) -> Monad.unit(3 * x);
3877 +        Function<Long, CompletableFuture<Long>> inc
3878 +            = (x) -> Monad.unit(x + 1);
3879 +
3880 +        // unit is a right identity: m >>= unit === m
3881 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
3882 +                                 inc.apply(5L));
3883 +        // unit is a left identity: (unit x) >>= f === f x
3884 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
3885 +                                 inc.apply(5L));
3886 +
3887 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
3888 +        Monad.assertFutureEquals(
3889 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
3890 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
3891 +
3892 +        // The case for CompletableFuture as an additive monad is weaker...
3893 +
3894 +        // zero is a monadic zero
3895 +        Monad.assertZero(zero);
3896 +
3897 +        // left zero: zero >>= f === zero
3898 +        Monad.assertZero(zero.thenCompose(inc));
3899 +        // right zero: f >>= (\x -> zero) === zero
3900 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
3901 +
3902 +        // f plus zero === f
3903 +        Monad.assertFutureEquals(Monad.unit(5L),
3904 +                                 Monad.plus(Monad.unit(5L), zero));
3905 +        // zero plus f === f
3906 +        Monad.assertFutureEquals(Monad.unit(5L),
3907 +                                 Monad.plus(zero, Monad.unit(5L)));
3908 +        // zero plus zero === zero
3909 +        Monad.assertZero(Monad.plus(zero, zero));
3910 +        {
3911 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
3912 +                                                   Monad.unit(8L));
3913 +            // non-determinism
3914 +            assertTrue(f.get() == 5L || f.get() == 8L);
3915 +        }
3916 +
3917 +        CompletableFuture<Long> godot = new CompletableFuture<>();
3918 +        // f plus godot === f (doesn't wait for godot)
3919 +        Monad.assertFutureEquals(Monad.unit(5L),
3920 +                                 Monad.plus(Monad.unit(5L), godot));
3921 +        // godot plus f === f (doesn't wait for godot)
3922 +        Monad.assertFutureEquals(Monad.unit(5L),
3923 +                                 Monad.plus(godot, Monad.unit(5L)));
3924 +    }
3925 +
3926 + //     static <U> U join(CompletionStage<U> stage) {
3927 + //         CompletableFuture<U> f = new CompletableFuture<>();
3928 + //         stage.whenComplete((v, ex) -> {
3929 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
3930 + //         });
3931 + //         return f.join();
3932 + //     }
3933 +
3934 + //     static <U> boolean isDone(CompletionStage<U> stage) {
3935 + //         CompletableFuture<U> f = new CompletableFuture<>();
3936 + //         stage.whenComplete((v, ex) -> {
3937 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
3938 + //         });
3939 + //         return f.isDone();
3940 + //     }
3941 +
3942 + //     static <U> U join2(CompletionStage<U> stage) {
3943 + //         return stage.toCompletableFuture().copy().join();
3944 + //     }
3945 +
3946 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
3947 + //         return stage.toCompletableFuture().copy().isDone();
3948 + //     }
3949 +
3950   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines