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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines