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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines