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

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.34 by jsr166, Sun Jun 1 21:17:05 2014 UTC vs.
Revision 1.182 by jsr166, Tue Jan 3 03:18:02 2017 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.RejectedExecutionException;
34   import java.util.concurrent.TimeoutException;
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 >    Throwable exceptionalCompletion(CompletableFuture<?> f) {
97 >        // handle (and whenComplete and exceptionally) can distinguish
98 >        // between "direct" and "wrapped" exceptional completion
99 >        return f.handle((u, 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 static 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 static 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 >    static 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 >    static class NoopConsumer extends CheckedIntegerAction
405 >        implements Consumer<Integer>
406 >    {
407 >        NoopConsumer(ExecutionMode m) { super(m); }
408 >        public void accept(Integer x) {
409 >            invoked();
410 >            value = x;
411          }
412      }
413  
414 <    /**
415 <     * exceptionally action completes with function value on source
416 <     * exception; otherwise with source value
417 <     */
418 <    public void testExceptionally() {
419 <        CompletableFuture<Integer> f = new CompletableFuture<>();
420 <        ExceptionToInteger r = new ExceptionToInteger();
421 <        CompletableFuture<Integer> g = f.exceptionally(r);
415 <        f.completeExceptionally(new CFException());
416 <        checkCompletedNormally(g, three);
417 <
418 <        f = new CompletableFuture<>();
419 <        r = new ExceptionToInteger();
420 <        g = f.exceptionally(r);
421 <        f.complete(one);
422 <        checkCompletedNormally(g, one);
423 <    }
424 <
425 <    /**
426 <     * handle action completes normally with function value on either
427 <     * normal or exceptional completion of source
428 <     */
429 <    public void testHandle() {
430 <        CompletableFuture<Integer> f, g;
431 <        IntegerHandler r;
432 <
433 <        f = new CompletableFuture<>();
434 <        f.completeExceptionally(new CFException());
435 <        g = f.handle(r = new IntegerHandler());
436 <        assertTrue(r.ran);
437 <        checkCompletedNormally(g, three);
438 <
439 <        f = new CompletableFuture<>();
440 <        g = f.handle(r = new IntegerHandler());
441 <        assertFalse(r.ran);
442 <        f.completeExceptionally(new CFException());
443 <        checkCompletedNormally(g, three);
444 <        assertTrue(r.ran);
445 <
446 <        f = new CompletableFuture<>();
447 <        f.complete(one);
448 <        g = f.handle(r = new IntegerHandler());
449 <        assertTrue(r.ran);
450 <        checkCompletedNormally(g, two);
451 <
452 <        f = new CompletableFuture<>();
453 <        g = f.handle(r = new IntegerHandler());
454 <        assertFalse(r.ran);
455 <        f.complete(one);
456 <        assertTrue(r.ran);
457 <        checkCompletedNormally(g, two);
458 <    }
459 <
460 <    /**
461 <     * runAsync completes after running Runnable
462 <     */
463 <    public void testRunAsync() {
464 <        Noop r = new Noop();
465 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
466 <        assertNull(f.join());
467 <        assertTrue(r.ran);
468 <        checkCompletedNormally(f, null);
469 <    }
470 <
471 <    /**
472 <     * runAsync with executor completes after running Runnable
473 <     */
474 <    public void testRunAsync2() {
475 <        Noop r = new Noop();
476 <        ThreadExecutor exec = new ThreadExecutor();
477 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
478 <        assertNull(f.join());
479 <        assertTrue(r.ran);
480 <        checkCompletedNormally(f, null);
481 <        assertEquals(1, exec.count.get());
482 <    }
483 <
484 <    /**
485 <     * failing runAsync completes exceptionally after running Runnable
486 <     */
487 <    public void testRunAsync3() {
488 <        FailingNoop r = new FailingNoop();
489 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
490 <        checkCompletedWithWrappedCFException(f);
491 <        assertTrue(r.ran);
492 <    }
493 <
494 <    /**
495 <     * supplyAsync completes with result of supplier
496 <     */
497 <    public void testSupplyAsync() {
498 <        CompletableFuture<Integer> f;
499 <        f = CompletableFuture.supplyAsync(supplyOne);
500 <        assertEquals(f.join(), one);
501 <        checkCompletedNormally(f, one);
502 <    }
503 <
504 <    /**
505 <     * supplyAsync with executor completes with result of supplier
506 <     */
507 <    public void testSupplyAsync2() {
508 <        CompletableFuture<Integer> f;
509 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
510 <        assertEquals(f.join(), one);
511 <        checkCompletedNormally(f, one);
512 <    }
513 <
514 <    /**
515 <     * Failing supplyAsync completes exceptionally
516 <     */
517 <    public void testSupplyAsync3() {
518 <        FailingSupplier r = new FailingSupplier();
519 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
520 <        checkCompletedWithWrappedCFException(f);
521 <        assertTrue(r.ran);
522 <    }
523 <
524 <    // seq completion methods
525 <
526 <    /**
527 <     * thenRun result completes normally after normal completion of source
528 <     */
529 <    public void testThenRun() {
530 <        CompletableFuture<Integer> f;
531 <        CompletableFuture<Void> g;
532 <        Noop r;
533 <
534 <        f = new CompletableFuture<>();
535 <        g = f.thenRun(r = new Noop());
536 <        f.complete(null);
537 <        checkCompletedNormally(g, null);
538 <        assertTrue(r.ran);
539 <
540 <        f = new CompletableFuture<>();
541 <        f.complete(null);
542 <        g = f.thenRun(r = new Noop());
543 <        checkCompletedNormally(g, null);
544 <        assertTrue(r.ran);
545 <    }
546 <
547 <    /**
548 <     * thenRun result completes exceptionally after exceptional
549 <     * completion of source
550 <     */
551 <    public void testThenRun2() {
552 <        CompletableFuture<Integer> f;
553 <        CompletableFuture<Void> g;
554 <        Noop r;
555 <
556 <        f = new CompletableFuture<>();
557 <        g = f.thenRun(r = new Noop());
558 <        f.completeExceptionally(new CFException());
559 <        checkCompletedWithWrappedCFException(g);
560 <        assertFalse(r.ran);
561 <
562 <        f = new CompletableFuture<>();
563 <        f.completeExceptionally(new CFException());
564 <        g = f.thenRun(r = new Noop());
565 <        checkCompletedWithWrappedCFException(g);
566 <        assertFalse(r.ran);
567 <    }
568 <
569 <    /**
570 <     * thenRun result completes exceptionally if action does
571 <     */
572 <    public void testThenRun3() {
573 <        CompletableFuture<Integer> f;
574 <        CompletableFuture<Void> g;
575 <        FailingNoop r;
576 <
577 <        f = new CompletableFuture<>();
578 <        g = f.thenRun(r = new FailingNoop());
579 <        f.complete(null);
580 <        checkCompletedWithWrappedCFException(g);
581 <
582 <        f = new CompletableFuture<>();
583 <        f.complete(null);
584 <        g = f.thenRun(r = new FailingNoop());
585 <        checkCompletedWithWrappedCFException(g);
586 <    }
587 <
588 <    /**
589 <     * thenRun result completes exceptionally if source cancelled
590 <     */
591 <    public void testThenRun4() {
592 <        CompletableFuture<Integer> f;
593 <        CompletableFuture<Void> g;
594 <        Noop r;
595 <
596 <        f = new CompletableFuture<>();
597 <        g = f.thenRun(r = new Noop());
598 <        assertTrue(f.cancel(true));
599 <        checkCompletedWithWrappedCancellationException(g);
600 <
601 <        f = new CompletableFuture<>();
602 <        assertTrue(f.cancel(true));
603 <        g = f.thenRun(r = new Noop());
604 <        checkCompletedWithWrappedCancellationException(g);
605 <    }
606 <
607 <    /**
608 <     * thenApply result completes normally after normal completion of source
609 <     */
610 <    public void testThenApply() {
611 <        CompletableFuture<Integer> f = new CompletableFuture<>();
612 <        CompletableFuture<Integer> g = f.thenApply(inc);
613 <        f.complete(one);
614 <        checkCompletedNormally(g, two);
414 >    static class IncFunction extends CheckedIntegerAction
415 >        implements Function<Integer,Integer>
416 >    {
417 >        IncFunction(ExecutionMode m) { super(m); }
418 >        public Integer apply(Integer x) {
419 >            invoked();
420 >            return value = inc(x);
421 >        }
422      }
423  
424 <    /**
425 <     * thenApply result completes exceptionally after exceptional
426 <     * completion of source
427 <     */
428 <    public void testThenApply2() {
429 <        CompletableFuture<Integer> f = new CompletableFuture<>();
623 <        CompletableFuture<Integer> g = f.thenApply(inc);
624 <        f.completeExceptionally(new CFException());
625 <        checkCompletedWithWrappedCFException(g);
424 >    // Choose non-commutative actions for better coverage
425 >    // A non-commutative function that handles and produces null values as well.
426 >    static Integer subtract(Integer x, Integer y) {
427 >        return (x == null && y == null) ? null :
428 >            ((x == null) ? 42 : x.intValue())
429 >            - ((y == null) ? 99 : y.intValue());
430      }
431  
432 <    /**
433 <     * thenApply result completes exceptionally if action does
434 <     */
435 <    public void testThenApply3() {
436 <        CompletableFuture<Integer> f = new CompletableFuture<>();
437 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
438 <        f.complete(one);
439 <        checkCompletedWithWrappedCFException(g);
432 >    static 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 <     * thenApply result completes exceptionally if source cancelled
444 <     */
445 <    public void testThenApply4() {
446 <        CompletableFuture<Integer> f = new CompletableFuture<>();
447 <        CompletableFuture<Integer> g = f.thenApply(inc);
448 <        assertTrue(f.cancel(true));
449 <        checkCompletedWithWrappedCancellationException(g);
442 >    static class SubtractFunction extends CheckedIntegerAction
443 >        implements BiFunction<Integer, Integer, Integer>
444 >    {
445 >        SubtractFunction(ExecutionMode m) { super(m); }
446 >        public Integer apply(Integer x, Integer y) {
447 >            invoked();
448 >            return value = subtract(x, y);
449 >        }
450      }
451  
452 <    /**
453 <     * thenAccept result completes normally after normal completion of source
454 <     */
455 <    public void testThenAccept() {
456 <        CompletableFuture<Integer> f = new CompletableFuture<>();
653 <        IncAction r = new IncAction();
654 <        CompletableFuture<Void> g = f.thenAccept(r);
655 <        f.complete(one);
656 <        checkCompletedNormally(g, null);
657 <        assertEquals(r.value, 2);
452 >    static class Noop extends CheckedAction implements Runnable {
453 >        Noop(ExecutionMode m) { super(m); }
454 >        public void run() {
455 >            invoked();
456 >        }
457      }
458  
459 <    /**
460 <     * thenAccept result completes exceptionally after exceptional
461 <     * completion of source
462 <     */
463 <    public void testThenAccept2() {
464 <        CompletableFuture<Integer> f = new CompletableFuture<>();
465 <        IncAction r = new IncAction();
466 <        CompletableFuture<Void> g = f.thenAccept(r);
467 <        f.completeExceptionally(new CFException());
669 <        checkCompletedWithWrappedCFException(g);
459 >    static class FailingSupplier extends CheckedAction
460 >        implements Supplier<Integer>
461 >    {
462 >        final CFException ex;
463 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
464 >        public Integer get() {
465 >            invoked();
466 >            throw ex;
467 >        }
468      }
469  
470 <    /**
471 <     * thenAccept result completes exceptionally if action does
472 <     */
473 <    public void testThenAccept3() {
474 <        CompletableFuture<Integer> f = new CompletableFuture<>();
475 <        FailingConsumer r = new FailingConsumer();
476 <        CompletableFuture<Void> g = f.thenAccept(r);
477 <        f.complete(one);
478 <        checkCompletedWithWrappedCFException(g);
479 <        assertTrue(r.ran);
470 >    static class FailingConsumer extends CheckedIntegerAction
471 >        implements Consumer<Integer>
472 >    {
473 >        final CFException ex;
474 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
475 >        public void accept(Integer x) {
476 >            invoked();
477 >            value = x;
478 >            throw ex;
479 >        }
480      }
481  
482 <    /**
483 <     * thenAccept result completes exceptionally if source cancelled
484 <     */
485 <    public void testThenAccept4() {
486 <        CompletableFuture<Integer> f = new CompletableFuture<>();
487 <        IncAction r = new IncAction();
488 <        CompletableFuture<Void> g = f.thenAccept(r);
489 <        assertTrue(f.cancel(true));
490 <        checkCompletedWithWrappedCancellationException(g);
482 >    static class FailingBiConsumer extends CheckedIntegerAction
483 >        implements BiConsumer<Integer, Integer>
484 >    {
485 >        final CFException ex;
486 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
487 >        public void accept(Integer x, Integer y) {
488 >            invoked();
489 >            value = subtract(x, y);
490 >            throw ex;
491 >        }
492      }
493  
494 <    /**
495 <     * thenCombine result completes normally after normal completion
496 <     * of sources
497 <     */
498 <    public void testThenCombine() {
499 <        CompletableFuture<Integer> f, g, h;
500 <
501 <        f = new CompletableFuture<>();
502 <        g = new CompletableFuture<>();
503 <        h = f.thenCombine(g, subtract);
705 <        f.complete(3);
706 <        checkIncomplete(h);
707 <        g.complete(1);
708 <        checkCompletedNormally(h, 2);
709 <
710 <        f = new CompletableFuture<>();
711 <        g = new CompletableFuture<>();
712 <        h = f.thenCombine(g, subtract);
713 <        g.complete(1);
714 <        checkIncomplete(h);
715 <        f.complete(3);
716 <        checkCompletedNormally(h, 2);
717 <
718 <        f = new CompletableFuture<>();
719 <        g = new CompletableFuture<>();
720 <        g.complete(1);
721 <        f.complete(3);
722 <        h = f.thenCombine(g, subtract);
723 <        checkCompletedNormally(h, 2);
494 >    static class FailingFunction extends CheckedIntegerAction
495 >        implements Function<Integer, Integer>
496 >    {
497 >        final CFException ex;
498 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
499 >        public Integer apply(Integer x) {
500 >            invoked();
501 >            value = x;
502 >            throw ex;
503 >        }
504      }
505  
506 <    /**
507 <     * thenCombine result completes exceptionally after exceptional
508 <     * completion of either source
509 <     */
510 <    public void testThenCombine2() {
511 <        CompletableFuture<Integer> f, g, h;
512 <
513 <        f = new CompletableFuture<>();
514 <        g = new CompletableFuture<>();
515 <        h = f.thenCombine(g, subtract);
736 <        f.completeExceptionally(new CFException());
737 <        checkIncomplete(h);
738 <        g.complete(1);
739 <        checkCompletedWithWrappedCFException(h);
740 <
741 <        f = new CompletableFuture<>();
742 <        g = new CompletableFuture<>();
743 <        h = f.thenCombine(g, subtract);
744 <        g.completeExceptionally(new CFException());
745 <        checkIncomplete(h);
746 <        f.complete(3);
747 <        checkCompletedWithWrappedCFException(h);
748 <
749 <        f = new CompletableFuture<>();
750 <        g = new CompletableFuture<>();
751 <        f.complete(3);
752 <        g.completeExceptionally(new CFException());
753 <        h = f.thenCombine(g, subtract);
754 <        checkCompletedWithWrappedCFException(h);
755 <
756 <        f = new CompletableFuture<>();
757 <        g = new CompletableFuture<>();
758 <        f.completeExceptionally(new CFException());
759 <        g.complete(3);
760 <        h = f.thenCombine(g, subtract);
761 <        checkCompletedWithWrappedCFException(h);
506 >    static class FailingBiFunction extends CheckedIntegerAction
507 >        implements BiFunction<Integer, Integer, Integer>
508 >    {
509 >        final CFException ex;
510 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
511 >        public Integer apply(Integer x, Integer y) {
512 >            invoked();
513 >            value = subtract(x, y);
514 >            throw ex;
515 >        }
516      }
517  
518 <    /**
519 <     * thenCombine result completes exceptionally if action does
520 <     */
521 <    public void testThenCombine3() {
522 <        CompletableFuture<Integer> f = new CompletableFuture<>();
523 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
524 <        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);
518 >    static class FailingRunnable extends CheckedAction implements Runnable {
519 >        final CFException ex;
520 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
521 >        public void run() {
522 >            invoked();
523 >            throw ex;
524 >        }
525      }
526  
527 <    /**
528 <     * thenCombine result completes exceptionally if either source cancelled
529 <     */
530 <    public void testThenCombine4() {
531 <        CompletableFuture<Integer> f, g, h;
532 <
533 <        f = new CompletableFuture<>();
534 <        g = new CompletableFuture<>();
535 <        h = f.thenCombine(g, subtract);
536 <        assertTrue(f.cancel(true));
537 <        checkIncomplete(h);
791 <        g.complete(1);
792 <        checkCompletedWithWrappedCancellationException(h);
793 <
794 <        f = new CompletableFuture<>();
795 <        g = new CompletableFuture<>();
796 <        h = f.thenCombine(g, subtract);
797 <        assertTrue(g.cancel(true));
798 <        checkIncomplete(h);
799 <        f.complete(3);
800 <        checkCompletedWithWrappedCancellationException(h);
801 <
802 <        f = new CompletableFuture<>();
803 <        g = new CompletableFuture<>();
804 <        assertTrue(f.cancel(true));
805 <        assertTrue(g.cancel(true));
806 <        h = f.thenCombine(g, subtract);
807 <        checkCompletedWithWrappedCancellationException(h);
527 >    static class CompletableFutureInc extends CheckedIntegerAction
528 >        implements Function<Integer, CompletableFuture<Integer>>
529 >    {
530 >        CompletableFutureInc(ExecutionMode m) { super(m); }
531 >        public CompletableFuture<Integer> apply(Integer x) {
532 >            invoked();
533 >            value = x;
534 >            CompletableFuture<Integer> f = new CompletableFuture<>();
535 >            assertTrue(f.complete(inc(x)));
536 >            return f;
537 >        }
538      }
539  
540 <    /**
541 <     * thenAcceptBoth result completes normally after normal
542 <     * completion of sources
543 <     */
544 <    public void testThenAcceptBoth() {
545 <        CompletableFuture<Integer> f, g;
546 <        CompletableFuture<Void> h;
547 <        SubtractAction r;
548 <
549 <        f = new CompletableFuture<>();
820 <        g = new CompletableFuture<>();
821 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
822 <        f.complete(3);
823 <        checkIncomplete(h);
824 <        g.complete(1);
825 <        checkCompletedNormally(h, null);
826 <        assertEquals(r.value, 2);
827 <
828 <        f = new CompletableFuture<>();
829 <        g = new CompletableFuture<>();
830 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
831 <        g.complete(1);
832 <        checkIncomplete(h);
833 <        f.complete(3);
834 <        checkCompletedNormally(h, null);
835 <        assertEquals(r.value, 2);
836 <
837 <        f = new CompletableFuture<>();
838 <        g = new CompletableFuture<>();
839 <        g.complete(1);
840 <        f.complete(3);
841 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
842 <        checkCompletedNormally(h, null);
843 <        assertEquals(r.value, 2);
540 >    static class FailingCompletableFutureFunction extends CheckedIntegerAction
541 >        implements Function<Integer, CompletableFuture<Integer>>
542 >    {
543 >        final CFException ex;
544 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
545 >        public CompletableFuture<Integer> apply(Integer x) {
546 >            invoked();
547 >            value = x;
548 >            throw ex;
549 >        }
550      }
551  
552 <    /**
553 <     * thenAcceptBoth result completes exceptionally after exceptional
554 <     * completion of either source
555 <     */
556 <    public void testThenAcceptBoth2() {
557 <        CompletableFuture<Integer> f, g;
558 <        CompletableFuture<Void> h;
853 <        SubtractAction r;
854 <
855 <        f = new CompletableFuture<>();
856 <        g = new CompletableFuture<>();
857 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
858 <        f.completeExceptionally(new CFException());
859 <        checkIncomplete(h);
860 <        g.complete(1);
861 <        checkCompletedWithWrappedCFException(h);
862 <
863 <        f = new CompletableFuture<>();
864 <        g = new CompletableFuture<>();
865 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
866 <        g.completeExceptionally(new CFException());
867 <        checkIncomplete(h);
868 <        f.complete(3);
869 <        checkCompletedWithWrappedCFException(h);
870 <
871 <        f = new CompletableFuture<>();
872 <        g = new CompletableFuture<>();
873 <        f.complete(3);
874 <        g.completeExceptionally(new CFException());
875 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
876 <        checkCompletedWithWrappedCFException(h);
877 <
878 <        f = new CompletableFuture<>();
879 <        g = new CompletableFuture<>();
880 <        f.completeExceptionally(new CFException());
881 <        g.complete(3);
882 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
883 <        checkCompletedWithWrappedCFException(h);
552 >    static class CountingRejectingExecutor implements Executor {
553 >        final RejectedExecutionException ex = new RejectedExecutionException();
554 >        final AtomicInteger count = new AtomicInteger(0);
555 >        public void execute(Runnable r) {
556 >            count.getAndIncrement();
557 >            throw ex;
558 >        }
559      }
560  
561 <    /**
562 <     * thenAcceptBoth result completes exceptionally if action does
563 <     */
564 <    public void testThenAcceptBoth3() {
565 <        CompletableFuture<Integer> f, g;
566 <        CompletableFuture<Void> h;
567 <        FailingBiConsumer r;
893 <
894 <        f = new CompletableFuture<>();
895 <        g = new CompletableFuture<>();
896 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
897 <        f.complete(3);
898 <        checkIncomplete(h);
899 <        g.complete(1);
900 <        checkCompletedWithWrappedCFException(h);
561 >    // Used for explicit executor tests
562 >    static final class ThreadExecutor implements Executor {
563 >        final AtomicInteger count = new AtomicInteger(0);
564 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
565 >        static boolean startedCurrentThread() {
566 >            return Thread.currentThread().getThreadGroup() == tg;
567 >        }
568  
569 <        f = new CompletableFuture<>();
570 <        g = new CompletableFuture<>();
571 <        f.complete(3);
572 <        g.complete(1);
906 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
907 <        checkCompletedWithWrappedCFException(h);
569 >        public void execute(Runnable r) {
570 >            count.getAndIncrement();
571 >            new Thread(tg, r).start();
572 >        }
573      }
574  
575 <    /**
576 <     * thenAcceptBoth result completes exceptionally if either source cancelled
912 <     */
913 <    public void testThenAcceptBoth4() {
914 <        CompletableFuture<Integer> f, g;
915 <        CompletableFuture<Void> h;
916 <        SubtractAction r;
917 <
918 <        f = new CompletableFuture<>();
919 <        g = new CompletableFuture<>();
920 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
921 <        assertTrue(f.cancel(true));
922 <        checkIncomplete(h);
923 <        g.complete(1);
924 <        checkCompletedWithWrappedCancellationException(h);
925 <
926 <        f = new CompletableFuture<>();
927 <        g = new CompletableFuture<>();
928 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
929 <        assertTrue(g.cancel(true));
930 <        checkIncomplete(h);
931 <        f.complete(3);
932 <        checkCompletedWithWrappedCancellationException(h);
933 <
934 <        f = new CompletableFuture<>();
935 <        g = new CompletableFuture<>();
936 <        f.complete(3);
937 <        assertTrue(g.cancel(true));
938 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
939 <        checkCompletedWithWrappedCancellationException(h);
940 <
941 <        f = new CompletableFuture<>();
942 <        g = new CompletableFuture<>();
943 <        assertTrue(f.cancel(true));
944 <        g.complete(3);
945 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
946 <        checkCompletedWithWrappedCancellationException(h);
947 <    }
575 >    static final boolean defaultExecutorIsCommonPool
576 >        = ForkJoinPool.getCommonPoolParallelism() > 1;
577  
578      /**
579       * Permits the testing of parallel code for the 3 different
580 <     * execution modes without repeating all the testing code.
580 >     * execution modes without copy/pasting all the test methods.
581       */
582      enum ExecutionMode {
583 <        DEFAULT {
583 >        SYNC {
584 >            public void checkExecutionMode() {
585 >                assertFalse(ThreadExecutor.startedCurrentThread());
586 >                assertNull(ForkJoinTask.getPool());
587 >            }
588 >            public CompletableFuture<Void> runAsync(Runnable a) {
589 >                throw new UnsupportedOperationException();
590 >            }
591 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
592 >                throw new UnsupportedOperationException();
593 >            }
594 >            public <T> CompletableFuture<Void> thenRun
595 >                (CompletableFuture<T> f, Runnable a) {
596 >                return f.thenRun(a);
597 >            }
598 >            public <T> CompletableFuture<Void> thenAccept
599 >                (CompletableFuture<T> f, Consumer<? super T> a) {
600 >                return f.thenAccept(a);
601 >            }
602 >            public <T,U> CompletableFuture<U> thenApply
603 >                (CompletableFuture<T> f, Function<? super T,U> a) {
604 >                return f.thenApply(a);
605 >            }
606 >            public <T,U> CompletableFuture<U> thenCompose
607 >                (CompletableFuture<T> f,
608 >                 Function<? super T,? extends CompletionStage<U>> a) {
609 >                return f.thenCompose(a);
610 >            }
611 >            public <T,U> CompletableFuture<U> handle
612 >                (CompletableFuture<T> f,
613 >                 BiFunction<? super T,Throwable,? extends U> a) {
614 >                return f.handle(a);
615 >            }
616 >            public <T> CompletableFuture<T> whenComplete
617 >                (CompletableFuture<T> f,
618 >                 BiConsumer<? super T,? super Throwable> a) {
619 >                return f.whenComplete(a);
620 >            }
621              public <T,U> CompletableFuture<Void> runAfterBoth
622 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
623 <                return f.runAfterBoth(g, r);
622 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
623 >                return f.runAfterBoth(g, a);
624 >            }
625 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
626 >                (CompletableFuture<T> f,
627 >                 CompletionStage<? extends U> g,
628 >                 BiConsumer<? super T,? super U> a) {
629 >                return f.thenAcceptBoth(g, a);
630 >            }
631 >            public <T,U,V> CompletableFuture<V> thenCombine
632 >                (CompletableFuture<T> f,
633 >                 CompletionStage<? extends U> g,
634 >                 BiFunction<? super T,? super U,? extends V> a) {
635 >                return f.thenCombine(g, a);
636 >            }
637 >            public <T> CompletableFuture<Void> runAfterEither
638 >                (CompletableFuture<T> f,
639 >                 CompletionStage<?> g,
640 >                 java.lang.Runnable a) {
641 >                return f.runAfterEither(g, a);
642 >            }
643 >            public <T> CompletableFuture<Void> acceptEither
644 >                (CompletableFuture<T> f,
645 >                 CompletionStage<? extends T> g,
646 >                 Consumer<? super T> a) {
647 >                return f.acceptEither(g, a);
648 >            }
649 >            public <T,U> CompletableFuture<U> applyToEither
650 >                (CompletableFuture<T> f,
651 >                 CompletionStage<? extends T> g,
652 >                 Function<? super T,U> a) {
653 >                return f.applyToEither(g, a);
654              }
655          },
656  
657 <        DEFAULT_ASYNC {
657 >        ASYNC {
658 >            public void checkExecutionMode() {
659 >                assertEquals(defaultExecutorIsCommonPool,
660 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
661 >            }
662 >            public CompletableFuture<Void> runAsync(Runnable a) {
663 >                return CompletableFuture.runAsync(a);
664 >            }
665 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
666 >                return CompletableFuture.supplyAsync(a);
667 >            }
668 >            public <T> CompletableFuture<Void> thenRun
669 >                (CompletableFuture<T> f, Runnable a) {
670 >                return f.thenRunAsync(a);
671 >            }
672 >            public <T> CompletableFuture<Void> thenAccept
673 >                (CompletableFuture<T> f, Consumer<? super T> a) {
674 >                return f.thenAcceptAsync(a);
675 >            }
676 >            public <T,U> CompletableFuture<U> thenApply
677 >                (CompletableFuture<T> f, Function<? super T,U> a) {
678 >                return f.thenApplyAsync(a);
679 >            }
680 >            public <T,U> CompletableFuture<U> thenCompose
681 >                (CompletableFuture<T> f,
682 >                 Function<? super T,? extends CompletionStage<U>> a) {
683 >                return f.thenComposeAsync(a);
684 >            }
685 >            public <T,U> CompletableFuture<U> handle
686 >                (CompletableFuture<T> f,
687 >                 BiFunction<? super T,Throwable,? extends U> a) {
688 >                return f.handleAsync(a);
689 >            }
690 >            public <T> CompletableFuture<T> whenComplete
691 >                (CompletableFuture<T> f,
692 >                 BiConsumer<? super T,? super Throwable> a) {
693 >                return f.whenCompleteAsync(a);
694 >            }
695              public <T,U> CompletableFuture<Void> runAfterBoth
696 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
697 <                return f.runAfterBothAsync(g, r);
696 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
697 >                return f.runAfterBothAsync(g, a);
698 >            }
699 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
700 >                (CompletableFuture<T> f,
701 >                 CompletionStage<? extends U> g,
702 >                 BiConsumer<? super T,? super U> a) {
703 >                return f.thenAcceptBothAsync(g, a);
704 >            }
705 >            public <T,U,V> CompletableFuture<V> thenCombine
706 >                (CompletableFuture<T> f,
707 >                 CompletionStage<? extends U> g,
708 >                 BiFunction<? super T,? super U,? extends V> a) {
709 >                return f.thenCombineAsync(g, a);
710 >            }
711 >            public <T> CompletableFuture<Void> runAfterEither
712 >                (CompletableFuture<T> f,
713 >                 CompletionStage<?> g,
714 >                 java.lang.Runnable a) {
715 >                return f.runAfterEitherAsync(g, a);
716 >            }
717 >            public <T> CompletableFuture<Void> acceptEither
718 >                (CompletableFuture<T> f,
719 >                 CompletionStage<? extends T> g,
720 >                 Consumer<? super T> a) {
721 >                return f.acceptEitherAsync(g, a);
722 >            }
723 >            public <T,U> CompletableFuture<U> applyToEither
724 >                (CompletableFuture<T> f,
725 >                 CompletionStage<? extends T> g,
726 >                 Function<? super T,U> a) {
727 >                return f.applyToEitherAsync(g, a);
728              }
729          },
730  
731          EXECUTOR {
732 +            public void checkExecutionMode() {
733 +                assertTrue(ThreadExecutor.startedCurrentThread());
734 +            }
735 +            public CompletableFuture<Void> runAsync(Runnable a) {
736 +                return CompletableFuture.runAsync(a, new ThreadExecutor());
737 +            }
738 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
739 +                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
740 +            }
741 +            public <T> CompletableFuture<Void> thenRun
742 +                (CompletableFuture<T> f, Runnable a) {
743 +                return f.thenRunAsync(a, new ThreadExecutor());
744 +            }
745 +            public <T> CompletableFuture<Void> thenAccept
746 +                (CompletableFuture<T> f, Consumer<? super T> a) {
747 +                return f.thenAcceptAsync(a, new ThreadExecutor());
748 +            }
749 +            public <T,U> CompletableFuture<U> thenApply
750 +                (CompletableFuture<T> f, Function<? super T,U> a) {
751 +                return f.thenApplyAsync(a, new ThreadExecutor());
752 +            }
753 +            public <T,U> CompletableFuture<U> thenCompose
754 +                (CompletableFuture<T> f,
755 +                 Function<? super T,? extends CompletionStage<U>> a) {
756 +                return f.thenComposeAsync(a, new ThreadExecutor());
757 +            }
758 +            public <T,U> CompletableFuture<U> handle
759 +                (CompletableFuture<T> f,
760 +                 BiFunction<? super T,Throwable,? extends U> a) {
761 +                return f.handleAsync(a, new ThreadExecutor());
762 +            }
763 +            public <T> CompletableFuture<T> whenComplete
764 +                (CompletableFuture<T> f,
765 +                 BiConsumer<? super T,? super Throwable> a) {
766 +                return f.whenCompleteAsync(a, new ThreadExecutor());
767 +            }
768              public <T,U> CompletableFuture<Void> runAfterBoth
769 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
770 <                return f.runAfterBothAsync(g, r, new ThreadExecutor());
769 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
770 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
771 >            }
772 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
773 >                (CompletableFuture<T> f,
774 >                 CompletionStage<? extends U> g,
775 >                 BiConsumer<? super T,? super U> a) {
776 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
777 >            }
778 >            public <T,U,V> CompletableFuture<V> thenCombine
779 >                (CompletableFuture<T> f,
780 >                 CompletionStage<? extends U> g,
781 >                 BiFunction<? super T,? super U,? extends V> a) {
782 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
783 >            }
784 >            public <T> CompletableFuture<Void> runAfterEither
785 >                (CompletableFuture<T> f,
786 >                 CompletionStage<?> g,
787 >                 java.lang.Runnable a) {
788 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
789 >            }
790 >            public <T> CompletableFuture<Void> acceptEither
791 >                (CompletableFuture<T> f,
792 >                 CompletionStage<? extends T> g,
793 >                 Consumer<? super T> a) {
794 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
795 >            }
796 >            public <T,U> CompletableFuture<U> applyToEither
797 >                (CompletableFuture<T> f,
798 >                 CompletionStage<? extends T> g,
799 >                 Function<? super T,U> a) {
800 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
801              }
802          };
803  
804 +        public abstract void checkExecutionMode();
805 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
806 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
807 +        public abstract <T> CompletableFuture<Void> thenRun
808 +            (CompletableFuture<T> f, Runnable a);
809 +        public abstract <T> CompletableFuture<Void> thenAccept
810 +            (CompletableFuture<T> f, Consumer<? super T> a);
811 +        public abstract <T,U> CompletableFuture<U> thenApply
812 +            (CompletableFuture<T> f, Function<? super T,U> a);
813 +        public abstract <T,U> CompletableFuture<U> thenCompose
814 +            (CompletableFuture<T> f,
815 +             Function<? super T,? extends CompletionStage<U>> a);
816 +        public abstract <T,U> CompletableFuture<U> handle
817 +            (CompletableFuture<T> f,
818 +             BiFunction<? super T,Throwable,? extends U> a);
819 +        public abstract <T> CompletableFuture<T> whenComplete
820 +            (CompletableFuture<T> f,
821 +             BiConsumer<? super T,? super Throwable> a);
822          public abstract <T,U> CompletableFuture<Void> runAfterBoth
823 <            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r);
823 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
824 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
825 >            (CompletableFuture<T> f,
826 >             CompletionStage<? extends U> g,
827 >             BiConsumer<? super T,? super U> a);
828 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
829 >            (CompletableFuture<T> f,
830 >             CompletionStage<? extends U> g,
831 >             BiFunction<? super T,? super U,? extends V> a);
832 >        public abstract <T> CompletableFuture<Void> runAfterEither
833 >            (CompletableFuture<T> f,
834 >             CompletionStage<?> g,
835 >             java.lang.Runnable a);
836 >        public abstract <T> CompletableFuture<Void> acceptEither
837 >            (CompletableFuture<T> f,
838 >             CompletionStage<? extends T> g,
839 >             Consumer<? super T> a);
840 >        public abstract <T,U> CompletableFuture<U> applyToEither
841 >            (CompletableFuture<T> f,
842 >             CompletionStage<? extends T> g,
843 >             Function<? super T,U> a);
844      }
845  
846      /**
847 <     * runAfterBoth result completes normally after normal
848 <     * completion of sources
847 >     * exceptionally action is not invoked when source completes
848 >     * normally, and source result is propagated
849       */
850 <    public void testRunAfterBoth_normalCompletion1() {
851 <        for (ExecutionMode m : ExecutionMode.values())
850 >    public void testExceptionally_normalCompletion() {
851 >        for (boolean createIncomplete : new boolean[] { true, false })
852          for (Integer v1 : new Integer[] { 1, null })
853 <        for (Integer v2 : new Integer[] { 2, null }) {
854 <
853 >    {
854 >        final AtomicInteger a = new AtomicInteger(0);
855          final CompletableFuture<Integer> f = new CompletableFuture<>();
856 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
857 <        final Noop r = new Noop();
858 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
859 <
860 <        f.complete(v1);
861 <        checkIncomplete(h);
862 <        assertFalse(r.ran);
863 <        g.complete(v2);
856 >        if (!createIncomplete) assertTrue(f.complete(v1));
857 >        final CompletableFuture<Integer> g = f.exceptionally
858 >            ((Throwable t) -> {
859 >                a.getAndIncrement();
860 >                threadFail("should not be called");
861 >                return null;            // unreached
862 >            });
863 >        if (createIncomplete) assertTrue(f.complete(v1));
864  
865 <        checkCompletedNormally(h, null);
999 <        assertTrue(r.ran);
865 >        checkCompletedNormally(g, v1);
866          checkCompletedNormally(f, v1);
867 <        checkCompletedNormally(g, v2);
868 <        }
1003 <    }
867 >        assertEquals(0, a.get());
868 >    }}
869  
870 <    public void testRunAfterBoth_normalCompletion2() {
871 <        for (ExecutionMode m : ExecutionMode.values())
870 >    /**
871 >     * exceptionally action completes with function value on source
872 >     * exception
873 >     */
874 >    public void testExceptionally_exceptionalCompletion() {
875 >        for (boolean createIncomplete : new boolean[] { true, false })
876          for (Integer v1 : new Integer[] { 1, null })
877 <        for (Integer v2 : new Integer[] { 2, null }) {
878 <
877 >    {
878 >        final AtomicInteger a = new AtomicInteger(0);
879 >        final CFException ex = new CFException();
880          final CompletableFuture<Integer> f = new CompletableFuture<>();
881 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
882 <        final Noop r = new Noop();
883 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
884 <
885 <        g.complete(v2);
886 <        checkIncomplete(h);
887 <        assertFalse(r.ran);
888 <        f.complete(v1);
889 <
1020 <        checkCompletedNormally(h, null);
1021 <        assertTrue(r.ran);
1022 <        checkCompletedNormally(f, v1);
1023 <        checkCompletedNormally(g, v2);
1024 <        }
1025 <    }
881 >        if (!createIncomplete) f.completeExceptionally(ex);
882 >        final CompletableFuture<Integer> g = f.exceptionally
883 >            ((Throwable t) -> {
884 >                ExecutionMode.SYNC.checkExecutionMode();
885 >                threadAssertSame(t, ex);
886 >                a.getAndIncrement();
887 >                return v1;
888 >            });
889 >        if (createIncomplete) f.completeExceptionally(ex);
890  
891 <    public void testRunAfterBoth_normalCompletion3() {
892 <        for (ExecutionMode m : ExecutionMode.values())
893 <        for (Integer v1 : new Integer[] { 1, null })
1030 <        for (Integer v2 : new Integer[] { 2, null }) {
891 >        checkCompletedNormally(g, v1);
892 >        assertEquals(1, a.get());
893 >    }}
894  
895 +    /**
896 +     * If an "exceptionally action" throws an exception, it completes
897 +     * exceptionally with that exception
898 +     */
899 +    public void testExceptionally_exceptionalCompletionActionFailed() {
900 +        for (boolean createIncomplete : new boolean[] { true, false })
901 +    {
902 +        final AtomicInteger a = new AtomicInteger(0);
903 +        final CFException ex1 = new CFException();
904 +        final CFException ex2 = new CFException();
905          final CompletableFuture<Integer> f = new CompletableFuture<>();
906 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
907 <        final Noop r = new Noop();
908 <
909 <        g.complete(v2);
910 <        f.complete(v1);
911 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
906 >        if (!createIncomplete) f.completeExceptionally(ex1);
907 >        final CompletableFuture<Integer> g = f.exceptionally
908 >            ((Throwable t) -> {
909 >                ExecutionMode.SYNC.checkExecutionMode();
910 >                threadAssertSame(t, ex1);
911 >                a.getAndIncrement();
912 >                throw ex2;
913 >            });
914 >        if (createIncomplete) f.completeExceptionally(ex1);
915 >
916 >        checkCompletedWithWrappedException(g, ex2);
917 >        checkCompletedExceptionally(f, ex1);
918 >        assertEquals(1, a.get());
919 >    }}
920  
921 <        checkCompletedNormally(h, null);
922 <        assertTrue(r.ran);
923 <        checkCompletedNormally(f, v1);
924 <        checkCompletedNormally(g, v2);
925 <        }
1045 <    }
1046 <
1047 <    public void testRunAfterBoth_normalCompletion4() {
921 >    /**
922 >     * whenComplete action executes on normal completion, propagating
923 >     * source result.
924 >     */
925 >    public void testWhenComplete_normalCompletion() {
926          for (ExecutionMode m : ExecutionMode.values())
927 +        for (boolean createIncomplete : new boolean[] { true, false })
928          for (Integer v1 : new Integer[] { 1, null })
929 <        for (Integer v2 : new Integer[] { 2, null }) {
930 <
929 >    {
930 >        final AtomicInteger a = new AtomicInteger(0);
931          final CompletableFuture<Integer> f = new CompletableFuture<>();
932 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
933 <        final Noop r = new Noop();
934 <
935 <        f.complete(v1);
936 <        g.complete(v2);
937 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
932 >        if (!createIncomplete) assertTrue(f.complete(v1));
933 >        final CompletableFuture<Integer> g = m.whenComplete
934 >            (f,
935 >             (Integer result, Throwable t) -> {
936 >                m.checkExecutionMode();
937 >                threadAssertSame(result, v1);
938 >                threadAssertNull(t);
939 >                a.getAndIncrement();
940 >            });
941 >        if (createIncomplete) assertTrue(f.complete(v1));
942  
943 <        checkCompletedNormally(h, null);
1061 <        assertTrue(r.ran);
943 >        checkCompletedNormally(g, v1);
944          checkCompletedNormally(f, v1);
945 <        checkCompletedNormally(g, v2);
946 <        }
1065 <    }
945 >        assertEquals(1, a.get());
946 >    }}
947  
948      /**
949 <     * runAfterBoth result completes exceptionally after exceptional
950 <     * completion of either source
949 >     * whenComplete action executes on exceptional completion, propagating
950 >     * source result.
951       */
952 <    public void testRunAfterBoth_exceptionalCompletion1() {
952 >    public void testWhenComplete_exceptionalCompletion() {
953          for (ExecutionMode m : ExecutionMode.values())
954 <        for (Integer v1 : new Integer[] { 1, null }) {
955 <
956 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1076 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1077 <        final Noop r = new Noop();
1078 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
954 >        for (boolean createIncomplete : new boolean[] { true, false })
955 >    {
956 >        final AtomicInteger a = new AtomicInteger(0);
957          final CFException ex = new CFException();
958 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
959 +        if (!createIncomplete) f.completeExceptionally(ex);
960 +        final CompletableFuture<Integer> g = m.whenComplete
961 +            (f,
962 +             (Integer result, Throwable t) -> {
963 +                m.checkExecutionMode();
964 +                threadAssertNull(result);
965 +                threadAssertSame(t, ex);
966 +                a.getAndIncrement();
967 +            });
968 +        if (createIncomplete) f.completeExceptionally(ex);
969 +
970 +        checkCompletedWithWrappedException(g, ex);
971 +        checkCompletedExceptionally(f, ex);
972 +        assertEquals(1, a.get());
973 +    }}
974  
975 <        f.completeExceptionally(ex);
976 <        checkIncomplete(h);
977 <        g.complete(v1);
978 <
979 <        checkCompletedWithWrappedCFException(h, ex);
1086 <        checkCompletedWithWrappedCFException(f, ex);
1087 <        assertFalse(r.ran);
1088 <        checkCompletedNormally(g, v1);
1089 <        }
1090 <    }
1091 <
1092 <    public void testRunAfterBoth_exceptionalCompletion2() {
975 >    /**
976 >     * whenComplete action executes on cancelled source, propagating
977 >     * CancellationException.
978 >     */
979 >    public void testWhenComplete_sourceCancelled() {
980          for (ExecutionMode m : ExecutionMode.values())
981 <        for (Integer v1 : new Integer[] { 1, null }) {
982 <
981 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
982 >        for (boolean createIncomplete : new boolean[] { true, false })
983 >    {
984 >        final AtomicInteger a = new AtomicInteger(0);
985          final CompletableFuture<Integer> f = new CompletableFuture<>();
986 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
987 <        final Noop r = new Noop();
988 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
989 <        final CFException ex = new CFException();
990 <
991 <        g.completeExceptionally(ex);
992 <        checkIncomplete(h);
993 <        f.complete(v1);
986 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987 >        final CompletableFuture<Integer> g = m.whenComplete
988 >            (f,
989 >             (Integer result, Throwable t) -> {
990 >                m.checkExecutionMode();
991 >                threadAssertNull(result);
992 >                threadAssertTrue(t instanceof CancellationException);
993 >                a.getAndIncrement();
994 >            });
995 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
996  
997 <        checkCompletedWithWrappedCFException(h, ex);
998 <        checkCompletedWithWrappedCFException(g, ex);
999 <        assertFalse(r.ran);
1000 <        checkCompletedNormally(f, v1);
1110 <        }
1111 <    }
997 >        checkCompletedWithWrappedCancellationException(g);
998 >        checkCancelled(f);
999 >        assertEquals(1, a.get());
1000 >    }}
1001  
1002 <    public void testRunAfterBoth_exceptionalCompletion3() {
1002 >    /**
1003 >     * If a whenComplete action throws an exception when triggered by
1004 >     * a normal completion, it completes exceptionally
1005 >     */
1006 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1007 >        for (boolean createIncomplete : new boolean[] { true, false })
1008          for (ExecutionMode m : ExecutionMode.values())
1009 <        for (Integer v1 : new Integer[] { 1, null }) {
1010 <
1011 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1118 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1119 <        final Noop r = new Noop();
1009 >        for (Integer v1 : new Integer[] { 1, null })
1010 >    {
1011 >        final AtomicInteger a = new AtomicInteger(0);
1012          final CFException ex = new CFException();
1013 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1014 +        if (!createIncomplete) assertTrue(f.complete(v1));
1015 +        final CompletableFuture<Integer> g = m.whenComplete
1016 +            (f,
1017 +             (Integer result, Throwable t) -> {
1018 +                m.checkExecutionMode();
1019 +                threadAssertSame(result, v1);
1020 +                threadAssertNull(t);
1021 +                a.getAndIncrement();
1022 +                throw ex;
1023 +            });
1024 +        if (createIncomplete) assertTrue(f.complete(v1));
1025  
1026 <        g.completeExceptionally(ex);
1123 <        f.complete(v1);
1124 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1125 <
1126 <        checkCompletedWithWrappedCFException(h, ex);
1127 <        checkCompletedWithWrappedCFException(g, ex);
1128 <        assertFalse(r.ran);
1026 >        checkCompletedWithWrappedException(g, ex);
1027          checkCompletedNormally(f, v1);
1028 <        }
1029 <    }
1028 >        assertEquals(1, a.get());
1029 >    }}
1030  
1031 <    public void testRunAfterBoth_exceptionalCompletion4() {
1031 >    /**
1032 >     * If a whenComplete action throws an exception when triggered by
1033 >     * a source completion that also throws an exception, the source
1034 >     * exception takes precedence (unlike handle)
1035 >     */
1036 >    public void testWhenComplete_sourceFailedActionFailed() {
1037 >        for (boolean createIncomplete : new boolean[] { true, false })
1038          for (ExecutionMode m : ExecutionMode.values())
1039 <        for (Integer v1 : new Integer[] { 1, null }) {
1040 <
1039 >    {
1040 >        final AtomicInteger a = new AtomicInteger(0);
1041 >        final CFException ex1 = new CFException();
1042 >        final CFException ex2 = new CFException();
1043          final CompletableFuture<Integer> f = new CompletableFuture<>();
1138        final CompletableFuture<Integer> g = new CompletableFuture<>();
1139        final Noop r = new Noop();
1140        final CFException ex = new CFException();
1141
1142        f.completeExceptionally(ex);
1143        g.complete(v1);
1144        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1044  
1045 <        checkCompletedWithWrappedCFException(h, ex);
1046 <        checkCompletedWithWrappedCFException(f, ex);
1047 <        assertFalse(r.ran);
1048 <        checkCompletedNormally(g, v1);
1045 >        if (!createIncomplete) f.completeExceptionally(ex1);
1046 >        final CompletableFuture<Integer> g = m.whenComplete
1047 >            (f,
1048 >             (Integer result, Throwable t) -> {
1049 >                m.checkExecutionMode();
1050 >                threadAssertSame(t, ex1);
1051 >                threadAssertNull(result);
1052 >                a.getAndIncrement();
1053 >                throw ex2;
1054 >            });
1055 >        if (createIncomplete) f.completeExceptionally(ex1);
1056 >
1057 >        checkCompletedWithWrappedException(g, ex1);
1058 >        checkCompletedExceptionally(f, ex1);
1059 >        if (testImplementationDetails) {
1060 >            assertEquals(1, ex1.getSuppressed().length);
1061 >            assertSame(ex2, ex1.getSuppressed()[0]);
1062          }
1063 <    }
1063 >        assertEquals(1, a.get());
1064 >    }}
1065  
1066      /**
1067 <     * runAfterBoth result completes exceptionally if action does
1067 >     * handle action completes normally with function value on normal
1068 >     * completion of source
1069       */
1070 <    public void testRunAfterBoth_actionFailed1() {
1070 >    public void testHandle_normalCompletion() {
1071          for (ExecutionMode m : ExecutionMode.values())
1072 +        for (boolean createIncomplete : new boolean[] { true, false })
1073          for (Integer v1 : new Integer[] { 1, null })
1074 <        for (Integer v2 : new Integer[] { 2, null }) {
1160 <
1074 >    {
1075          final CompletableFuture<Integer> f = new CompletableFuture<>();
1076 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1077 <        final FailingNoop r = new FailingNoop();
1078 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1076 >        final AtomicInteger a = new AtomicInteger(0);
1077 >        if (!createIncomplete) assertTrue(f.complete(v1));
1078 >        final CompletableFuture<Integer> g = m.handle
1079 >            (f,
1080 >             (Integer result, Throwable t) -> {
1081 >                m.checkExecutionMode();
1082 >                threadAssertSame(result, v1);
1083 >                threadAssertNull(t);
1084 >                a.getAndIncrement();
1085 >                return inc(v1);
1086 >            });
1087 >        if (createIncomplete) assertTrue(f.complete(v1));
1088  
1089 <        f.complete(v1);
1167 <        checkIncomplete(h);
1168 <        g.complete(v2);
1169 <
1170 <        checkCompletedWithWrappedCFException(h);
1089 >        checkCompletedNormally(g, inc(v1));
1090          checkCompletedNormally(f, v1);
1091 <        checkCompletedNormally(g, v2);
1092 <        }
1174 <    }
1091 >        assertEquals(1, a.get());
1092 >    }}
1093  
1094 <    public void testRunAfterBoth_actionFailed2() {
1094 >    /**
1095 >     * handle action completes normally with function value on
1096 >     * exceptional completion of source
1097 >     */
1098 >    public void testHandle_exceptionalCompletion() {
1099          for (ExecutionMode m : ExecutionMode.values())
1100 +        for (boolean createIncomplete : new boolean[] { true, false })
1101          for (Integer v1 : new Integer[] { 1, null })
1102 <        for (Integer v2 : new Integer[] { 2, null }) {
1180 <
1102 >    {
1103          final CompletableFuture<Integer> f = new CompletableFuture<>();
1104 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1105 <        final FailingNoop r = new FailingNoop();
1106 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1107 <
1108 <        g.complete(v2);
1109 <        checkIncomplete(h);
1110 <        f.complete(v1);
1104 >        final AtomicInteger a = new AtomicInteger(0);
1105 >        final CFException ex = new CFException();
1106 >        if (!createIncomplete) f.completeExceptionally(ex);
1107 >        final CompletableFuture<Integer> g = m.handle
1108 >            (f,
1109 >             (Integer result, Throwable t) -> {
1110 >                m.checkExecutionMode();
1111 >                threadAssertNull(result);
1112 >                threadAssertSame(t, ex);
1113 >                a.getAndIncrement();
1114 >                return v1;
1115 >            });
1116 >        if (createIncomplete) f.completeExceptionally(ex);
1117  
1118 <        checkCompletedWithWrappedCFException(h);
1119 <        checkCompletedNormally(f, v1);
1120 <        checkCompletedNormally(g, v2);
1121 <        }
1194 <    }
1118 >        checkCompletedNormally(g, v1);
1119 >        checkCompletedExceptionally(f, ex);
1120 >        assertEquals(1, a.get());
1121 >    }}
1122  
1123      /**
1124 <     * runAfterBoth result completes exceptionally if either source cancelled
1124 >     * handle action completes normally with function value on
1125 >     * cancelled source
1126       */
1127 <    public void testRunAfterBoth_sourceCancelled1() {
1127 >    public void testHandle_sourceCancelled() {
1128          for (ExecutionMode m : ExecutionMode.values())
1129          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1130 <        for (Integer v1 : new Integer[] { 1, null }) {
1131 <
1130 >        for (boolean createIncomplete : new boolean[] { true, false })
1131 >        for (Integer v1 : new Integer[] { 1, null })
1132 >    {
1133          final CompletableFuture<Integer> f = new CompletableFuture<>();
1134 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1135 <        final Noop r = new Noop();
1136 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1137 <
1138 <        assertTrue(f.cancel(mayInterruptIfRunning));
1139 <        checkIncomplete(h);
1140 <        g.complete(v1);
1134 >        final AtomicInteger a = new AtomicInteger(0);
1135 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1136 >        final CompletableFuture<Integer> g = m.handle
1137 >            (f,
1138 >             (Integer result, Throwable t) -> {
1139 >                m.checkExecutionMode();
1140 >                threadAssertNull(result);
1141 >                threadAssertTrue(t instanceof CancellationException);
1142 >                a.getAndIncrement();
1143 >                return v1;
1144 >            });
1145 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1146  
1213        checkCompletedWithWrappedCancellationException(h);
1214        checkCancelled(f);
1215        assertFalse(r.ran);
1147          checkCompletedNormally(g, v1);
1217        }
1218    }
1219
1220    public void testRunAfterBoth_sourceCancelled2() {
1221        for (ExecutionMode m : ExecutionMode.values())
1222        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1223        for (Integer v1 : new Integer[] { 1, null }) {
1224
1225        final CompletableFuture<Integer> f = new CompletableFuture<>();
1226        final CompletableFuture<Integer> g = new CompletableFuture<>();
1227        final Noop r = new Noop();
1228        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1229
1230        assertTrue(g.cancel(mayInterruptIfRunning));
1231        checkIncomplete(h);
1232        f.complete(v1);
1233
1234        checkCompletedWithWrappedCancellationException(h);
1235        checkCancelled(g);
1236        assertFalse(r.ran);
1237        checkCompletedNormally(f, v1);
1238        }
1239    }
1240
1241    public void testRunAfterBoth_sourceCancelled3() {
1242        for (ExecutionMode m : ExecutionMode.values())
1243        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1244        for (Integer v1 : new Integer[] { 1, null }) {
1245
1246        final CompletableFuture<Integer> f = new CompletableFuture<>();
1247        final CompletableFuture<Integer> g = new CompletableFuture<>();
1248        final Noop r = new Noop();
1249
1250        assertTrue(g.cancel(mayInterruptIfRunning));
1251        f.complete(v1);
1252        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1253
1254        checkCompletedWithWrappedCancellationException(h);
1255        checkCancelled(g);
1256        assertFalse(r.ran);
1257        checkCompletedNormally(f, v1);
1258        }
1259    }
1260
1261    public void testRunAfterBoth_sourceCancelled4() {
1262        for (ExecutionMode m : ExecutionMode.values())
1263        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1264        for (Integer v1 : new Integer[] { 1, null }) {
1265
1266        final CompletableFuture<Integer> f = new CompletableFuture<>();
1267        final CompletableFuture<Integer> g = new CompletableFuture<>();
1268        final Noop r = new Noop();
1269
1270        assertTrue(f.cancel(mayInterruptIfRunning));
1271        g.complete(v1);
1272        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1273
1274        checkCompletedWithWrappedCancellationException(h);
1148          checkCancelled(f);
1149 <        assertFalse(r.ran);
1150 <        checkCompletedNormally(g, v1);
1278 <        }
1279 <    }
1280 <
1281 <    /**
1282 <     * applyToEither result completes normally after normal completion
1283 <     * of either source
1284 <     */
1285 <    public void testApplyToEither() {
1286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1287 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1288 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1289 <        f.complete(one);
1290 <        checkCompletedNormally(g, two);
1291 <        f2.complete(one);
1292 <        checkCompletedNormally(g, two);
1293 <
1294 <        f = new CompletableFuture<>();
1295 <        f.complete(one);
1296 <        f2 = new CompletableFuture<>();
1297 <        g = f.applyToEither(f2, inc);
1298 <        checkCompletedNormally(g, two);
1299 <    }
1149 >        assertEquals(1, a.get());
1150 >    }}
1151  
1152      /**
1153 <     * applyToEither result completes exceptionally after exceptional
1154 <     * completion of either source
1153 >     * If a "handle action" throws an exception when triggered by
1154 >     * a normal completion, it completes exceptionally
1155       */
1156 <    public void testApplyToEither2() {
1157 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1158 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1159 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1160 <        f.completeExceptionally(new CFException());
1161 <        f2.complete(one);
1162 <        checkCompletedWithWrappedCFException(g);
1156 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1157 >        for (ExecutionMode m : ExecutionMode.values())
1158 >        for (boolean createIncomplete : new boolean[] { true, false })
1159 >        for (Integer v1 : new Integer[] { 1, null })
1160 >    {
1161 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1162 >        final AtomicInteger a = new AtomicInteger(0);
1163 >        final CFException ex = new CFException();
1164 >        if (!createIncomplete) assertTrue(f.complete(v1));
1165 >        final CompletableFuture<Integer> g = m.handle
1166 >            (f,
1167 >             (Integer result, Throwable t) -> {
1168 >                m.checkExecutionMode();
1169 >                threadAssertSame(result, v1);
1170 >                threadAssertNull(t);
1171 >                a.getAndIncrement();
1172 >                throw ex;
1173 >            });
1174 >        if (createIncomplete) assertTrue(f.complete(v1));
1175  
1176 <        f = new CompletableFuture<>();
1177 <        f2 = new CompletableFuture<>();
1178 <        f2.completeExceptionally(new CFException());
1179 <        g = f.applyToEither(f2, inc);
1317 <        checkCompletedWithWrappedCFException(g);
1318 <    }
1176 >        checkCompletedWithWrappedException(g, ex);
1177 >        checkCompletedNormally(f, v1);
1178 >        assertEquals(1, a.get());
1179 >    }}
1180  
1181      /**
1182 <     * applyToEither result completes exceptionally if action does
1182 >     * If a "handle action" throws an exception when triggered by
1183 >     * a source completion that also throws an exception, the action
1184 >     * exception takes precedence (unlike whenComplete)
1185       */
1186 <    public void testApplyToEither3() {
1187 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1188 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1189 <        FailingFunction r = new FailingFunction();
1190 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1191 <        f2.complete(two);
1192 <        checkCompletedWithWrappedCFException(g);
1193 <    }
1186 >    public void testHandle_sourceFailedActionFailed() {
1187 >        for (boolean createIncomplete : new boolean[] { true, false })
1188 >        for (ExecutionMode m : ExecutionMode.values())
1189 >    {
1190 >        final AtomicInteger a = new AtomicInteger(0);
1191 >        final CFException ex1 = new CFException();
1192 >        final CFException ex2 = new CFException();
1193 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1194  
1195 <    /**
1196 <     * applyToEither result completes exceptionally if either source cancelled
1197 <     */
1198 <    public void testApplyToEither4() {
1199 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1200 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1201 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1202 <        assertTrue(f.cancel(true));
1203 <        checkCompletedWithWrappedCancellationException(g);
1204 <        f = new CompletableFuture<>();
1205 <        f2 = new CompletableFuture<>();
1206 <        assertTrue(f2.cancel(true));
1207 <        checkCompletedWithWrappedCancellationException(g);
1208 <    }
1195 >        if (!createIncomplete) f.completeExceptionally(ex1);
1196 >        final CompletableFuture<Integer> g = m.handle
1197 >            (f,
1198 >             (Integer result, Throwable t) -> {
1199 >                m.checkExecutionMode();
1200 >                threadAssertNull(result);
1201 >                threadAssertSame(ex1, t);
1202 >                a.getAndIncrement();
1203 >                throw ex2;
1204 >            });
1205 >        if (createIncomplete) f.completeExceptionally(ex1);
1206 >
1207 >        checkCompletedWithWrappedException(g, ex2);
1208 >        checkCompletedExceptionally(f, ex1);
1209 >        assertEquals(1, a.get());
1210 >    }}
1211  
1212      /**
1213 <     * acceptEither result completes normally after normal completion
1349 <     * of either source
1213 >     * runAsync completes after running Runnable
1214       */
1215 <    public void testAcceptEither() {
1216 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1217 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1218 <        IncAction r = new IncAction();
1219 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1220 <        f.complete(one);
1221 <        checkCompletedNormally(g, null);
1222 <        f2.complete(one);
1223 <        checkCompletedNormally(g, null);
1224 <        assertEquals(r.value, 2);
1225 <
1226 <        r = new IncAction();
1227 <        f = new CompletableFuture<>();
1364 <        f.complete(one);
1365 <        f2 = new CompletableFuture<>();
1366 <        g = f.acceptEither(f2, r);
1367 <        checkCompletedNormally(g, null);
1368 <        assertEquals(r.value, 2);
1369 <    }
1215 >    public void testRunAsync_normalCompletion() {
1216 >        ExecutionMode[] executionModes = {
1217 >            ExecutionMode.ASYNC,
1218 >            ExecutionMode.EXECUTOR,
1219 >        };
1220 >        for (ExecutionMode m : executionModes)
1221 >    {
1222 >        final Noop r = new Noop(m);
1223 >        final CompletableFuture<Void> f = m.runAsync(r);
1224 >        assertNull(f.join());
1225 >        checkCompletedNormally(f, null);
1226 >        r.assertInvoked();
1227 >    }}
1228  
1229      /**
1230 <     * acceptEither result completes exceptionally after exceptional
1373 <     * completion of either source
1230 >     * failing runAsync completes exceptionally after running Runnable
1231       */
1232 <    public void testAcceptEither2() {
1233 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1234 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1235 <        IncAction r = new IncAction();
1236 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1237 <        f.completeExceptionally(new CFException());
1238 <        f2.complete(one);
1239 <        checkCompletedWithWrappedCFException(g);
1240 <
1241 <        r = new IncAction();
1242 <        f = new CompletableFuture<>();
1243 <        f2 = new CompletableFuture<>();
1387 <        f2.completeExceptionally(new CFException());
1388 <        g = f.acceptEither(f2, r);
1389 <        checkCompletedWithWrappedCFException(g);
1390 <    }
1232 >    public void testRunAsync_exceptionalCompletion() {
1233 >        ExecutionMode[] executionModes = {
1234 >            ExecutionMode.ASYNC,
1235 >            ExecutionMode.EXECUTOR,
1236 >        };
1237 >        for (ExecutionMode m : executionModes)
1238 >    {
1239 >        final FailingRunnable r = new FailingRunnable(m);
1240 >        final CompletableFuture<Void> f = m.runAsync(r);
1241 >        checkCompletedWithWrappedException(f, r.ex);
1242 >        r.assertInvoked();
1243 >    }}
1244  
1245 <    /**
1246 <     * acceptEither result completes exceptionally if action does
1247 <     */
1248 <    public void testAcceptEither3() {
1249 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1250 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1251 <        FailingConsumer r = new FailingConsumer();
1252 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1400 <        f2.complete(two);
1401 <        checkCompletedWithWrappedCFException(g);
1402 <    }
1245 >    public void testRunAsync_rejectingExecutor() {
1246 >        CountingRejectingExecutor e = new CountingRejectingExecutor();
1247 >        try {
1248 >            CompletableFuture.runAsync(() -> {}, e);
1249 >            shouldThrow();
1250 >        } catch (Throwable t) {
1251 >            assertSame(e.ex, t);
1252 >        }
1253  
1254 <    /**
1405 <     * acceptEither result completes exceptionally if either source cancelled
1406 <     */
1407 <    public void testAcceptEither4() {
1408 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1409 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1410 <        IncAction r = new IncAction();
1411 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1412 <        assertTrue(f.cancel(true));
1413 <        checkCompletedWithWrappedCancellationException(g);
1414 <        f = new CompletableFuture<>();
1415 <        f2 = new CompletableFuture<>();
1416 <        assertTrue(f2.cancel(true));
1417 <        checkCompletedWithWrappedCancellationException(g);
1254 >        assertEquals(1, e.count.get());
1255      }
1256  
1257      /**
1258 <     * runAfterEither result completes normally after normal completion
1422 <     * of either source
1258 >     * supplyAsync completes with result of supplier
1259       */
1260 <    public void testRunAfterEither() {
1261 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1262 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1263 <        Noop r = new Noop();
1264 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1265 <        f.complete(one);
1266 <        checkCompletedNormally(g, null);
1267 <        f2.complete(one);
1268 <        checkCompletedNormally(g, null);
1269 <        assertTrue(r.ran);
1270 <
1271 <        r = new Noop();
1272 <        f = new CompletableFuture<>();
1273 <        f.complete(one);
1438 <        f2 = new CompletableFuture<>();
1439 <        g = f.runAfterEither(f2, r);
1440 <        checkCompletedNormally(g, null);
1441 <        assertTrue(r.ran);
1442 <    }
1260 >    public void testSupplyAsync_normalCompletion() {
1261 >        ExecutionMode[] executionModes = {
1262 >            ExecutionMode.ASYNC,
1263 >            ExecutionMode.EXECUTOR,
1264 >        };
1265 >        for (ExecutionMode m : executionModes)
1266 >        for (Integer v1 : new Integer[] { 1, null })
1267 >    {
1268 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1269 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1270 >        assertSame(v1, f.join());
1271 >        checkCompletedNormally(f, v1);
1272 >        r.assertInvoked();
1273 >    }}
1274  
1275      /**
1276 <     * runAfterEither result completes exceptionally after exceptional
1446 <     * completion of either source
1276 >     * Failing supplyAsync completes exceptionally
1277       */
1278 <    public void testRunAfterEither2() {
1279 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1280 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1281 <        Noop r = new Noop();
1282 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1283 <        f.completeExceptionally(new CFException());
1284 <        f2.complete(one);
1285 <        checkCompletedWithWrappedCFException(g);
1278 >    public void testSupplyAsync_exceptionalCompletion() {
1279 >        ExecutionMode[] executionModes = {
1280 >            ExecutionMode.ASYNC,
1281 >            ExecutionMode.EXECUTOR,
1282 >        };
1283 >        for (ExecutionMode m : executionModes)
1284 >    {
1285 >        FailingSupplier r = new FailingSupplier(m);
1286 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1287 >        checkCompletedWithWrappedException(f, r.ex);
1288 >        r.assertInvoked();
1289 >    }}
1290  
1291 <        r = new Noop();
1292 <        f = new CompletableFuture<>();
1293 <        f2 = new CompletableFuture<>();
1294 <        f2.completeExceptionally(new CFException());
1295 <        g = f.runAfterEither(f2, r);
1296 <        checkCompletedWithWrappedCFException(g);
1297 <    }
1291 >    public void testSupplyAsync_rejectingExecutor() {
1292 >        CountingRejectingExecutor e = new CountingRejectingExecutor();
1293 >        try {
1294 >            CompletableFuture.supplyAsync(() -> null, e);
1295 >            shouldThrow();
1296 >        } catch (Throwable t) {
1297 >            assertSame(e.ex, t);
1298 >        }
1299  
1300 <    /**
1466 <     * runAfterEither result completes exceptionally if action does
1467 <     */
1468 <    public void testRunAfterEither3() {
1469 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1471 <        FailingNoop r = new FailingNoop();
1472 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1473 <        f2.complete(two);
1474 <        checkCompletedWithWrappedCFException(g);
1300 >        assertEquals(1, e.count.get());
1301      }
1302  
1303 <    /**
1478 <     * runAfterEither result completes exceptionally if either source cancelled
1479 <     */
1480 <    public void testRunAfterEither4() {
1481 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1482 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1483 <        Noop r = new Noop();
1484 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1485 <        assertTrue(f.cancel(true));
1486 <        checkCompletedWithWrappedCancellationException(g);
1487 <        f = new CompletableFuture<>();
1488 <        f2 = new CompletableFuture<>();
1489 <        assertTrue(f2.cancel(true));
1490 <        checkCompletedWithWrappedCancellationException(g);
1491 <    }
1303 >    // seq completion methods
1304  
1305      /**
1306 <     * thenCompose result completes normally after normal completion of source
1306 >     * thenRun result completes normally after normal completion of source
1307       */
1308 <    public void testThenCompose() {
1309 <        CompletableFuture<Integer> f, g;
1310 <        CompletableFutureInc r;
1311 <
1312 <        f = new CompletableFuture<>();
1313 <        g = f.thenCompose(r = new CompletableFutureInc());
1314 <        f.complete(one);
1503 <        checkCompletedNormally(g, two);
1504 <        assertTrue(r.ran);
1308 >    public void testThenRun_normalCompletion() {
1309 >        for (ExecutionMode m : ExecutionMode.values())
1310 >        for (Integer v1 : new Integer[] { 1, null })
1311 >    {
1312 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1313 >        final Noop[] rs = new Noop[6];
1314 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1315  
1316 <        f = new CompletableFuture<>();
1317 <        f.complete(one);
1318 <        g = f.thenCompose(r = new CompletableFutureInc());
1319 <        checkCompletedNormally(g, two);
1320 <        assertTrue(r.ran);
1321 <    }
1316 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1317 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1318 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1319 >        checkIncomplete(h0);
1320 >        checkIncomplete(h1);
1321 >        checkIncomplete(h2);
1322 >        assertTrue(f.complete(v1));
1323 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1324 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1325 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1326 >
1327 >        checkCompletedNormally(h0, null);
1328 >        checkCompletedNormally(h1, null);
1329 >        checkCompletedNormally(h2, null);
1330 >        checkCompletedNormally(h3, null);
1331 >        checkCompletedNormally(h4, null);
1332 >        checkCompletedNormally(h5, null);
1333 >        checkCompletedNormally(f, v1);
1334 >        for (Noop r : rs) r.assertInvoked();
1335 >    }}
1336  
1337      /**
1338 <     * thenCompose result completes exceptionally after exceptional
1338 >     * thenRun result completes exceptionally after exceptional
1339       * completion of source
1340       */
1341 <    public void testThenCompose2() {
1342 <        CompletableFuture<Integer> f, g;
1343 <        CompletableFutureInc r;
1344 <
1345 <        f = new CompletableFuture<>();
1346 <        g = f.thenCompose(r = new CompletableFutureInc());
1347 <        f.completeExceptionally(new CFException());
1524 <        checkCompletedWithWrappedCFException(g);
1341 >    public void testThenRun_exceptionalCompletion() {
1342 >        for (ExecutionMode m : ExecutionMode.values())
1343 >    {
1344 >        final CFException ex = new CFException();
1345 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1346 >        final Noop[] rs = new Noop[6];
1347 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1348  
1349 <        f = new CompletableFuture<>();
1350 <        f.completeExceptionally(new CFException());
1351 <        g = f.thenCompose(r = new CompletableFutureInc());
1352 <        checkCompletedWithWrappedCFException(g);
1353 <    }
1349 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1350 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1351 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1352 >        checkIncomplete(h0);
1353 >        checkIncomplete(h1);
1354 >        checkIncomplete(h2);
1355 >        assertTrue(f.completeExceptionally(ex));
1356 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1357 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1358 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1359 >
1360 >        checkCompletedWithWrappedException(h0, ex);
1361 >        checkCompletedWithWrappedException(h1, ex);
1362 >        checkCompletedWithWrappedException(h2, ex);
1363 >        checkCompletedWithWrappedException(h3, ex);
1364 >        checkCompletedWithWrappedException(h4, ex);
1365 >        checkCompletedWithWrappedException(h5, ex);
1366 >        checkCompletedExceptionally(f, ex);
1367 >        for (Noop r : rs) r.assertNotInvoked();
1368 >    }}
1369  
1370      /**
1371 <     * thenCompose result completes exceptionally if action does
1371 >     * thenRun result completes exceptionally if source cancelled
1372       */
1373 <    public void testThenCompose3() {
1374 <        CompletableFuture<Integer> f, g;
1375 <        FailingCompletableFutureFunction r;
1376 <
1377 <        f = new CompletableFuture<>();
1378 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1379 <        f.complete(one);
1542 <        checkCompletedWithWrappedCFException(g);
1373 >    public void testThenRun_sourceCancelled() {
1374 >        for (ExecutionMode m : ExecutionMode.values())
1375 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1376 >    {
1377 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1378 >        final Noop[] rs = new Noop[6];
1379 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1380  
1381 <        f = new CompletableFuture<>();
1382 <        f.complete(one);
1383 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1384 <        checkCompletedWithWrappedCFException(g);
1385 <    }
1381 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1382 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1383 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1384 >        checkIncomplete(h0);
1385 >        checkIncomplete(h1);
1386 >        checkIncomplete(h2);
1387 >        assertTrue(f.cancel(mayInterruptIfRunning));
1388 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1389 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1390 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1391 >
1392 >        checkCompletedWithWrappedCancellationException(h0);
1393 >        checkCompletedWithWrappedCancellationException(h1);
1394 >        checkCompletedWithWrappedCancellationException(h2);
1395 >        checkCompletedWithWrappedCancellationException(h3);
1396 >        checkCompletedWithWrappedCancellationException(h4);
1397 >        checkCompletedWithWrappedCancellationException(h5);
1398 >        checkCancelled(f);
1399 >        for (Noop r : rs) r.assertNotInvoked();
1400 >    }}
1401  
1402      /**
1403 <     * thenCompose result completes exceptionally if source cancelled
1403 >     * thenRun result completes exceptionally if action does
1404       */
1405 <    public void testThenCompose4() {
1406 <        CompletableFuture<Integer> f, g;
1407 <        CompletableFutureInc r;
1408 <
1409 <        f = new CompletableFuture<>();
1410 <        g = f.thenCompose(r = new CompletableFutureInc());
1411 <        assertTrue(f.cancel(true));
1560 <        checkCompletedWithWrappedCancellationException(g);
1561 <
1562 <        f = new CompletableFuture<>();
1563 <        assertTrue(f.cancel(true));
1564 <        g = f.thenCompose(r = new CompletableFutureInc());
1565 <        checkCompletedWithWrappedCancellationException(g);
1566 <    }
1405 >    public void testThenRun_actionFailed() {
1406 >        for (ExecutionMode m : ExecutionMode.values())
1407 >        for (Integer v1 : new Integer[] { 1, null })
1408 >    {
1409 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1410 >        final FailingRunnable[] rs = new FailingRunnable[6];
1411 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1412  
1413 <    // asyncs
1413 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1414 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1415 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1416 >        assertTrue(f.complete(v1));
1417 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1418 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1419 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1420 >
1421 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1422 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1423 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1424 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1425 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1426 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1427 >        checkCompletedNormally(f, v1);
1428 >    }}
1429  
1430      /**
1431 <     * thenRunAsync result completes normally after normal completion of source
1431 >     * thenApply result completes normally after normal completion of source
1432       */
1433 <    public void testThenRunAsync() {
1434 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1435 <        Noop r = new Noop();
1436 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1437 <        f.complete(null);
1438 <        checkCompletedNormally(g, null);
1433 >    public void testThenApply_normalCompletion() {
1434 >        for (ExecutionMode m : ExecutionMode.values())
1435 >        for (Integer v1 : new Integer[] { 1, null })
1436 >    {
1437 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1438 >        final IncFunction[] rs = new IncFunction[4];
1439 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1440  
1441 <        // reordered version
1442 <        f = new CompletableFuture<>();
1443 <        f.complete(null);
1444 <        r = new Noop();
1445 <        g = f.thenRunAsync(r);
1446 <        checkCompletedNormally(g, null);
1447 <    }
1441 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1442 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1443 >        checkIncomplete(h0);
1444 >        checkIncomplete(h1);
1445 >        assertTrue(f.complete(v1));
1446 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1447 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1448 >
1449 >        checkCompletedNormally(h0, inc(v1));
1450 >        checkCompletedNormally(h1, inc(v1));
1451 >        checkCompletedNormally(h2, inc(v1));
1452 >        checkCompletedNormally(h3, inc(v1));
1453 >        checkCompletedNormally(f, v1);
1454 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1455 >    }}
1456  
1457      /**
1458 <     * thenRunAsync result completes exceptionally after exceptional
1458 >     * thenApply result completes exceptionally after exceptional
1459       * completion of source
1460       */
1461 <    public void testThenRunAsync2() {
1462 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1463 <        Noop r = new Noop();
1464 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1465 <        f.completeExceptionally(new CFException());
1466 <        try {
1467 <            g.join();
1599 <            shouldThrow();
1600 <        } catch (CompletionException success) {}
1601 <        checkCompletedWithWrappedCFException(g);
1602 <    }
1603 <
1604 <    /**
1605 <     * thenRunAsync result completes exceptionally if action does
1606 <     */
1607 <    public void testThenRunAsync3() {
1608 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1609 <        FailingNoop r = new FailingNoop();
1610 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1611 <        f.complete(null);
1612 <        checkCompletedWithWrappedCFException(g);
1613 <    }
1614 <
1615 <    /**
1616 <     * thenRunAsync result completes exceptionally if source cancelled
1617 <     */
1618 <    public void testThenRunAsync4() {
1619 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1620 <        Noop r = new Noop();
1621 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1622 <        assertTrue(f.cancel(true));
1623 <        checkCompletedWithWrappedCancellationException(g);
1624 <    }
1461 >    public void testThenApply_exceptionalCompletion() {
1462 >        for (ExecutionMode m : ExecutionMode.values())
1463 >    {
1464 >        final CFException ex = new CFException();
1465 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1466 >        final IncFunction[] rs = new IncFunction[4];
1467 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1468  
1469 <    /**
1470 <     * thenApplyAsync result completes normally after normal completion of source
1471 <     */
1472 <    public void testThenApplyAsync() {
1473 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1474 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1475 <        f.complete(one);
1476 <        checkCompletedNormally(g, two);
1477 <    }
1469 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1470 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1471 >        assertTrue(f.completeExceptionally(ex));
1472 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1473 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1474 >
1475 >        checkCompletedWithWrappedException(h0, ex);
1476 >        checkCompletedWithWrappedException(h1, ex);
1477 >        checkCompletedWithWrappedException(h2, ex);
1478 >        checkCompletedWithWrappedException(h3, ex);
1479 >        checkCompletedExceptionally(f, ex);
1480 >        for (IncFunction r : rs) r.assertNotInvoked();
1481 >    }}
1482  
1483      /**
1484 <     * thenApplyAsync result completes exceptionally after exceptional
1638 <     * completion of source
1484 >     * thenApply result completes exceptionally if source cancelled
1485       */
1486 <    public void testThenApplyAsync2() {
1487 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1488 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1489 <        f.completeExceptionally(new CFException());
1490 <        checkCompletedWithWrappedCFException(g);
1491 <    }
1486 >    public void testThenApply_sourceCancelled() {
1487 >        for (ExecutionMode m : ExecutionMode.values())
1488 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1489 >    {
1490 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1491 >        final IncFunction[] rs = new IncFunction[4];
1492 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1493  
1494 <    /**
1495 <     * thenApplyAsync result completes exceptionally if action does
1496 <     */
1497 <    public void testThenApplyAsync3() {
1498 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1652 <        FailingFunction r = new FailingFunction();
1653 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1654 <        f.complete(null);
1655 <        checkCompletedWithWrappedCFException(g);
1656 <    }
1494 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1495 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1496 >        assertTrue(f.cancel(mayInterruptIfRunning));
1497 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1498 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1499  
1500 <    /**
1501 <     * thenApplyAsync result completes exceptionally if source cancelled
1502 <     */
1503 <    public void testThenApplyAsync4() {
1504 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1505 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1506 <        assertTrue(f.cancel(true));
1665 <        checkCompletedWithWrappedCancellationException(g);
1666 <    }
1500 >        checkCompletedWithWrappedCancellationException(h0);
1501 >        checkCompletedWithWrappedCancellationException(h1);
1502 >        checkCompletedWithWrappedCancellationException(h2);
1503 >        checkCompletedWithWrappedCancellationException(h3);
1504 >        checkCancelled(f);
1505 >        for (IncFunction r : rs) r.assertNotInvoked();
1506 >    }}
1507  
1508      /**
1509 <     * thenAcceptAsync result completes normally after normal
1670 <     * completion of source
1509 >     * thenApply result completes exceptionally if action does
1510       */
1511 <    public void testThenAcceptAsync() {
1512 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1513 <        IncAction r = new IncAction();
1514 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1515 <        f.complete(one);
1516 <        checkCompletedNormally(g, null);
1517 <        assertEquals(r.value, 2);
1679 <    }
1511 >    public void testThenApply_actionFailed() {
1512 >        for (ExecutionMode m : ExecutionMode.values())
1513 >        for (Integer v1 : new Integer[] { 1, null })
1514 >    {
1515 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1516 >        final FailingFunction[] rs = new FailingFunction[4];
1517 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1518  
1519 <    /**
1520 <     * thenAcceptAsync result completes exceptionally after exceptional
1521 <     * completion of source
1522 <     */
1523 <    public void testThenAcceptAsync2() {
1524 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1525 <        IncAction r = new IncAction();
1526 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1527 <        f.completeExceptionally(new CFException());
1528 <        checkCompletedWithWrappedCFException(g);
1529 <    }
1519 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1520 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1521 >        assertTrue(f.complete(v1));
1522 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1523 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1524 >
1525 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1526 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1527 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1528 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1529 >        checkCompletedNormally(f, v1);
1530 >    }}
1531  
1532      /**
1533 <     * thenAcceptAsync result completes exceptionally if action does
1533 >     * thenAccept result completes normally after normal completion of source
1534       */
1535 <    public void testThenAcceptAsync3() {
1536 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1537 <        FailingConsumer r = new FailingConsumer();
1538 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1539 <        f.complete(null);
1540 <        checkCompletedWithWrappedCFException(g);
1541 <    }
1535 >    public void testThenAccept_normalCompletion() {
1536 >        for (ExecutionMode m : ExecutionMode.values())
1537 >        for (Integer v1 : new Integer[] { 1, null })
1538 >    {
1539 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1540 >        final NoopConsumer[] rs = new NoopConsumer[4];
1541 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1542  
1543 <    /**
1544 <     * thenAcceptAsync result completes exceptionally if source cancelled
1545 <     */
1546 <    public void testThenAcceptAsync4() {
1547 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1548 <        IncAction r = new IncAction();
1549 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1550 <        assertTrue(f.cancel(true));
1551 <        checkCompletedWithWrappedCancellationException(g);
1552 <    }
1543 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1544 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1545 >        checkIncomplete(h0);
1546 >        checkIncomplete(h1);
1547 >        assertTrue(f.complete(v1));
1548 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1549 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1550 >
1551 >        checkCompletedNormally(h0, null);
1552 >        checkCompletedNormally(h1, null);
1553 >        checkCompletedNormally(h2, null);
1554 >        checkCompletedNormally(h3, null);
1555 >        checkCompletedNormally(f, v1);
1556 >        for (NoopConsumer r : rs) r.assertValue(v1);
1557 >    }}
1558  
1559      /**
1560 <     * thenCombineAsync result completes normally after normal
1561 <     * completion of sources
1560 >     * thenAccept result completes exceptionally after exceptional
1561 >     * completion of source
1562       */
1563 <    public void testThenCombineAsync() {
1564 <        CompletableFuture<Integer> f, g, h;
1565 <
1566 <        f = new CompletableFuture<>();
1567 <        g = new CompletableFuture<>();
1568 <        h = f.thenCombineAsync(g, subtract);
1569 <        f.complete(3);
1726 <        checkIncomplete(h);
1727 <        g.complete(1);
1728 <        checkCompletedNormally(h, 2);
1729 <
1730 <        f = new CompletableFuture<>();
1731 <        g = new CompletableFuture<>();
1732 <        h = f.thenCombineAsync(g, subtract);
1733 <        g.complete(1);
1734 <        checkIncomplete(h);
1735 <        f.complete(3);
1736 <        checkCompletedNormally(h, 2);
1563 >    public void testThenAccept_exceptionalCompletion() {
1564 >        for (ExecutionMode m : ExecutionMode.values())
1565 >    {
1566 >        final CFException ex = new CFException();
1567 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1568 >        final NoopConsumer[] rs = new NoopConsumer[4];
1569 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1570  
1571 <        f = new CompletableFuture<>();
1572 <        g = new CompletableFuture<>();
1573 <        g.complete(1);
1574 <        f.complete(3);
1575 <        h = f.thenCombineAsync(g, subtract);
1576 <        checkCompletedNormally(h, 2);
1577 <    }
1571 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1572 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1573 >        assertTrue(f.completeExceptionally(ex));
1574 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1575 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1576 >
1577 >        checkCompletedWithWrappedException(h0, ex);
1578 >        checkCompletedWithWrappedException(h1, ex);
1579 >        checkCompletedWithWrappedException(h2, ex);
1580 >        checkCompletedWithWrappedException(h3, ex);
1581 >        checkCompletedExceptionally(f, ex);
1582 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1583 >    }}
1584  
1585      /**
1586 <     * thenCombineAsync result completes exceptionally after exceptional
1748 <     * completion of either source
1586 >     * thenAccept result completes exceptionally if source cancelled
1587       */
1588 <    public void testThenCombineAsync2() {
1589 <        CompletableFuture<Integer> f, g, h;
1590 <
1591 <        f = new CompletableFuture<>();
1592 <        g = new CompletableFuture<>();
1593 <        h = f.thenCombineAsync(g, subtract);
1594 <        f.completeExceptionally(new CFException());
1757 <        checkIncomplete(h);
1758 <        g.complete(1);
1759 <        checkCompletedWithWrappedCFException(h);
1760 <
1761 <        f = new CompletableFuture<>();
1762 <        g = new CompletableFuture<>();
1763 <        h = f.thenCombineAsync(g, subtract);
1764 <        g.completeExceptionally(new CFException());
1765 <        checkIncomplete(h);
1766 <        f.complete(3);
1767 <        checkCompletedWithWrappedCFException(h);
1588 >    public void testThenAccept_sourceCancelled() {
1589 >        for (ExecutionMode m : ExecutionMode.values())
1590 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1591 >    {
1592 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1593 >        final NoopConsumer[] rs = new NoopConsumer[4];
1594 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1595  
1596 <        f = new CompletableFuture<>();
1597 <        g = new CompletableFuture<>();
1598 <        g.completeExceptionally(new CFException());
1599 <        f.complete(3);
1600 <        h = f.thenCombineAsync(g, subtract);
1774 <        checkCompletedWithWrappedCFException(h);
1775 <    }
1596 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1597 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1598 >        assertTrue(f.cancel(mayInterruptIfRunning));
1599 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1600 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1601  
1602 <    /**
1603 <     * thenCombineAsync result completes exceptionally if action does
1604 <     */
1605 <    public void testThenCombineAsync3() {
1606 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1607 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1608 <        FailingBiFunction r = new FailingBiFunction();
1784 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1785 <        f.complete(one);
1786 <        checkIncomplete(g);
1787 <        assertFalse(r.ran);
1788 <        f2.complete(two);
1789 <        checkCompletedWithWrappedCFException(g);
1790 <        assertTrue(r.ran);
1791 <    }
1602 >        checkCompletedWithWrappedCancellationException(h0);
1603 >        checkCompletedWithWrappedCancellationException(h1);
1604 >        checkCompletedWithWrappedCancellationException(h2);
1605 >        checkCompletedWithWrappedCancellationException(h3);
1606 >        checkCancelled(f);
1607 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1608 >    }}
1609  
1610      /**
1611 <     * thenCombineAsync result completes exceptionally if either source cancelled
1611 >     * thenAccept result completes exceptionally if action does
1612       */
1613 <    public void testThenCombineAsync4() {
1614 <        CompletableFuture<Integer> f, g, h;
1615 <
1616 <        f = new CompletableFuture<>();
1617 <        g = new CompletableFuture<>();
1618 <        h = f.thenCombineAsync(g, subtract);
1619 <        assertTrue(f.cancel(true));
1803 <        checkIncomplete(h);
1804 <        g.complete(1);
1805 <        checkCompletedWithWrappedCancellationException(h);
1806 <
1807 <        f = new CompletableFuture<>();
1808 <        g = new CompletableFuture<>();
1809 <        h = f.thenCombineAsync(g, subtract);
1810 <        assertTrue(g.cancel(true));
1811 <        checkIncomplete(h);
1812 <        f.complete(3);
1813 <        checkCompletedWithWrappedCancellationException(h);
1814 <
1815 <        f = new CompletableFuture<>();
1816 <        g = new CompletableFuture<>();
1817 <        g.complete(3);
1818 <        assertTrue(f.cancel(true));
1819 <        h = f.thenCombineAsync(g, subtract);
1820 <        checkCompletedWithWrappedCancellationException(h);
1613 >    public void testThenAccept_actionFailed() {
1614 >        for (ExecutionMode m : ExecutionMode.values())
1615 >        for (Integer v1 : new Integer[] { 1, null })
1616 >    {
1617 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1618 >        final FailingConsumer[] rs = new FailingConsumer[4];
1619 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1620  
1621 <        f = new CompletableFuture<>();
1622 <        g = new CompletableFuture<>();
1623 <        f.complete(3);
1624 <        assertTrue(g.cancel(true));
1625 <        h = f.thenCombineAsync(g, subtract);
1626 <        checkCompletedWithWrappedCancellationException(h);
1627 <    }
1621 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1622 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1623 >        assertTrue(f.complete(v1));
1624 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1625 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1626 >
1627 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1628 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1629 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1630 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1631 >        checkCompletedNormally(f, v1);
1632 >    }}
1633  
1634      /**
1635 <     * thenAcceptBothAsync result completes normally after normal
1636 <     * completion of sources
1635 >     * thenCombine result completes normally after normal completion
1636 >     * of sources
1637       */
1638 <    public void testThenAcceptBothAsync() {
1639 <        CompletableFuture<Integer> f, g;
1640 <        CompletableFuture<Void> h;
1641 <        SubtractAction r;
1642 <
1643 <        f = new CompletableFuture<>();
1644 <        g = new CompletableFuture<>();
1645 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1646 <        f.complete(3);
1647 <        checkIncomplete(h);
1844 <        g.complete(1);
1845 <        checkCompletedNormally(h, null);
1846 <        assertEquals(r.value, 2);
1638 >    public void testThenCombine_normalCompletion() {
1639 >        for (ExecutionMode m : ExecutionMode.values())
1640 >        for (boolean fFirst : new boolean[] { true, false })
1641 >        for (Integer v1 : new Integer[] { 1, null })
1642 >        for (Integer v2 : new Integer[] { 2, null })
1643 >    {
1644 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1645 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1646 >        final SubtractFunction[] rs = new SubtractFunction[6];
1647 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1648  
1649 <        f = new CompletableFuture<>();
1650 <        g = new CompletableFuture<>();
1651 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1652 <        g.complete(1);
1653 <        checkIncomplete(h);
1654 <        f.complete(3);
1655 <        checkCompletedNormally(h, null);
1656 <        assertEquals(r.value, 2);
1649 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1650 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1651 >        final Integer w1 =  fFirst ? v1 : v2;
1652 >        final Integer w2 = !fFirst ? v1 : v2;
1653 >
1654 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1655 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1656 >        assertTrue(fst.complete(w1));
1657 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1658 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1659 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1660 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1661 >        checkCompletedNormally(h1, subtract(w1, w1));
1662 >        checkCompletedNormally(h3, subtract(w1, w1));
1663 >        rs[1].assertValue(subtract(w1, w1));
1664 >        rs[3].assertValue(subtract(w1, w1));
1665 >        assertTrue(snd.complete(w2));
1666 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1667 >
1668 >        checkCompletedNormally(h0, subtract(v1, v2));
1669 >        checkCompletedNormally(h2, subtract(v1, v2));
1670 >        checkCompletedNormally(h4, subtract(v1, v2));
1671 >        rs[0].assertValue(subtract(v1, v2));
1672 >        rs[2].assertValue(subtract(v1, v2));
1673 >        rs[4].assertValue(subtract(v1, v2));
1674  
1675 <        f = new CompletableFuture<>();
1676 <        g = new CompletableFuture<>();
1677 <        g.complete(1);
1860 <        f.complete(3);
1861 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1862 <        checkCompletedNormally(h, null);
1863 <        assertEquals(r.value, 2);
1864 <    }
1675 >        checkCompletedNormally(f, v1);
1676 >        checkCompletedNormally(g, v2);
1677 >    }}
1678  
1679      /**
1680 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1681 <     * completion of source
1680 >     * thenCombine result completes exceptionally after exceptional
1681 >     * completion of either source
1682       */
1683 <    public void testThenAcceptBothAsync2() {
1684 <        CompletableFuture<Integer> f, g;
1685 <        CompletableFuture<Void> h;
1686 <        SubtractAction r;
1687 <
1688 <        f = new CompletableFuture<>();
1689 <        g = new CompletableFuture<>();
1690 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1691 <        f.completeExceptionally(new CFException());
1692 <        checkIncomplete(h);
1693 <        g.complete(1);
1694 <        checkCompletedWithWrappedCFException(h);
1695 <
1696 <        f = new CompletableFuture<>();
1697 <        g = new CompletableFuture<>();
1698 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1699 <        g.completeExceptionally(new CFException());
1700 <        checkIncomplete(h);
1701 <        f.complete(3);
1702 <        checkCompletedWithWrappedCFException(h);
1703 <
1704 <        f = new CompletableFuture<>();
1705 <        g = new CompletableFuture<>();
1706 <        f.complete(3);
1707 <        g.completeExceptionally(new CFException());
1708 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1709 <        checkCompletedWithWrappedCFException(h);
1710 <
1711 <        f = new CompletableFuture<>();
1712 <        g = new CompletableFuture<>();
1713 <        f.completeExceptionally(new CFException());
1714 <        g.complete(3);
1715 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1716 <        checkCompletedWithWrappedCFException(h);
1717 <    }
1683 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1684 >        for (ExecutionMode m : ExecutionMode.values())
1685 >        for (boolean fFirst : new boolean[] { true, false })
1686 >        for (boolean failFirst : new boolean[] { true, false })
1687 >        for (Integer v1 : new Integer[] { 1, null })
1688 >    {
1689 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1690 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1691 >        final CFException ex = new CFException();
1692 >        final SubtractFunction r1 = new SubtractFunction(m);
1693 >        final SubtractFunction r2 = new SubtractFunction(m);
1694 >        final SubtractFunction r3 = new SubtractFunction(m);
1695 >
1696 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1697 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1698 >        final Callable<Boolean> complete1 = failFirst ?
1699 >            () -> fst.completeExceptionally(ex) :
1700 >            () -> fst.complete(v1);
1701 >        final Callable<Boolean> complete2 = failFirst ?
1702 >            () -> snd.complete(v1) :
1703 >            () -> snd.completeExceptionally(ex);
1704 >
1705 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1706 >        assertTrue(complete1.call());
1707 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1708 >        checkIncomplete(h1);
1709 >        checkIncomplete(h2);
1710 >        assertTrue(complete2.call());
1711 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1712 >
1713 >        checkCompletedWithWrappedException(h1, ex);
1714 >        checkCompletedWithWrappedException(h2, ex);
1715 >        checkCompletedWithWrappedException(h3, ex);
1716 >        r1.assertNotInvoked();
1717 >        r2.assertNotInvoked();
1718 >        r3.assertNotInvoked();
1719 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1720 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1721 >    }}
1722  
1723      /**
1724 <     * thenAcceptBothAsync result completes exceptionally if action does
1724 >     * thenCombine result completes exceptionally if either source cancelled
1725       */
1726 <    public void testThenAcceptBothAsync3() {
1727 <        CompletableFuture<Integer> f, g;
1728 <        CompletableFuture<Void> h;
1729 <        FailingBiConsumer r;
1730 <
1731 <        f = new CompletableFuture<>();
1732 <        g = new CompletableFuture<>();
1733 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1734 <        f.complete(3);
1735 <        checkIncomplete(h);
1736 <        g.complete(1);
1737 <        checkCompletedWithWrappedCFException(h);
1738 <
1739 <        f = new CompletableFuture<>();
1740 <        g = new CompletableFuture<>();
1741 <        f.complete(3);
1742 <        g.complete(1);
1743 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1744 <        checkCompletedWithWrappedCFException(h);
1745 <    }
1726 >    public void testThenCombine_sourceCancelled() throws Throwable {
1727 >        for (ExecutionMode m : ExecutionMode.values())
1728 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1729 >        for (boolean fFirst : new boolean[] { true, false })
1730 >        for (boolean failFirst : new boolean[] { true, false })
1731 >        for (Integer v1 : new Integer[] { 1, null })
1732 >    {
1733 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1734 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1735 >        final SubtractFunction r1 = new SubtractFunction(m);
1736 >        final SubtractFunction r2 = new SubtractFunction(m);
1737 >        final SubtractFunction r3 = new SubtractFunction(m);
1738 >
1739 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1740 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1741 >        final Callable<Boolean> complete1 = failFirst ?
1742 >            () -> fst.cancel(mayInterruptIfRunning) :
1743 >            () -> fst.complete(v1);
1744 >        final Callable<Boolean> complete2 = failFirst ?
1745 >            () -> snd.complete(v1) :
1746 >            () -> snd.cancel(mayInterruptIfRunning);
1747 >
1748 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1749 >        assertTrue(complete1.call());
1750 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1751 >        checkIncomplete(h1);
1752 >        checkIncomplete(h2);
1753 >        assertTrue(complete2.call());
1754 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1755 >
1756 >        checkCompletedWithWrappedCancellationException(h1);
1757 >        checkCompletedWithWrappedCancellationException(h2);
1758 >        checkCompletedWithWrappedCancellationException(h3);
1759 >        r1.assertNotInvoked();
1760 >        r2.assertNotInvoked();
1761 >        r3.assertNotInvoked();
1762 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1763 >        checkCancelled(failFirst ? fst : snd);
1764 >    }}
1765  
1766      /**
1767 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1767 >     * thenCombine result completes exceptionally if action does
1768       */
1769 <    public void testThenAcceptBothAsync4() {
1770 <        CompletableFuture<Integer> f, g;
1771 <        CompletableFuture<Void> h;
1772 <        SubtractAction r;
1773 <
1774 <        f = new CompletableFuture<>();
1775 <        g = new CompletableFuture<>();
1776 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1777 <        assertTrue(f.cancel(true));
1778 <        checkIncomplete(h);
1779 <        g.complete(1);
1780 <        checkCompletedWithWrappedCancellationException(h);
1781 <
1782 <        f = new CompletableFuture<>();
1783 <        g = new CompletableFuture<>();
1784 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1785 <        assertTrue(g.cancel(true));
1786 <        checkIncomplete(h);
1787 <        f.complete(3);
1788 <        checkCompletedWithWrappedCancellationException(h);
1789 <
1790 <        f = new CompletableFuture<>();
1791 <        g = new CompletableFuture<>();
1792 <        f.complete(3);
1793 <        assertTrue(g.cancel(true));
1794 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1795 <        checkCompletedWithWrappedCancellationException(h);
1796 <
1797 <        f = new CompletableFuture<>();
1798 <        g = new CompletableFuture<>();
1799 <        assertTrue(f.cancel(true));
1800 <        g.complete(3);
1965 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1966 <        checkCompletedWithWrappedCancellationException(h);
1967 <    }
1769 >    public void testThenCombine_actionFailed() {
1770 >        for (ExecutionMode m : ExecutionMode.values())
1771 >        for (boolean fFirst : new boolean[] { true, false })
1772 >        for (Integer v1 : new Integer[] { 1, null })
1773 >        for (Integer v2 : new Integer[] { 2, null })
1774 >    {
1775 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1776 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1777 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1778 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1779 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1780 >
1781 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1782 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1783 >        final Integer w1 =  fFirst ? v1 : v2;
1784 >        final Integer w2 = !fFirst ? v1 : v2;
1785 >
1786 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1787 >        assertTrue(fst.complete(w1));
1788 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1789 >        assertTrue(snd.complete(w2));
1790 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1791 >
1792 >        checkCompletedWithWrappedException(h1, r1.ex);
1793 >        checkCompletedWithWrappedException(h2, r2.ex);
1794 >        checkCompletedWithWrappedException(h3, r3.ex);
1795 >        r1.assertInvoked();
1796 >        r2.assertInvoked();
1797 >        r3.assertInvoked();
1798 >        checkCompletedNormally(f, v1);
1799 >        checkCompletedNormally(g, v2);
1800 >    }}
1801  
1802      /**
1803 <     * applyToEitherAsync result completes normally after normal
1803 >     * thenAcceptBoth result completes normally after normal
1804       * completion of sources
1805       */
1806 <    public void testApplyToEitherAsync() {
1807 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1808 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1809 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1810 <        f.complete(one);
1811 <        checkCompletedNormally(g, two);
1812 <
1813 <        f = new CompletableFuture<>();
1814 <        f.complete(one);
1815 <        f2 = new CompletableFuture<>();
1816 <        g = f.applyToEitherAsync(f2, inc);
1817 <        checkCompletedNormally(g, two);
1818 <    }
1806 >    public void testThenAcceptBoth_normalCompletion() {
1807 >        for (ExecutionMode m : ExecutionMode.values())
1808 >        for (boolean fFirst : new boolean[] { true, false })
1809 >        for (Integer v1 : new Integer[] { 1, null })
1810 >        for (Integer v2 : new Integer[] { 2, null })
1811 >    {
1812 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1813 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1814 >        final SubtractAction r1 = new SubtractAction(m);
1815 >        final SubtractAction r2 = new SubtractAction(m);
1816 >        final SubtractAction r3 = new SubtractAction(m);
1817 >
1818 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1819 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1820 >        final Integer w1 =  fFirst ? v1 : v2;
1821 >        final Integer w2 = !fFirst ? v1 : v2;
1822 >
1823 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1824 >        assertTrue(fst.complete(w1));
1825 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1826 >        checkIncomplete(h1);
1827 >        checkIncomplete(h2);
1828 >        r1.assertNotInvoked();
1829 >        r2.assertNotInvoked();
1830 >        assertTrue(snd.complete(w2));
1831 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1832 >
1833 >        checkCompletedNormally(h1, null);
1834 >        checkCompletedNormally(h2, null);
1835 >        checkCompletedNormally(h3, null);
1836 >        r1.assertValue(subtract(v1, v2));
1837 >        r2.assertValue(subtract(v1, v2));
1838 >        r3.assertValue(subtract(v1, v2));
1839 >        checkCompletedNormally(f, v1);
1840 >        checkCompletedNormally(g, v2);
1841 >    }}
1842  
1843      /**
1844 <     * applyToEitherAsync result completes exceptionally after exceptional
1845 <     * completion of source
1844 >     * thenAcceptBoth result completes exceptionally after exceptional
1845 >     * completion of either source
1846       */
1847 <    public void testApplyToEitherAsync2() {
1848 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1849 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1850 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1851 <        f.completeExceptionally(new CFException());
1852 <        checkCompletedWithWrappedCFException(g);
1853 <
1854 <        f = new CompletableFuture<>();
1855 <        f2 = new CompletableFuture<>();
1856 <        f2.completeExceptionally(new CFException());
1857 <        g = f.applyToEitherAsync(f2, inc);
1858 <        f.complete(one);
1859 <        checkCompletedWithWrappedCFException(g);
1860 <    }
1847 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1848 >        for (ExecutionMode m : ExecutionMode.values())
1849 >        for (boolean fFirst : new boolean[] { true, false })
1850 >        for (boolean failFirst : new boolean[] { true, false })
1851 >        for (Integer v1 : new Integer[] { 1, null })
1852 >    {
1853 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1854 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1855 >        final CFException ex = new CFException();
1856 >        final SubtractAction r1 = new SubtractAction(m);
1857 >        final SubtractAction r2 = new SubtractAction(m);
1858 >        final SubtractAction r3 = new SubtractAction(m);
1859 >
1860 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1861 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1862 >        final Callable<Boolean> complete1 = failFirst ?
1863 >            () -> fst.completeExceptionally(ex) :
1864 >            () -> fst.complete(v1);
1865 >        final Callable<Boolean> complete2 = failFirst ?
1866 >            () -> snd.complete(v1) :
1867 >            () -> snd.completeExceptionally(ex);
1868 >
1869 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1870 >        assertTrue(complete1.call());
1871 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1872 >        checkIncomplete(h1);
1873 >        checkIncomplete(h2);
1874 >        assertTrue(complete2.call());
1875 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1876 >
1877 >        checkCompletedWithWrappedException(h1, ex);
1878 >        checkCompletedWithWrappedException(h2, ex);
1879 >        checkCompletedWithWrappedException(h3, ex);
1880 >        r1.assertNotInvoked();
1881 >        r2.assertNotInvoked();
1882 >        r3.assertNotInvoked();
1883 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1884 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1885 >    }}
1886  
1887      /**
1888 <     * applyToEitherAsync result completes exceptionally if action does
1888 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1889       */
1890 <    public void testApplyToEitherAsync3() {
1891 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1892 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1893 <        FailingFunction r = new FailingFunction();
1894 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1895 <        f.complete(one);
1896 <        checkCompletedWithWrappedCFException(g);
1897 <    }
1890 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1891 >        for (ExecutionMode m : ExecutionMode.values())
1892 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1893 >        for (boolean fFirst : new boolean[] { true, false })
1894 >        for (boolean failFirst : new boolean[] { true, false })
1895 >        for (Integer v1 : new Integer[] { 1, null })
1896 >    {
1897 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1898 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1899 >        final SubtractAction r1 = new SubtractAction(m);
1900 >        final SubtractAction r2 = new SubtractAction(m);
1901 >        final SubtractAction r3 = new SubtractAction(m);
1902 >
1903 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1904 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1905 >        final Callable<Boolean> complete1 = failFirst ?
1906 >            () -> fst.cancel(mayInterruptIfRunning) :
1907 >            () -> fst.complete(v1);
1908 >        final Callable<Boolean> complete2 = failFirst ?
1909 >            () -> snd.complete(v1) :
1910 >            () -> snd.cancel(mayInterruptIfRunning);
1911 >
1912 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1913 >        assertTrue(complete1.call());
1914 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1915 >        checkIncomplete(h1);
1916 >        checkIncomplete(h2);
1917 >        assertTrue(complete2.call());
1918 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1919 >
1920 >        checkCompletedWithWrappedCancellationException(h1);
1921 >        checkCompletedWithWrappedCancellationException(h2);
1922 >        checkCompletedWithWrappedCancellationException(h3);
1923 >        r1.assertNotInvoked();
1924 >        r2.assertNotInvoked();
1925 >        r3.assertNotInvoked();
1926 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1927 >        checkCancelled(failFirst ? fst : snd);
1928 >    }}
1929  
1930      /**
1931 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1931 >     * thenAcceptBoth result completes exceptionally if action does
1932       */
1933 <    public void testApplyToEitherAsync4() {
1934 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1935 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1936 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1937 <        assertTrue(f.cancel(true));
1938 <        checkCompletedWithWrappedCancellationException(g);
1939 <
1940 <        f = new CompletableFuture<>();
1941 <        f2 = new CompletableFuture<>();
1942 <        assertTrue(f2.cancel(true));
1943 <        g = f.applyToEitherAsync(f2, inc);
1944 <        checkCompletedWithWrappedCancellationException(g);
1945 <    }
1933 >    public void testThenAcceptBoth_actionFailed() {
1934 >        for (ExecutionMode m : ExecutionMode.values())
1935 >        for (boolean fFirst : new boolean[] { true, false })
1936 >        for (Integer v1 : new Integer[] { 1, null })
1937 >        for (Integer v2 : new Integer[] { 2, null })
1938 >    {
1939 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1940 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1941 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1942 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1943 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1944 >
1945 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1946 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1947 >        final Integer w1 =  fFirst ? v1 : v2;
1948 >        final Integer w2 = !fFirst ? v1 : v2;
1949 >
1950 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1951 >        assertTrue(fst.complete(w1));
1952 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1953 >        assertTrue(snd.complete(w2));
1954 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1955 >
1956 >        checkCompletedWithWrappedException(h1, r1.ex);
1957 >        checkCompletedWithWrappedException(h2, r2.ex);
1958 >        checkCompletedWithWrappedException(h3, r3.ex);
1959 >        r1.assertInvoked();
1960 >        r2.assertInvoked();
1961 >        r3.assertInvoked();
1962 >        checkCompletedNormally(f, v1);
1963 >        checkCompletedNormally(g, v2);
1964 >    }}
1965  
1966      /**
1967 <     * acceptEitherAsync result completes normally after normal
1967 >     * runAfterBoth result completes normally after normal
1968       * completion of sources
1969       */
1970 <    public void testAcceptEitherAsync() {
1971 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1972 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1973 <        IncAction r = new IncAction();
1974 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1975 <        f.complete(one);
1976 <        checkCompletedNormally(g, null);
1977 <        assertEquals(r.value, 2);
1978 <
1979 <        r = new IncAction();
1980 <        f = new CompletableFuture<>();
1981 <        f.complete(one);
1982 <        f2 = new CompletableFuture<>();
1983 <        g = f.acceptEitherAsync(f2, r);
1984 <        checkCompletedNormally(g, null);
1985 <        assertEquals(r.value, 2);
1986 <    }
1987 <
1988 <    /**
1989 <     * acceptEitherAsync result completes exceptionally after exceptional
1990 <     * completion of source
1991 <     */
1992 <    public void testAcceptEitherAsync2() {
1993 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1994 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1995 <        IncAction r = new IncAction();
1996 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1997 <        f.completeExceptionally(new CFException());
1998 <        checkCompletedWithWrappedCFException(g);
1999 <
2000 <        r = new IncAction();
2001 <        f = new CompletableFuture<>();
2002 <        f2 = new CompletableFuture<>();
2003 <        f2.completeExceptionally(new CFException());
2004 <        g = f.acceptEitherAsync(f2, r);
2005 <        f.complete(one);
2075 <        checkCompletedWithWrappedCFException(g);
2076 <    }
2077 <
2078 <    /**
2079 <     * acceptEitherAsync result completes exceptionally if action does
2080 <     */
2081 <    public void testAcceptEitherAsync3() {
2082 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2083 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2084 <        FailingConsumer r = new FailingConsumer();
2085 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2086 <        f.complete(one);
2087 <        checkCompletedWithWrappedCFException(g);
2088 <    }
2089 <
2090 <    /**
2091 <     * acceptEitherAsync result completes exceptionally if either
2092 <     * source cancelled
2093 <     */
2094 <    public void testAcceptEitherAsync4() {
2095 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2096 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2097 <        IncAction r = new IncAction();
2098 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2099 <        assertTrue(f.cancel(true));
2100 <        checkCompletedWithWrappedCancellationException(g);
2101 <
2102 <        r = new IncAction();
2103 <        f = new CompletableFuture<>();
2104 <        f2 = new CompletableFuture<>();
2105 <        assertTrue(f2.cancel(true));
2106 <        g = f.acceptEitherAsync(f2, r);
2107 <        checkCompletedWithWrappedCancellationException(g);
2108 <    }
1970 >    public void testRunAfterBoth_normalCompletion() {
1971 >        for (ExecutionMode m : ExecutionMode.values())
1972 >        for (boolean fFirst : new boolean[] { true, false })
1973 >        for (Integer v1 : new Integer[] { 1, null })
1974 >        for (Integer v2 : new Integer[] { 2, null })
1975 >    {
1976 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1977 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1978 >        final Noop r1 = new Noop(m);
1979 >        final Noop r2 = new Noop(m);
1980 >        final Noop r3 = new Noop(m);
1981 >
1982 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1983 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1984 >        final Integer w1 =  fFirst ? v1 : v2;
1985 >        final Integer w2 = !fFirst ? v1 : v2;
1986 >
1987 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1988 >        assertTrue(fst.complete(w1));
1989 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1990 >        checkIncomplete(h1);
1991 >        checkIncomplete(h2);
1992 >        r1.assertNotInvoked();
1993 >        r2.assertNotInvoked();
1994 >        assertTrue(snd.complete(w2));
1995 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1996 >
1997 >        checkCompletedNormally(h1, null);
1998 >        checkCompletedNormally(h2, null);
1999 >        checkCompletedNormally(h3, null);
2000 >        r1.assertInvoked();
2001 >        r2.assertInvoked();
2002 >        r3.assertInvoked();
2003 >        checkCompletedNormally(f, v1);
2004 >        checkCompletedNormally(g, v2);
2005 >    }}
2006  
2007      /**
2008 <     * runAfterEitherAsync result completes normally after normal
2009 <     * completion of sources
2008 >     * runAfterBoth result completes exceptionally after exceptional
2009 >     * completion of either source
2010       */
2011 <    public void testRunAfterEitherAsync() {
2012 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2013 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2014 <        Noop r = new Noop();
2015 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2016 <        f.complete(one);
2017 <        checkCompletedNormally(g, null);
2018 <        assertTrue(r.ran);
2019 <
2020 <        r = new Noop();
2021 <        f = new CompletableFuture<>();
2022 <        f.complete(one);
2023 <        f2 = new CompletableFuture<>();
2024 <        g = f.runAfterEitherAsync(f2, r);
2025 <        checkCompletedNormally(g, null);
2026 <        assertTrue(r.ran);
2027 <    }
2011 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2012 >        for (ExecutionMode m : ExecutionMode.values())
2013 >        for (boolean fFirst : new boolean[] { true, false })
2014 >        for (boolean failFirst : new boolean[] { true, false })
2015 >        for (Integer v1 : new Integer[] { 1, null })
2016 >    {
2017 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2018 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2019 >        final CFException ex = new CFException();
2020 >        final Noop r1 = new Noop(m);
2021 >        final Noop r2 = new Noop(m);
2022 >        final Noop r3 = new Noop(m);
2023 >
2024 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2025 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2026 >        final Callable<Boolean> complete1 = failFirst ?
2027 >            () -> fst.completeExceptionally(ex) :
2028 >            () -> fst.complete(v1);
2029 >        final Callable<Boolean> complete2 = failFirst ?
2030 >            () -> snd.complete(v1) :
2031 >            () -> snd.completeExceptionally(ex);
2032 >
2033 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2034 >        assertTrue(complete1.call());
2035 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2036 >        checkIncomplete(h1);
2037 >        checkIncomplete(h2);
2038 >        assertTrue(complete2.call());
2039 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2040 >
2041 >        checkCompletedWithWrappedException(h1, ex);
2042 >        checkCompletedWithWrappedException(h2, ex);
2043 >        checkCompletedWithWrappedException(h3, ex);
2044 >        r1.assertNotInvoked();
2045 >        r2.assertNotInvoked();
2046 >        r3.assertNotInvoked();
2047 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2048 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2049 >    }}
2050  
2051      /**
2052 <     * runAfterEitherAsync result completes exceptionally after exceptional
2134 <     * completion of source
2052 >     * runAfterBoth result completes exceptionally if either source cancelled
2053       */
2054 <    public void testRunAfterEitherAsync2() {
2055 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2056 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2057 <        Noop r = new Noop();
2058 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2059 <        f.completeExceptionally(new CFException());
2060 <        checkCompletedWithWrappedCFException(g);
2061 <
2062 <        r = new Noop();
2063 <        f = new CompletableFuture<>();
2064 <        f2 = new CompletableFuture<>();
2065 <        f2.completeExceptionally(new CFException());
2066 <        g = f.runAfterEitherAsync(f2, r);
2067 <        f.complete(one);
2068 <        checkCompletedWithWrappedCFException(g);
2069 <    }
2054 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2055 >        for (ExecutionMode m : ExecutionMode.values())
2056 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2057 >        for (boolean fFirst : new boolean[] { true, false })
2058 >        for (boolean failFirst : new boolean[] { true, false })
2059 >        for (Integer v1 : new Integer[] { 1, null })
2060 >    {
2061 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2062 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2063 >        final Noop r1 = new Noop(m);
2064 >        final Noop r2 = new Noop(m);
2065 >        final Noop r3 = new Noop(m);
2066 >
2067 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2068 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2069 >        final Callable<Boolean> complete1 = failFirst ?
2070 >            () -> fst.cancel(mayInterruptIfRunning) :
2071 >            () -> fst.complete(v1);
2072 >        final Callable<Boolean> complete2 = failFirst ?
2073 >            () -> snd.complete(v1) :
2074 >            () -> snd.cancel(mayInterruptIfRunning);
2075 >
2076 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2077 >        assertTrue(complete1.call());
2078 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2079 >        checkIncomplete(h1);
2080 >        checkIncomplete(h2);
2081 >        assertTrue(complete2.call());
2082 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2083 >
2084 >        checkCompletedWithWrappedCancellationException(h1);
2085 >        checkCompletedWithWrappedCancellationException(h2);
2086 >        checkCompletedWithWrappedCancellationException(h3);
2087 >        r1.assertNotInvoked();
2088 >        r2.assertNotInvoked();
2089 >        r3.assertNotInvoked();
2090 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2091 >        checkCancelled(failFirst ? fst : snd);
2092 >    }}
2093  
2094      /**
2095 <     * runAfterEitherAsync result completes exceptionally if action does
2095 >     * runAfterBoth result completes exceptionally if action does
2096       */
2097 <    public void testRunAfterEitherAsync3() {
2098 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2099 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2100 <        FailingNoop r = new FailingNoop();
2101 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2102 <        f.complete(one);
2103 <        checkCompletedWithWrappedCFException(g);
2104 <    }
2097 >    public void testRunAfterBoth_actionFailed() {
2098 >        for (ExecutionMode m : ExecutionMode.values())
2099 >        for (boolean fFirst : new boolean[] { true, false })
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 FailingRunnable r1 = new FailingRunnable(m);
2106 >        final FailingRunnable r2 = new FailingRunnable(m);
2107 >        final FailingRunnable r3 = new FailingRunnable(m);
2108 >
2109 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2110 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2111 >        final Integer w1 =  fFirst ? v1 : v2;
2112 >        final Integer w2 = !fFirst ? v1 : v2;
2113 >
2114 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2115 >        assertTrue(fst.complete(w1));
2116 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2117 >        assertTrue(snd.complete(w2));
2118 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2119 >
2120 >        checkCompletedWithWrappedException(h1, r1.ex);
2121 >        checkCompletedWithWrappedException(h2, r2.ex);
2122 >        checkCompletedWithWrappedException(h3, r3.ex);
2123 >        r1.assertInvoked();
2124 >        r2.assertInvoked();
2125 >        r3.assertInvoked();
2126 >        checkCompletedNormally(f, v1);
2127 >        checkCompletedNormally(g, v2);
2128 >    }}
2129  
2130      /**
2131 <     * runAfterEitherAsync result completes exceptionally if either
2132 <     * source cancelled
2131 >     * applyToEither result completes normally after normal completion
2132 >     * of either source
2133       */
2134 <    public void testRunAfterEitherAsync4() {
2135 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2136 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2137 <        Noop r = new Noop();
2138 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2139 <        assertTrue(f.cancel(true));
2140 <        checkCompletedWithWrappedCancellationException(g);
2141 <
2142 <        r = new Noop();
2178 <        f = new CompletableFuture<>();
2179 <        f2 = new CompletableFuture<>();
2180 <        assertTrue(f2.cancel(true));
2181 <        g = f.runAfterEitherAsync(f2, r);
2182 <        checkCompletedWithWrappedCancellationException(g);
2183 <    }
2134 >    public void testApplyToEither_normalCompletion() {
2135 >        for (ExecutionMode m : ExecutionMode.values())
2136 >        for (Integer v1 : new Integer[] { 1, null })
2137 >        for (Integer v2 : new Integer[] { 2, null })
2138 >    {
2139 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2140 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2141 >        final IncFunction[] rs = new IncFunction[6];
2142 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2143  
2144 <    /**
2145 <     * thenComposeAsync result completes normally after normal
2146 <     * completion of source
2147 <     */
2148 <    public void testThenComposeAsync() {
2149 <        CompletableFuture<Integer> f, g;
2150 <        CompletableFutureInc r;
2144 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2145 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2146 >        checkIncomplete(h0);
2147 >        checkIncomplete(h1);
2148 >        rs[0].assertNotInvoked();
2149 >        rs[1].assertNotInvoked();
2150 >        f.complete(v1);
2151 >        checkCompletedNormally(h0, inc(v1));
2152 >        checkCompletedNormally(h1, inc(v1));
2153 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2154 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2155 >        checkCompletedNormally(h2, inc(v1));
2156 >        checkCompletedNormally(h3, inc(v1));
2157 >        g.complete(v2);
2158  
2159 <        f = new CompletableFuture<>();
2160 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2161 <        f.complete(one);
2162 <        checkCompletedNormally(g, two);
2159 >        // unspecified behavior - both source completions available
2160 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2161 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2162 >        rs[4].assertValue(h4.join());
2163 >        rs[5].assertValue(h5.join());
2164 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2165 >                   Objects.equals(inc(v2), h4.join()));
2166 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2167 >                   Objects.equals(inc(v2), h5.join()));
2168  
2169 <        f = new CompletableFuture<>();
2170 <        f.complete(one);
2171 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2172 <        checkCompletedNormally(g, two);
2173 <    }
2169 >        checkCompletedNormally(f, v1);
2170 >        checkCompletedNormally(g, v2);
2171 >        checkCompletedNormally(h0, inc(v1));
2172 >        checkCompletedNormally(h1, inc(v1));
2173 >        checkCompletedNormally(h2, inc(v1));
2174 >        checkCompletedNormally(h3, inc(v1));
2175 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2176 >    }}
2177  
2178      /**
2179 <     * thenComposeAsync result completes exceptionally after
2180 <     * exceptional completion of source
2179 >     * applyToEither result completes exceptionally after exceptional
2180 >     * completion of either source
2181       */
2182 <    public void testThenComposeAsync2() {
2183 <        CompletableFuture<Integer> f, g;
2184 <        CompletableFutureInc r;
2185 <
2186 <        f = new CompletableFuture<>();
2187 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2188 <        f.completeExceptionally(new CFException());
2189 <        checkCompletedWithWrappedCFException(g);
2190 <        assertFalse(r.ran);
2217 <
2218 <        f = new CompletableFuture<>();
2219 <        f.completeExceptionally(new CFException());
2220 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2221 <        checkCompletedWithWrappedCFException(g);
2222 <        assertFalse(r.ran);
2223 <    }
2182 >    public void testApplyToEither_exceptionalCompletion() {
2183 >        for (ExecutionMode m : ExecutionMode.values())
2184 >        for (Integer v1 : new Integer[] { 1, null })
2185 >    {
2186 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2187 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2188 >        final CFException ex = new CFException();
2189 >        final IncFunction[] rs = new IncFunction[6];
2190 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2191  
2192 <    /**
2193 <     * thenComposeAsync result completes exceptionally if action does
2194 <     */
2195 <    public void testThenComposeAsync3() {
2196 <        CompletableFuture<Integer> f, g;
2197 <        FailingCompletableFutureFunction r;
2192 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2193 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2194 >        checkIncomplete(h0);
2195 >        checkIncomplete(h1);
2196 >        rs[0].assertNotInvoked();
2197 >        rs[1].assertNotInvoked();
2198 >        f.completeExceptionally(ex);
2199 >        checkCompletedWithWrappedException(h0, ex);
2200 >        checkCompletedWithWrappedException(h1, ex);
2201 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2202 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2203 >        checkCompletedWithWrappedException(h2, ex);
2204 >        checkCompletedWithWrappedException(h3, ex);
2205 >        g.complete(v1);
2206  
2207 <        f = new CompletableFuture<>();
2208 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2209 <        f.complete(one);
2210 <        checkCompletedWithWrappedCFException(g);
2207 >        // unspecified behavior - both source completions available
2208 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2209 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2210 >        try {
2211 >            assertEquals(inc(v1), h4.join());
2212 >            rs[4].assertValue(inc(v1));
2213 >        } catch (CompletionException ok) {
2214 >            checkCompletedWithWrappedException(h4, ex);
2215 >            rs[4].assertNotInvoked();
2216 >        }
2217 >        try {
2218 >            assertEquals(inc(v1), h5.join());
2219 >            rs[5].assertValue(inc(v1));
2220 >        } catch (CompletionException ok) {
2221 >            checkCompletedWithWrappedException(h5, ex);
2222 >            rs[5].assertNotInvoked();
2223 >        }
2224  
2225 <        f = new CompletableFuture<>();
2226 <        f.complete(one);
2227 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2228 <        checkCompletedWithWrappedCFException(g);
2229 <    }
2225 >        checkCompletedExceptionally(f, ex);
2226 >        checkCompletedNormally(g, v1);
2227 >        checkCompletedWithWrappedException(h0, ex);
2228 >        checkCompletedWithWrappedException(h1, ex);
2229 >        checkCompletedWithWrappedException(h2, ex);
2230 >        checkCompletedWithWrappedException(h3, ex);
2231 >        checkCompletedWithWrappedException(h4, ex);
2232 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2233 >    }}
2234  
2235 <    /**
2236 <     * thenComposeAsync result completes exceptionally if source cancelled
2237 <     */
2238 <    public void testThenComposeAsync4() {
2239 <        CompletableFuture<Integer> f, g;
2240 <        CompletableFutureInc r;
2235 >    public void testApplyToEither_exceptionalCompletion2() {
2236 >        for (ExecutionMode m : ExecutionMode.values())
2237 >        for (boolean fFirst : new boolean[] { true, false })
2238 >        for (Integer v1 : new Integer[] { 1, null })
2239 >    {
2240 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2241 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2242 >        final CFException ex = new CFException();
2243 >        final IncFunction[] rs = new IncFunction[6];
2244 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2245  
2246 <        f = new CompletableFuture<>();
2247 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2248 <        assertTrue(f.cancel(true));
2249 <        checkCompletedWithWrappedCancellationException(g);
2246 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2247 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2248 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2249 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2250 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2251 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2252  
2253 <        f = new CompletableFuture<>();
2254 <        assertTrue(f.cancel(true));
2255 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2256 <        checkCompletedWithWrappedCancellationException(g);
2257 <    }
2253 >        // unspecified behavior - both source completions available
2254 >        try {
2255 >            assertEquals(inc(v1), h0.join());
2256 >            rs[0].assertValue(inc(v1));
2257 >        } catch (CompletionException ok) {
2258 >            checkCompletedWithWrappedException(h0, ex);
2259 >            rs[0].assertNotInvoked();
2260 >        }
2261 >        try {
2262 >            assertEquals(inc(v1), h1.join());
2263 >            rs[1].assertValue(inc(v1));
2264 >        } catch (CompletionException ok) {
2265 >            checkCompletedWithWrappedException(h1, ex);
2266 >            rs[1].assertNotInvoked();
2267 >        }
2268 >        try {
2269 >            assertEquals(inc(v1), h2.join());
2270 >            rs[2].assertValue(inc(v1));
2271 >        } catch (CompletionException ok) {
2272 >            checkCompletedWithWrappedException(h2, ex);
2273 >            rs[2].assertNotInvoked();
2274 >        }
2275 >        try {
2276 >            assertEquals(inc(v1), h3.join());
2277 >            rs[3].assertValue(inc(v1));
2278 >        } catch (CompletionException ok) {
2279 >            checkCompletedWithWrappedException(h3, ex);
2280 >            rs[3].assertNotInvoked();
2281 >        }
2282  
2283 <    // async with explicit executors
2283 >        checkCompletedNormally(f, v1);
2284 >        checkCompletedExceptionally(g, ex);
2285 >    }}
2286  
2287      /**
2288 <     * thenRunAsync result completes normally after normal completion of source
2288 >     * applyToEither result completes exceptionally if either source cancelled
2289       */
2290 <    public void testThenRunAsyncE() {
2291 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2292 <        Noop r = new Noop();
2293 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2294 <        f.complete(null);
2295 <        checkCompletedNormally(g, null);
2290 >    public void testApplyToEither_sourceCancelled() {
2291 >        for (ExecutionMode m : ExecutionMode.values())
2292 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2293 >        for (Integer v1 : new Integer[] { 1, null })
2294 >    {
2295 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2296 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2297 >        final IncFunction[] rs = new IncFunction[6];
2298 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2299  
2300 <        // reordered version
2301 <        f = new CompletableFuture<>();
2302 <        f.complete(null);
2303 <        r = new Noop();
2304 <        g = f.thenRunAsync(r, new ThreadExecutor());
2305 <        checkCompletedNormally(g, null);
2306 <    }
2300 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2301 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2302 >        checkIncomplete(h0);
2303 >        checkIncomplete(h1);
2304 >        rs[0].assertNotInvoked();
2305 >        rs[1].assertNotInvoked();
2306 >        f.cancel(mayInterruptIfRunning);
2307 >        checkCompletedWithWrappedCancellationException(h0);
2308 >        checkCompletedWithWrappedCancellationException(h1);
2309 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2310 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2311 >        checkCompletedWithWrappedCancellationException(h2);
2312 >        checkCompletedWithWrappedCancellationException(h3);
2313 >        g.complete(v1);
2314  
2315 <    /**
2316 <     * thenRunAsync result completes exceptionally after exceptional
2317 <     * completion of source
2284 <     */
2285 <    public void testThenRunAsync2E() {
2286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2287 <        Noop r = new Noop();
2288 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2289 <        f.completeExceptionally(new CFException());
2315 >        // unspecified behavior - both source completions available
2316 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2317 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2318          try {
2319 <            g.join();
2320 <            shouldThrow();
2321 <        } catch (CompletionException success) {}
2322 <        checkCompletedWithWrappedCFException(g);
2323 <    }
2319 >            assertEquals(inc(v1), h4.join());
2320 >            rs[4].assertValue(inc(v1));
2321 >        } catch (CompletionException ok) {
2322 >            checkCompletedWithWrappedCancellationException(h4);
2323 >            rs[4].assertNotInvoked();
2324 >        }
2325 >        try {
2326 >            assertEquals(inc(v1), h5.join());
2327 >            rs[5].assertValue(inc(v1));
2328 >        } catch (CompletionException ok) {
2329 >            checkCompletedWithWrappedCancellationException(h5);
2330 >            rs[5].assertNotInvoked();
2331 >        }
2332  
2333 <    /**
2334 <     * thenRunAsync result completes exceptionally if action does
2335 <     */
2336 <    public void testThenRunAsync3E() {
2337 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2338 <        FailingNoop r = new FailingNoop();
2339 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2340 <        f.complete(null);
2305 <        checkCompletedWithWrappedCFException(g);
2306 <    }
2333 >        checkCancelled(f);
2334 >        checkCompletedNormally(g, v1);
2335 >        checkCompletedWithWrappedCancellationException(h0);
2336 >        checkCompletedWithWrappedCancellationException(h1);
2337 >        checkCompletedWithWrappedCancellationException(h2);
2338 >        checkCompletedWithWrappedCancellationException(h3);
2339 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2340 >    }}
2341  
2342 <    /**
2343 <     * thenRunAsync result completes exceptionally if source cancelled
2344 <     */
2345 <    public void testThenRunAsync4E() {
2346 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2347 <        Noop r = new Noop();
2348 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2349 <        assertTrue(f.cancel(true));
2350 <        checkCompletedWithWrappedCancellationException(g);
2351 <    }
2342 >    public void testApplyToEither_sourceCancelled2() {
2343 >        for (ExecutionMode m : ExecutionMode.values())
2344 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2345 >        for (boolean fFirst : new boolean[] { true, false })
2346 >        for (Integer v1 : new Integer[] { 1, null })
2347 >    {
2348 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2349 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2350 >        final IncFunction[] rs = new IncFunction[6];
2351 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2352  
2353 <    /**
2354 <     * thenApplyAsync result completes normally after normal completion of source
2355 <     */
2356 <    public void testThenApplyAsyncE() {
2357 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2358 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2325 <        f.complete(one);
2326 <        checkCompletedNormally(g, two);
2327 <    }
2353 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2354 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2355 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2356 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2357 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2358 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2359  
2360 <    /**
2361 <     * thenApplyAsync result completes exceptionally after exceptional
2362 <     * completion of source
2363 <     */
2364 <    public void testThenApplyAsync2E() {
2365 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2366 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2367 <        f.completeExceptionally(new CFException());
2368 <        checkCompletedWithWrappedCFException(g);
2369 <    }
2360 >        // unspecified behavior - both source completions available
2361 >        try {
2362 >            assertEquals(inc(v1), h0.join());
2363 >            rs[0].assertValue(inc(v1));
2364 >        } catch (CompletionException ok) {
2365 >            checkCompletedWithWrappedCancellationException(h0);
2366 >            rs[0].assertNotInvoked();
2367 >        }
2368 >        try {
2369 >            assertEquals(inc(v1), h1.join());
2370 >            rs[1].assertValue(inc(v1));
2371 >        } catch (CompletionException ok) {
2372 >            checkCompletedWithWrappedCancellationException(h1);
2373 >            rs[1].assertNotInvoked();
2374 >        }
2375 >        try {
2376 >            assertEquals(inc(v1), h2.join());
2377 >            rs[2].assertValue(inc(v1));
2378 >        } catch (CompletionException ok) {
2379 >            checkCompletedWithWrappedCancellationException(h2);
2380 >            rs[2].assertNotInvoked();
2381 >        }
2382 >        try {
2383 >            assertEquals(inc(v1), h3.join());
2384 >            rs[3].assertValue(inc(v1));
2385 >        } catch (CompletionException ok) {
2386 >            checkCompletedWithWrappedCancellationException(h3);
2387 >            rs[3].assertNotInvoked();
2388 >        }
2389  
2390 <    /**
2391 <     * thenApplyAsync result completes exceptionally if action does
2392 <     */
2343 <    public void testThenApplyAsync3E() {
2344 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2345 <        FailingFunction r = new FailingFunction();
2346 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2347 <        f.complete(null);
2348 <        checkCompletedWithWrappedCFException(g);
2349 <    }
2390 >        checkCompletedNormally(f, v1);
2391 >        checkCancelled(g);
2392 >    }}
2393  
2394      /**
2395 <     * thenApplyAsync result completes exceptionally if source cancelled
2395 >     * applyToEither result completes exceptionally if action does
2396       */
2397 <    public void testThenApplyAsync4E() {
2398 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2399 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2400 <        assertTrue(f.cancel(true));
2401 <        checkCompletedWithWrappedCancellationException(g);
2402 <    }
2397 >    public void testApplyToEither_actionFailed() {
2398 >        for (ExecutionMode m : ExecutionMode.values())
2399 >        for (Integer v1 : new Integer[] { 1, null })
2400 >        for (Integer v2 : new Integer[] { 2, null })
2401 >    {
2402 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2403 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2404 >        final FailingFunction[] rs = new FailingFunction[6];
2405 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2406  
2407 <    /**
2408 <     * thenAcceptAsync result completes normally after normal
2409 <     * completion of source
2410 <     */
2411 <    public void testThenAcceptAsyncE() {
2412 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2413 <        IncAction r = new IncAction();
2414 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2415 <        f.complete(one);
2416 <        checkCompletedNormally(g, null);
2371 <        assertEquals(r.value, 2);
2372 <    }
2407 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2408 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2409 >        f.complete(v1);
2410 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2411 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2412 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2413 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2414 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2415 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2416 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2417  
2418 <    /**
2375 <     * thenAcceptAsync result completes exceptionally after exceptional
2376 <     * completion of source
2377 <     */
2378 <    public void testThenAcceptAsync2E() {
2379 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2380 <        IncAction r = new IncAction();
2381 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2382 <        f.completeExceptionally(new CFException());
2383 <        checkCompletedWithWrappedCFException(g);
2384 <    }
2418 >        g.complete(v2);
2419  
2420 <    /**
2421 <     * thenAcceptAsync result completes exceptionally if action does
2422 <     */
2423 <    public void testThenAcceptAsync3E() {
2424 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2425 <        FailingConsumer r = new FailingConsumer();
2426 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2427 <        f.complete(null);
2428 <        checkCompletedWithWrappedCFException(g);
2429 <    }
2420 >        // unspecified behavior - both source completions available
2421 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2422 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2423 >
2424 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2425 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2426 >                   Objects.equals(v2, rs[4].value));
2427 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2428 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2429 >                   Objects.equals(v2, rs[5].value));
2430  
2431 <    /**
2432 <     * thenAcceptAsync result completes exceptionally if source cancelled
2433 <     */
2400 <    public void testThenAcceptAsync4E() {
2401 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2402 <        IncAction r = new IncAction();
2403 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2404 <        assertTrue(f.cancel(true));
2405 <        checkCompletedWithWrappedCancellationException(g);
2406 <    }
2431 >        checkCompletedNormally(f, v1);
2432 >        checkCompletedNormally(g, v2);
2433 >    }}
2434  
2435      /**
2436 <     * thenCombineAsync result completes normally after normal
2437 <     * completion of sources
2436 >     * acceptEither result completes normally after normal completion
2437 >     * of either source
2438       */
2439 <    public void testThenCombineAsyncE() {
2440 <        CompletableFuture<Integer> f, g, h;
2441 <        ThreadExecutor e = new ThreadExecutor();
2442 <        int count = 0;
2439 >    public void testAcceptEither_normalCompletion() {
2440 >        for (ExecutionMode m : ExecutionMode.values())
2441 >        for (Integer v1 : new Integer[] { 1, null })
2442 >        for (Integer v2 : new Integer[] { 2, null })
2443 >    {
2444 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2445 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2446 >        final NoopConsumer[] rs = new NoopConsumer[6];
2447 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2448  
2449 <        f = new CompletableFuture<>();
2450 <        g = new CompletableFuture<>();
2451 <        h = f.thenCombineAsync(g, subtract, e);
2452 <        f.complete(3);
2453 <        checkIncomplete(h);
2454 <        g.complete(1);
2455 <        checkCompletedNormally(h, 2);
2456 <        assertEquals(++count, e.count.get());
2449 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2450 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2451 >        checkIncomplete(h0);
2452 >        checkIncomplete(h1);
2453 >        rs[0].assertNotInvoked();
2454 >        rs[1].assertNotInvoked();
2455 >        f.complete(v1);
2456 >        checkCompletedNormally(h0, null);
2457 >        checkCompletedNormally(h1, null);
2458 >        rs[0].assertValue(v1);
2459 >        rs[1].assertValue(v1);
2460 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2461 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2462 >        checkCompletedNormally(h2, null);
2463 >        checkCompletedNormally(h3, null);
2464 >        rs[2].assertValue(v1);
2465 >        rs[3].assertValue(v1);
2466 >        g.complete(v2);
2467  
2468 <        f = new CompletableFuture<>();
2469 <        g = new CompletableFuture<>();
2470 <        h = f.thenCombineAsync(g, subtract, e);
2471 <        g.complete(1);
2472 <        checkIncomplete(h);
2473 <        f.complete(3);
2474 <        checkCompletedNormally(h, 2);
2475 <        assertEquals(++count, e.count.get());
2468 >        // unspecified behavior - both source completions available
2469 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2470 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2471 >        checkCompletedNormally(h4, null);
2472 >        checkCompletedNormally(h5, null);
2473 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2474 >                   Objects.equals(v2, rs[4].value));
2475 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2476 >                   Objects.equals(v2, rs[5].value));
2477  
2478 <        f = new CompletableFuture<>();
2479 <        g = new CompletableFuture<>();
2480 <        g.complete(1);
2481 <        f.complete(3);
2482 <        h = f.thenCombineAsync(g, subtract, e);
2483 <        checkCompletedNormally(h, 2);
2484 <        assertEquals(++count, e.count.get());
2485 <    }
2478 >        checkCompletedNormally(f, v1);
2479 >        checkCompletedNormally(g, v2);
2480 >        checkCompletedNormally(h0, null);
2481 >        checkCompletedNormally(h1, null);
2482 >        checkCompletedNormally(h2, null);
2483 >        checkCompletedNormally(h3, null);
2484 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2485 >    }}
2486  
2487      /**
2488 <     * thenCombineAsync result completes exceptionally after exceptional
2488 >     * acceptEither result completes exceptionally after exceptional
2489       * completion of either source
2490       */
2491 <    public void testThenCombineAsync2E() {
2492 <        CompletableFuture<Integer> f, g, h;
2493 <        ThreadExecutor e = new ThreadExecutor();
2494 <        int count = 0;
2495 <
2496 <        f = new CompletableFuture<>();
2497 <        g = new CompletableFuture<>();
2498 <        h = f.thenCombineAsync(g, subtract, e);
2499 <        f.completeExceptionally(new CFException());
2457 <        checkIncomplete(h);
2458 <        g.complete(1);
2459 <        checkCompletedWithWrappedCFException(h);
2460 <
2461 <        f = new CompletableFuture<>();
2462 <        g = new CompletableFuture<>();
2463 <        h = f.thenCombineAsync(g, subtract, e);
2464 <        g.completeExceptionally(new CFException());
2465 <        checkIncomplete(h);
2466 <        f.complete(3);
2467 <        checkCompletedWithWrappedCFException(h);
2468 <
2469 <        f = new CompletableFuture<>();
2470 <        g = new CompletableFuture<>();
2471 <        g.completeExceptionally(new CFException());
2472 <        h = f.thenCombineAsync(g, subtract, e);
2473 <        checkIncomplete(h);
2474 <        f.complete(3);
2475 <        checkCompletedWithWrappedCFException(h);
2491 >    public void testAcceptEither_exceptionalCompletion() {
2492 >        for (ExecutionMode m : ExecutionMode.values())
2493 >        for (Integer v1 : new Integer[] { 1, null })
2494 >    {
2495 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2496 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2497 >        final CFException ex = new CFException();
2498 >        final NoopConsumer[] rs = new NoopConsumer[6];
2499 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2500  
2501 <        assertEquals(0, e.count.get());
2502 <    }
2501 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2502 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2503 >        checkIncomplete(h0);
2504 >        checkIncomplete(h1);
2505 >        rs[0].assertNotInvoked();
2506 >        rs[1].assertNotInvoked();
2507 >        f.completeExceptionally(ex);
2508 >        checkCompletedWithWrappedException(h0, ex);
2509 >        checkCompletedWithWrappedException(h1, ex);
2510 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2511 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2512 >        checkCompletedWithWrappedException(h2, ex);
2513 >        checkCompletedWithWrappedException(h3, ex);
2514  
2515 <    /**
2481 <     * thenCombineAsync result completes exceptionally if action does
2482 <     */
2483 <    public void testThenCombineAsync3E() {
2484 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2485 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2486 <        FailingBiFunction r = new FailingBiFunction();
2487 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2488 <        f.complete(one);
2489 <        checkIncomplete(g);
2490 <        assertFalse(r.ran);
2491 <        f2.complete(two);
2492 <        checkCompletedWithWrappedCFException(g);
2493 <        assertTrue(r.ran);
2494 <    }
2515 >        g.complete(v1);
2516  
2517 <    /**
2518 <     * thenCombineAsync result completes exceptionally if either source cancelled
2519 <     */
2520 <    public void testThenCombineAsync4E() {
2521 <        CompletableFuture<Integer> f, g, h;
2522 <        ThreadExecutor e = new ThreadExecutor();
2517 >        // unspecified behavior - both source completions available
2518 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2519 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2520 >        try {
2521 >            assertNull(h4.join());
2522 >            rs[4].assertValue(v1);
2523 >        } catch (CompletionException ok) {
2524 >            checkCompletedWithWrappedException(h4, ex);
2525 >            rs[4].assertNotInvoked();
2526 >        }
2527 >        try {
2528 >            assertNull(h5.join());
2529 >            rs[5].assertValue(v1);
2530 >        } catch (CompletionException ok) {
2531 >            checkCompletedWithWrappedException(h5, ex);
2532 >            rs[5].assertNotInvoked();
2533 >        }
2534  
2535 <        f = new CompletableFuture<>();
2536 <        g = new CompletableFuture<>();
2537 <        h = f.thenCombineAsync(g, subtract, e);
2538 <        assertTrue(f.cancel(true));
2539 <        checkIncomplete(h);
2540 <        g.complete(1);
2541 <        checkCompletedWithWrappedCancellationException(h);
2535 >        checkCompletedExceptionally(f, ex);
2536 >        checkCompletedNormally(g, v1);
2537 >        checkCompletedWithWrappedException(h0, ex);
2538 >        checkCompletedWithWrappedException(h1, ex);
2539 >        checkCompletedWithWrappedException(h2, ex);
2540 >        checkCompletedWithWrappedException(h3, ex);
2541 >        checkCompletedWithWrappedException(h4, ex);
2542 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2543 >    }}
2544  
2545 <        f = new CompletableFuture<>();
2546 <        g = new CompletableFuture<>();
2547 <        h = f.thenCombineAsync(g, subtract, e);
2548 <        assertTrue(g.cancel(true));
2549 <        checkIncomplete(h);
2550 <        f.complete(3);
2551 <        checkCompletedWithWrappedCancellationException(h);
2545 >    public void testAcceptEither_exceptionalCompletion2() {
2546 >        for (ExecutionMode m : ExecutionMode.values())
2547 >        for (boolean fFirst : new boolean[] { true, false })
2548 >        for (Integer v1 : new Integer[] { 1, null })
2549 >    {
2550 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2551 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2552 >        final CFException ex = new CFException();
2553 >        final NoopConsumer[] rs = new NoopConsumer[6];
2554 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2555  
2556 <        f = new CompletableFuture<>();
2557 <        g = new CompletableFuture<>();
2558 <        assertTrue(g.cancel(true));
2559 <        h = f.thenCombineAsync(g, subtract, e);
2560 <        checkIncomplete(h);
2561 <        f.complete(3);
2525 <        checkCompletedWithWrappedCancellationException(h);
2556 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2557 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2558 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2559 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2560 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2561 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2562  
2563 <        f = new CompletableFuture<>();
2564 <        g = new CompletableFuture<>();
2565 <        assertTrue(f.cancel(true));
2566 <        assertTrue(g.cancel(true));
2567 <        h = f.thenCombineAsync(g, subtract, e);
2568 <        checkCompletedWithWrappedCancellationException(h);
2563 >        // unspecified behavior - both source completions available
2564 >        try {
2565 >            assertEquals(null, h0.join());
2566 >            rs[0].assertValue(v1);
2567 >        } catch (CompletionException ok) {
2568 >            checkCompletedWithWrappedException(h0, ex);
2569 >            rs[0].assertNotInvoked();
2570 >        }
2571 >        try {
2572 >            assertEquals(null, h1.join());
2573 >            rs[1].assertValue(v1);
2574 >        } catch (CompletionException ok) {
2575 >            checkCompletedWithWrappedException(h1, ex);
2576 >            rs[1].assertNotInvoked();
2577 >        }
2578 >        try {
2579 >            assertEquals(null, h2.join());
2580 >            rs[2].assertValue(v1);
2581 >        } catch (CompletionException ok) {
2582 >            checkCompletedWithWrappedException(h2, ex);
2583 >            rs[2].assertNotInvoked();
2584 >        }
2585 >        try {
2586 >            assertEquals(null, h3.join());
2587 >            rs[3].assertValue(v1);
2588 >        } catch (CompletionException ok) {
2589 >            checkCompletedWithWrappedException(h3, ex);
2590 >            rs[3].assertNotInvoked();
2591 >        }
2592  
2593 <        assertEquals(0, e.count.get());
2594 <    }
2593 >        checkCompletedNormally(f, v1);
2594 >        checkCompletedExceptionally(g, ex);
2595 >    }}
2596  
2597      /**
2598 <     * thenAcceptBothAsync result completes normally after normal
2539 <     * completion of sources
2598 >     * acceptEither result completes exceptionally if either source cancelled
2599       */
2600 <    public void testThenAcceptBothAsyncE() {
2601 <        CompletableFuture<Integer> f, g;
2602 <        CompletableFuture<Void> h;
2603 <        SubtractAction r;
2604 <        ThreadExecutor e = new ThreadExecutor();
2600 >    public void testAcceptEither_sourceCancelled() {
2601 >        for (ExecutionMode m : ExecutionMode.values())
2602 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2603 >        for (Integer v1 : new Integer[] { 1, null })
2604 >    {
2605 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2606 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2607 >        final NoopConsumer[] rs = new NoopConsumer[6];
2608 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2609  
2610 <        f = new CompletableFuture<>();
2611 <        g = new CompletableFuture<>();
2612 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2613 <        f.complete(3);
2614 <        checkIncomplete(h);
2615 <        g.complete(1);
2616 <        checkCompletedNormally(h, null);
2617 <        assertEquals(r.value, 2);
2610 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2611 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2612 >        checkIncomplete(h0);
2613 >        checkIncomplete(h1);
2614 >        rs[0].assertNotInvoked();
2615 >        rs[1].assertNotInvoked();
2616 >        f.cancel(mayInterruptIfRunning);
2617 >        checkCompletedWithWrappedCancellationException(h0);
2618 >        checkCompletedWithWrappedCancellationException(h1);
2619 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2620 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2621 >        checkCompletedWithWrappedCancellationException(h2);
2622 >        checkCompletedWithWrappedCancellationException(h3);
2623  
2624 <        f = new CompletableFuture<>();
2557 <        g = new CompletableFuture<>();
2558 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2559 <        g.complete(1);
2560 <        checkIncomplete(h);
2561 <        f.complete(3);
2562 <        checkCompletedNormally(h, null);
2563 <        assertEquals(r.value, 2);
2624 >        g.complete(v1);
2625  
2626 <        f = new CompletableFuture<>();
2627 <        g = new CompletableFuture<>();
2628 <        g.complete(1);
2629 <        f.complete(3);
2630 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2631 <        checkCompletedNormally(h, null);
2632 <        assertEquals(r.value, 2);
2626 >        // unspecified behavior - both source completions available
2627 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2628 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2629 >        try {
2630 >            assertNull(h4.join());
2631 >            rs[4].assertValue(v1);
2632 >        } catch (CompletionException ok) {
2633 >            checkCompletedWithWrappedCancellationException(h4);
2634 >            rs[4].assertNotInvoked();
2635 >        }
2636 >        try {
2637 >            assertNull(h5.join());
2638 >            rs[5].assertValue(v1);
2639 >        } catch (CompletionException ok) {
2640 >            checkCompletedWithWrappedCancellationException(h5);
2641 >            rs[5].assertNotInvoked();
2642 >        }
2643  
2644 <        assertEquals(3, e.count.get());
2645 <    }
2644 >        checkCancelled(f);
2645 >        checkCompletedNormally(g, v1);
2646 >        checkCompletedWithWrappedCancellationException(h0);
2647 >        checkCompletedWithWrappedCancellationException(h1);
2648 >        checkCompletedWithWrappedCancellationException(h2);
2649 >        checkCompletedWithWrappedCancellationException(h3);
2650 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2651 >    }}
2652  
2653      /**
2654 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2578 <     * completion of source
2654 >     * acceptEither result completes exceptionally if action does
2655       */
2656 <    public void testThenAcceptBothAsync2E() {
2657 <        CompletableFuture<Integer> f, g;
2658 <        CompletableFuture<Void> h;
2659 <        SubtractAction r;
2660 <        ThreadExecutor e = new ThreadExecutor();
2661 <
2662 <        f = new CompletableFuture<>();
2663 <        g = new CompletableFuture<>();
2664 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2589 <        f.completeExceptionally(new CFException());
2590 <        checkIncomplete(h);
2591 <        g.complete(1);
2592 <        checkCompletedWithWrappedCFException(h);
2593 <
2594 <        f = new CompletableFuture<>();
2595 <        g = new CompletableFuture<>();
2596 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2597 <        g.completeExceptionally(new CFException());
2598 <        checkIncomplete(h);
2599 <        f.complete(3);
2600 <        checkCompletedWithWrappedCFException(h);
2601 <
2602 <        f = new CompletableFuture<>();
2603 <        g = new CompletableFuture<>();
2604 <        f.complete(3);
2605 <        g.completeExceptionally(new CFException());
2606 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2607 <        checkCompletedWithWrappedCFException(h);
2608 <
2609 <        f = new CompletableFuture<>();
2610 <        g = new CompletableFuture<>();
2611 <        f.completeExceptionally(new CFException());
2612 <        g.complete(3);
2613 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2614 <        checkCompletedWithWrappedCFException(h);
2615 <
2616 <        assertEquals(0, e.count.get());
2617 <    }
2656 >    public void testAcceptEither_actionFailed() {
2657 >        for (ExecutionMode m : ExecutionMode.values())
2658 >        for (Integer v1 : new Integer[] { 1, null })
2659 >        for (Integer v2 : new Integer[] { 2, null })
2660 >    {
2661 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2662 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2663 >        final FailingConsumer[] rs = new FailingConsumer[6];
2664 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2665  
2666 <    /**
2667 <     * thenAcceptBothAsync result completes exceptionally if action does
2668 <     */
2669 <    public void testThenAcceptBothAsync3E() {
2670 <        CompletableFuture<Integer> f, g;
2671 <        CompletableFuture<Void> h;
2672 <        FailingBiConsumer r;
2673 <        ThreadExecutor e = new ThreadExecutor();
2666 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2667 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2668 >        f.complete(v1);
2669 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2670 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2671 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2672 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2673 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2674 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2675 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2676  
2677 <        f = new CompletableFuture<>();
2629 <        g = new CompletableFuture<>();
2630 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2631 <        f.complete(3);
2632 <        checkIncomplete(h);
2633 <        g.complete(1);
2634 <        checkCompletedWithWrappedCFException(h);
2677 >        g.complete(v2);
2678  
2679 <        f = new CompletableFuture<>();
2680 <        g = new CompletableFuture<>();
2681 <        f.complete(3);
2682 <        g.complete(1);
2683 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2684 <        checkCompletedWithWrappedCFException(h);
2679 >        // unspecified behavior - both source completions available
2680 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2681 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2682 >
2683 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2684 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2685 >                   Objects.equals(v2, rs[4].value));
2686 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2687 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2688 >                   Objects.equals(v2, rs[5].value));
2689  
2690 <        assertEquals(2, e.count.get());
2691 <    }
2690 >        checkCompletedNormally(f, v1);
2691 >        checkCompletedNormally(g, v2);
2692 >    }}
2693  
2694      /**
2695 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2695 >     * runAfterEither result completes normally after normal completion
2696 >     * of either source
2697       */
2698 <    public void testThenAcceptBothAsync4E() {
2699 <        CompletableFuture<Integer> f, g;
2700 <        CompletableFuture<Void> h;
2701 <        SubtractAction r;
2702 <        ThreadExecutor e = new ThreadExecutor();
2703 <
2704 <        f = new CompletableFuture<>();
2705 <        g = new CompletableFuture<>();
2706 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2707 <        assertTrue(f.cancel(true));
2659 <        checkIncomplete(h);
2660 <        g.complete(1);
2661 <        checkCompletedWithWrappedCancellationException(h);
2698 >    public void testRunAfterEither_normalCompletion() {
2699 >        for (ExecutionMode m : ExecutionMode.values())
2700 >        for (Integer v1 : new Integer[] { 1, null })
2701 >        for (Integer v2 : new Integer[] { 2, null })
2702 >        for (boolean pushNop : new boolean[] { true, false })
2703 >    {
2704 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2705 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2706 >        final Noop[] rs = new Noop[6];
2707 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2708  
2709 <        f = new CompletableFuture<>();
2710 <        g = new CompletableFuture<>();
2711 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2712 <        assertTrue(g.cancel(true));
2713 <        checkIncomplete(h);
2714 <        f.complete(3);
2715 <        checkCompletedWithWrappedCancellationException(h);
2709 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2710 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2711 >        checkIncomplete(h0);
2712 >        checkIncomplete(h1);
2713 >        rs[0].assertNotInvoked();
2714 >        rs[1].assertNotInvoked();
2715 >        if (pushNop) {          // ad hoc test of intra-completion interference
2716 >            m.thenRun(f, () -> {});
2717 >            m.thenRun(g, () -> {});
2718 >        }
2719 >        f.complete(v1);
2720 >        checkCompletedNormally(h0, null);
2721 >        checkCompletedNormally(h1, null);
2722 >        rs[0].assertInvoked();
2723 >        rs[1].assertInvoked();
2724 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2725 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2726 >        checkCompletedNormally(h2, null);
2727 >        checkCompletedNormally(h3, null);
2728 >        rs[2].assertInvoked();
2729 >        rs[3].assertInvoked();
2730  
2731 <        f = new CompletableFuture<>();
2672 <        g = new CompletableFuture<>();
2673 <        f.complete(3);
2674 <        assertTrue(g.cancel(true));
2675 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2676 <        checkCompletedWithWrappedCancellationException(h);
2731 >        g.complete(v2);
2732  
2733 <        f = new CompletableFuture<>();
2734 <        g = new CompletableFuture<>();
2680 <        assertTrue(f.cancel(true));
2681 <        g.complete(3);
2682 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2683 <        checkCompletedWithWrappedCancellationException(h);
2733 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2734 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2735  
2736 <        assertEquals(0, e.count.get());
2737 <    }
2736 >        checkCompletedNormally(f, v1);
2737 >        checkCompletedNormally(g, v2);
2738 >        checkCompletedNormally(h0, null);
2739 >        checkCompletedNormally(h1, null);
2740 >        checkCompletedNormally(h2, null);
2741 >        checkCompletedNormally(h3, null);
2742 >        checkCompletedNormally(h4, null);
2743 >        checkCompletedNormally(h5, null);
2744 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2745 >    }}
2746  
2747      /**
2748 <     * applyToEitherAsync result completes normally after normal
2749 <     * completion of sources
2748 >     * runAfterEither result completes exceptionally after exceptional
2749 >     * completion of either source
2750       */
2751 <    public void testApplyToEitherAsyncE() {
2752 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2753 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2754 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2755 <        f.complete(one);
2756 <        checkCompletedNormally(g, two);
2751 >    public void testRunAfterEither_exceptionalCompletion() {
2752 >        for (ExecutionMode m : ExecutionMode.values())
2753 >        for (Integer v1 : new Integer[] { 1, null })
2754 >    {
2755 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2756 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2757 >        final CFException ex = new CFException();
2758 >        final Noop[] rs = new Noop[6];
2759 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2760  
2761 <        f = new CompletableFuture<>();
2762 <        f.complete(one);
2763 <        f2 = new CompletableFuture<>();
2764 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2765 <        checkCompletedNormally(g, two);
2766 <    }
2761 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2762 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2763 >        checkIncomplete(h0);
2764 >        checkIncomplete(h1);
2765 >        rs[0].assertNotInvoked();
2766 >        rs[1].assertNotInvoked();
2767 >        assertTrue(f.completeExceptionally(ex));
2768 >        checkCompletedWithWrappedException(h0, ex);
2769 >        checkCompletedWithWrappedException(h1, ex);
2770 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2771 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2772 >        checkCompletedWithWrappedException(h2, ex);
2773 >        checkCompletedWithWrappedException(h3, ex);
2774 >
2775 >        assertTrue(g.complete(v1));
2776 >
2777 >        // unspecified behavior - both source completions available
2778 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2779 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2780 >        try {
2781 >            assertNull(h4.join());
2782 >            rs[4].assertInvoked();
2783 >        } catch (CompletionException ok) {
2784 >            checkCompletedWithWrappedException(h4, ex);
2785 >            rs[4].assertNotInvoked();
2786 >        }
2787 >        try {
2788 >            assertNull(h5.join());
2789 >            rs[5].assertInvoked();
2790 >        } catch (CompletionException ok) {
2791 >            checkCompletedWithWrappedException(h5, ex);
2792 >            rs[5].assertNotInvoked();
2793 >        }
2794  
2795 <    /**
2796 <     * applyToEitherAsync result completes exceptionally after exceptional
2797 <     * completion of source
2798 <     */
2799 <    public void testApplyToEitherAsync2E() {
2800 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2801 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2802 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2803 <        f.completeExceptionally(new CFException());
2715 <        checkCompletedWithWrappedCFException(g);
2795 >        checkCompletedExceptionally(f, ex);
2796 >        checkCompletedNormally(g, v1);
2797 >        checkCompletedWithWrappedException(h0, ex);
2798 >        checkCompletedWithWrappedException(h1, ex);
2799 >        checkCompletedWithWrappedException(h2, ex);
2800 >        checkCompletedWithWrappedException(h3, ex);
2801 >        checkCompletedWithWrappedException(h4, ex);
2802 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2803 >    }}
2804  
2805 <        f = new CompletableFuture<>();
2806 <        f2 = new CompletableFuture<>();
2807 <        f2.completeExceptionally(new CFException());
2808 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2809 <        f.complete(one);
2810 <        checkCompletedWithWrappedCFException(g);
2811 <    }
2805 >    public void testRunAfterEither_exceptionalCompletion2() {
2806 >        for (ExecutionMode m : ExecutionMode.values())
2807 >        for (boolean fFirst : new boolean[] { true, false })
2808 >        for (Integer v1 : new Integer[] { 1, null })
2809 >    {
2810 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2811 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2812 >        final CFException ex = new CFException();
2813 >        final Noop[] rs = new Noop[6];
2814 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2815  
2816 <    /**
2817 <     * applyToEitherAsync result completes exceptionally if action does
2818 <     */
2819 <    public void testApplyToEitherAsync3E() {
2820 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2821 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2731 <        FailingFunction r = new FailingFunction();
2732 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2733 <        f.complete(one);
2734 <        checkCompletedWithWrappedCFException(g);
2735 <    }
2816 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2817 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2818 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2819 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2820 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2821 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2822  
2823 <    /**
2824 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2825 <     */
2826 <    public void testApplyToEitherAsync4E() {
2827 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2828 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2829 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2830 <        assertTrue(f.cancel(true));
2831 <        checkCompletedWithWrappedCancellationException(g);
2823 >        // unspecified behavior - both source completions available
2824 >        try {
2825 >            assertEquals(null, h0.join());
2826 >            rs[0].assertInvoked();
2827 >        } catch (CompletionException ok) {
2828 >            checkCompletedWithWrappedException(h0, ex);
2829 >            rs[0].assertNotInvoked();
2830 >        }
2831 >        try {
2832 >            assertEquals(null, h1.join());
2833 >            rs[1].assertInvoked();
2834 >        } catch (CompletionException ok) {
2835 >            checkCompletedWithWrappedException(h1, ex);
2836 >            rs[1].assertNotInvoked();
2837 >        }
2838 >        try {
2839 >            assertEquals(null, h2.join());
2840 >            rs[2].assertInvoked();
2841 >        } catch (CompletionException ok) {
2842 >            checkCompletedWithWrappedException(h2, ex);
2843 >            rs[2].assertNotInvoked();
2844 >        }
2845 >        try {
2846 >            assertEquals(null, h3.join());
2847 >            rs[3].assertInvoked();
2848 >        } catch (CompletionException ok) {
2849 >            checkCompletedWithWrappedException(h3, ex);
2850 >            rs[3].assertNotInvoked();
2851 >        }
2852  
2853 <        f = new CompletableFuture<>();
2854 <        f2 = new CompletableFuture<>();
2855 <        assertTrue(f2.cancel(true));
2750 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2751 <        checkCompletedWithWrappedCancellationException(g);
2752 <    }
2853 >        checkCompletedNormally(f, v1);
2854 >        checkCompletedExceptionally(g, ex);
2855 >    }}
2856  
2857      /**
2858 <     * acceptEitherAsync result completes normally after normal
2756 <     * completion of sources
2858 >     * runAfterEither result completes exceptionally if either source cancelled
2859       */
2860 <    public void testAcceptEitherAsyncE() {
2861 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2862 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2863 <        IncAction r = new IncAction();
2864 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2865 <        f.complete(one);
2866 <        checkCompletedNormally(g, null);
2867 <        assertEquals(r.value, 2);
2868 <
2767 <        r = new IncAction();
2768 <        f = new CompletableFuture<>();
2769 <        f.complete(one);
2770 <        f2 = new CompletableFuture<>();
2771 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2772 <        checkCompletedNormally(g, null);
2773 <        assertEquals(r.value, 2);
2774 <    }
2860 >    public void testRunAfterEither_sourceCancelled() {
2861 >        for (ExecutionMode m : ExecutionMode.values())
2862 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2863 >        for (Integer v1 : new Integer[] { 1, null })
2864 >    {
2865 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2866 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2867 >        final Noop[] rs = new Noop[6];
2868 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2869  
2870 <    /**
2871 <     * acceptEitherAsync result completes exceptionally after exceptional
2872 <     * completion of source
2873 <     */
2874 <    public void testAcceptEitherAsync2E() {
2875 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2876 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2877 <        IncAction r = new IncAction();
2878 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2879 <        f.completeExceptionally(new CFException());
2880 <        checkCompletedWithWrappedCFException(g);
2870 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2871 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2872 >        checkIncomplete(h0);
2873 >        checkIncomplete(h1);
2874 >        rs[0].assertNotInvoked();
2875 >        rs[1].assertNotInvoked();
2876 >        f.cancel(mayInterruptIfRunning);
2877 >        checkCompletedWithWrappedCancellationException(h0);
2878 >        checkCompletedWithWrappedCancellationException(h1);
2879 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2880 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2881 >        checkCompletedWithWrappedCancellationException(h2);
2882 >        checkCompletedWithWrappedCancellationException(h3);
2883 >
2884 >        assertTrue(g.complete(v1));
2885 >
2886 >        // unspecified behavior - both source completions available
2887 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2888 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2889 >        try {
2890 >            assertNull(h4.join());
2891 >            rs[4].assertInvoked();
2892 >        } catch (CompletionException ok) {
2893 >            checkCompletedWithWrappedCancellationException(h4);
2894 >            rs[4].assertNotInvoked();
2895 >        }
2896 >        try {
2897 >            assertNull(h5.join());
2898 >            rs[5].assertInvoked();
2899 >        } catch (CompletionException ok) {
2900 >            checkCompletedWithWrappedCancellationException(h5);
2901 >            rs[5].assertNotInvoked();
2902 >        }
2903  
2904 <        r = new IncAction();
2905 <        f = new CompletableFuture<>();
2906 <        f2 = new CompletableFuture<>();
2907 <        f2.completeExceptionally(new CFException());
2908 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2909 <        f.complete(one);
2910 <        checkCompletedWithWrappedCFException(g);
2911 <    }
2904 >        checkCancelled(f);
2905 >        checkCompletedNormally(g, v1);
2906 >        checkCompletedWithWrappedCancellationException(h0);
2907 >        checkCompletedWithWrappedCancellationException(h1);
2908 >        checkCompletedWithWrappedCancellationException(h2);
2909 >        checkCompletedWithWrappedCancellationException(h3);
2910 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2911 >    }}
2912  
2913      /**
2914 <     * acceptEitherAsync result completes exceptionally if action does
2914 >     * runAfterEither result completes exceptionally if action does
2915       */
2916 <    public void testAcceptEitherAsync3E() {
2917 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2918 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2919 <        FailingConsumer r = new FailingConsumer();
2920 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2921 <        f.complete(one);
2922 <        checkCompletedWithWrappedCFException(g);
2923 <    }
2916 >    public void testRunAfterEither_actionFailed() {
2917 >        for (ExecutionMode m : ExecutionMode.values())
2918 >        for (Integer v1 : new Integer[] { 1, null })
2919 >        for (Integer v2 : new Integer[] { 2, null })
2920 >    {
2921 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2922 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2923 >        final FailingRunnable[] rs = new FailingRunnable[6];
2924 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2925  
2926 <    /**
2927 <     * acceptEitherAsync result completes exceptionally if either
2928 <     * source cancelled
2929 <     */
2930 <    public void testAcceptEitherAsync4E() {
2931 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2932 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2933 <        IncAction r = new IncAction();
2934 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2935 <        assertTrue(f.cancel(true));
2936 <        checkCompletedWithWrappedCancellationException(g);
2926 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2927 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2928 >        assertTrue(f.complete(v1));
2929 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2930 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2931 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2932 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2933 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2934 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2935 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2936 >        assertTrue(g.complete(v2));
2937 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2938 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2939 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2940 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2941  
2942 <        r = new IncAction();
2943 <        f = new CompletableFuture<>();
2944 <        f2 = new CompletableFuture<>();
2945 <        assertTrue(f2.cancel(true));
2825 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2826 <        checkCompletedWithWrappedCancellationException(g);
2827 <    }
2942 >        checkCompletedNormally(f, v1);
2943 >        checkCompletedNormally(g, v2);
2944 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2945 >    }}
2946  
2947      /**
2948 <     * runAfterEitherAsync result completes normally after normal
2831 <     * completion of sources
2948 >     * thenCompose result completes normally after normal completion of source
2949       */
2950 <    public void testRunAfterEitherAsyncE() {
2951 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2952 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2953 <        Noop r = new Noop();
2954 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2955 <        f.complete(one);
2956 <        checkCompletedNormally(g, null);
2957 <        assertTrue(r.ran);
2950 >    public void testThenCompose_normalCompletion() {
2951 >        for (ExecutionMode m : ExecutionMode.values())
2952 >        for (boolean createIncomplete : new boolean[] { true, false })
2953 >        for (Integer v1 : new Integer[] { 1, null })
2954 >    {
2955 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2956 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2957 >        if (!createIncomplete) assertTrue(f.complete(v1));
2958 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2959 >        if (createIncomplete) assertTrue(f.complete(v1));
2960  
2961 <        r = new Noop();
2962 <        f = new CompletableFuture<>();
2963 <        f.complete(one);
2964 <        f2 = new CompletableFuture<>();
2846 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2847 <        checkCompletedNormally(g, null);
2848 <        assertTrue(r.ran);
2849 <    }
2961 >        checkCompletedNormally(g, inc(v1));
2962 >        checkCompletedNormally(f, v1);
2963 >        r.assertValue(v1);
2964 >    }}
2965  
2966      /**
2967 <     * runAfterEitherAsync result completes exceptionally after exceptional
2967 >     * thenCompose result completes exceptionally after exceptional
2968       * completion of source
2969       */
2970 <    public void testRunAfterEitherAsync2E() {
2971 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2972 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2973 <        Noop r = new Noop();
2974 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2975 <        f.completeExceptionally(new CFException());
2976 <        checkCompletedWithWrappedCFException(g);
2977 <
2978 <        r = new Noop();
2979 <        f = new CompletableFuture<>();
2980 <        f2 = new CompletableFuture<>();
2981 <        f2.completeExceptionally(new CFException());
2982 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2983 <        f.complete(one);
2984 <        checkCompletedWithWrappedCFException(g);
2870 <    }
2871 <
2872 <    /**
2873 <     * runAfterEitherAsync result completes exceptionally if action does
2874 <     */
2875 <    public void testRunAfterEitherAsync3E() {
2876 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2877 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2878 <        FailingNoop r = new FailingNoop();
2879 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2880 <        f.complete(one);
2881 <        checkCompletedWithWrappedCFException(g);
2882 <    }
2970 >    public void testThenCompose_exceptionalCompletion() {
2971 >        for (ExecutionMode m : ExecutionMode.values())
2972 >        for (boolean createIncomplete : new boolean[] { true, false })
2973 >    {
2974 >        final CFException ex = new CFException();
2975 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2976 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2977 >        if (!createIncomplete) f.completeExceptionally(ex);
2978 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2979 >        if (createIncomplete) f.completeExceptionally(ex);
2980 >
2981 >        checkCompletedWithWrappedException(g, ex);
2982 >        checkCompletedExceptionally(f, ex);
2983 >        r.assertNotInvoked();
2984 >    }}
2985  
2986      /**
2987 <     * runAfterEitherAsync result completes exceptionally if either
2886 <     * source cancelled
2987 >     * thenCompose result completes exceptionally if action does
2988       */
2989 <    public void testRunAfterEitherAsync4E() {
2990 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2991 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2992 <        Noop r = new Noop();
2993 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2994 <        assertTrue(f.cancel(true));
2995 <        checkCompletedWithWrappedCancellationException(g);
2989 >    public void testThenCompose_actionFailed() {
2990 >        for (ExecutionMode m : ExecutionMode.values())
2991 >        for (boolean createIncomplete : new boolean[] { true, false })
2992 >        for (Integer v1 : new Integer[] { 1, null })
2993 >    {
2994 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2995 >        final FailingCompletableFutureFunction r
2996 >            = new FailingCompletableFutureFunction(m);
2997 >        if (!createIncomplete) assertTrue(f.complete(v1));
2998 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2999 >        if (createIncomplete) assertTrue(f.complete(v1));
3000  
3001 <        r = new Noop();
3002 <        f = new CompletableFuture<>();
3003 <        f2 = new CompletableFuture<>();
2899 <        assertTrue(f2.cancel(true));
2900 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2901 <        checkCompletedWithWrappedCancellationException(g);
2902 <    }
3001 >        checkCompletedWithWrappedException(g, r.ex);
3002 >        checkCompletedNormally(f, v1);
3003 >    }}
3004  
3005      /**
3006 <     * thenComposeAsync result completes normally after normal
2906 <     * completion of source
3006 >     * thenCompose result completes exceptionally if source cancelled
3007       */
3008 <    public void testThenComposeAsyncE() {
3009 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3010 <        CompletableFutureInc r = new CompletableFutureInc();
3011 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3012 <        f.complete(one);
3013 <        checkCompletedNormally(g, two);
3014 <    }
3008 >    public void testThenCompose_sourceCancelled() {
3009 >        for (ExecutionMode m : ExecutionMode.values())
3010 >        for (boolean createIncomplete : new boolean[] { true, false })
3011 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3012 >    {
3013 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3014 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3015 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3016 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3017 >        if (createIncomplete) {
3018 >            checkIncomplete(g);
3019 >            assertTrue(f.cancel(mayInterruptIfRunning));
3020 >        }
3021  
3022 <    /**
3023 <     * thenComposeAsync result completes exceptionally after
3024 <     * exceptional completion of source
2919 <     */
2920 <    public void testThenComposeAsync2E() {
2921 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2922 <        CompletableFutureInc r = new CompletableFutureInc();
2923 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2924 <        f.completeExceptionally(new CFException());
2925 <        checkCompletedWithWrappedCFException(g);
2926 <    }
3022 >        checkCompletedWithWrappedCancellationException(g);
3023 >        checkCancelled(f);
3024 >    }}
3025  
3026      /**
3027 <     * thenComposeAsync result completes exceptionally if action does
3027 >     * thenCompose result completes exceptionally if the result of the action does
3028       */
3029 <    public void testThenComposeAsync3E() {
3030 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3031 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3032 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3033 <        f.complete(one);
3034 <        checkCompletedWithWrappedCFException(g);
3035 <    }
3029 >    public void testThenCompose_actionReturnsFailingFuture() {
3030 >        for (ExecutionMode m : ExecutionMode.values())
3031 >        for (int order = 0; order < 6; order++)
3032 >        for (Integer v1 : new Integer[] { 1, null })
3033 >    {
3034 >        final CFException ex = new CFException();
3035 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3036 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3037 >        final CompletableFuture<Integer> h;
3038 >        // Test all permutations of orders
3039 >        switch (order) {
3040 >        case 0:
3041 >            assertTrue(f.complete(v1));
3042 >            assertTrue(g.completeExceptionally(ex));
3043 >            h = m.thenCompose(f, (x -> g));
3044 >            break;
3045 >        case 1:
3046 >            assertTrue(f.complete(v1));
3047 >            h = m.thenCompose(f, (x -> g));
3048 >            assertTrue(g.completeExceptionally(ex));
3049 >            break;
3050 >        case 2:
3051 >            assertTrue(g.completeExceptionally(ex));
3052 >            assertTrue(f.complete(v1));
3053 >            h = m.thenCompose(f, (x -> g));
3054 >            break;
3055 >        case 3:
3056 >            assertTrue(g.completeExceptionally(ex));
3057 >            h = m.thenCompose(f, (x -> g));
3058 >            assertTrue(f.complete(v1));
3059 >            break;
3060 >        case 4:
3061 >            h = m.thenCompose(f, (x -> g));
3062 >            assertTrue(f.complete(v1));
3063 >            assertTrue(g.completeExceptionally(ex));
3064 >            break;
3065 >        case 5:
3066 >            h = m.thenCompose(f, (x -> g));
3067 >            assertTrue(f.complete(v1));
3068 >            assertTrue(g.completeExceptionally(ex));
3069 >            break;
3070 >        default: throw new AssertionError();
3071 >        }
3072  
3073 <    /**
3074 <     * thenComposeAsync result completes exceptionally if source cancelled
3075 <     */
3076 <    public void testThenComposeAsync4E() {
2943 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2944 <        CompletableFutureInc r = new CompletableFutureInc();
2945 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2946 <        assertTrue(f.cancel(true));
2947 <        checkCompletedWithWrappedCancellationException(g);
2948 <    }
3073 >        checkCompletedExceptionally(g, ex);
3074 >        checkCompletedWithWrappedException(h, ex);
3075 >        checkCompletedNormally(f, v1);
3076 >    }}
3077  
3078      // other static methods
3079  
# Line 2963 | Line 3091 | public class CompletableFutureTest exten
3091       * when all components complete normally
3092       */
3093      public void testAllOf_normal() throws Exception {
3094 <        for (int k = 1; k < 20; ++k) {
3095 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3096 <            for (int i = 0; i < k; ++i)
3094 >        for (int k = 1; k < 10; k++) {
3095 >            CompletableFuture<Integer>[] fs
3096 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3097 >            for (int i = 0; i < k; i++)
3098                  fs[i] = new CompletableFuture<>();
3099              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3100 <            for (int i = 0; i < k; ++i) {
3100 >            for (int i = 0; i < k; i++) {
3101                  checkIncomplete(f);
3102                  checkIncomplete(CompletableFuture.allOf(fs));
3103                  fs[i].complete(one);
# Line 2978 | Line 3107 | public class CompletableFutureTest exten
3107          }
3108      }
3109  
3110 +    public void testAllOf_normal_backwards() throws Exception {
3111 +        for (int k = 1; k < 10; k++) {
3112 +            CompletableFuture<Integer>[] fs
3113 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3114 +            for (int i = 0; i < k; i++)
3115 +                fs[i] = new CompletableFuture<>();
3116 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3117 +            for (int i = k - 1; i >= 0; i--) {
3118 +                checkIncomplete(f);
3119 +                checkIncomplete(CompletableFuture.allOf(fs));
3120 +                fs[i].complete(one);
3121 +            }
3122 +            checkCompletedNormally(f, null);
3123 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3124 +        }
3125 +    }
3126 +
3127 +    public void testAllOf_exceptional() throws Exception {
3128 +        for (int k = 1; k < 10; k++) {
3129 +            CompletableFuture<Integer>[] fs
3130 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3131 +            CFException ex = new CFException();
3132 +            for (int i = 0; i < k; i++)
3133 +                fs[i] = new CompletableFuture<>();
3134 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3135 +            for (int i = 0; i < k; i++) {
3136 +                checkIncomplete(f);
3137 +                checkIncomplete(CompletableFuture.allOf(fs));
3138 +                if (i != k / 2) {
3139 +                    fs[i].complete(i);
3140 +                    checkCompletedNormally(fs[i], i);
3141 +                } else {
3142 +                    fs[i].completeExceptionally(ex);
3143 +                    checkCompletedExceptionally(fs[i], ex);
3144 +                }
3145 +            }
3146 +            checkCompletedWithWrappedException(f, ex);
3147 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3148 +        }
3149 +    }
3150 +
3151      /**
3152       * anyOf(no component futures) returns an incomplete future
3153       */
3154      public void testAnyOf_empty() throws Exception {
3155 +        for (Integer v1 : new Integer[] { 1, null })
3156 +    {
3157          CompletableFuture<Object> f = CompletableFuture.anyOf();
3158          checkIncomplete(f);
3159 <    }
3159 >
3160 >        f.complete(v1);
3161 >        checkCompletedNormally(f, v1);
3162 >    }}
3163  
3164      /**
3165       * anyOf returns a future completed normally with a value when
3166       * a component future does
3167       */
3168      public void testAnyOf_normal() throws Exception {
3169 <        for (int k = 0; k < 10; ++k) {
3169 >        for (int k = 0; k < 10; k++) {
3170              CompletableFuture[] fs = new CompletableFuture[k];
3171 <            for (int i = 0; i < k; ++i)
3171 >            for (int i = 0; i < k; i++)
3172                  fs[i] = new CompletableFuture<>();
3173              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3174              checkIncomplete(f);
3175 <            for (int i = 0; i < k; ++i) {
3176 <                fs[i].complete(one);
3177 <                checkCompletedNormally(f, one);
3178 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3175 >            for (int i = 0; i < k; i++) {
3176 >                fs[i].complete(i);
3177 >                checkCompletedNormally(f, 0);
3178 >                int x = (int) CompletableFuture.anyOf(fs).join();
3179 >                assertTrue(0 <= x && x <= i);
3180 >            }
3181 >        }
3182 >    }
3183 >    public void testAnyOf_normal_backwards() throws Exception {
3184 >        for (int k = 0; k < 10; k++) {
3185 >            CompletableFuture[] fs = new CompletableFuture[k];
3186 >            for (int i = 0; i < k; i++)
3187 >                fs[i] = new CompletableFuture<>();
3188 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3189 >            checkIncomplete(f);
3190 >            for (int i = k - 1; i >= 0; i--) {
3191 >                fs[i].complete(i);
3192 >                checkCompletedNormally(f, k - 1);
3193 >                int x = (int) CompletableFuture.anyOf(fs).join();
3194 >                assertTrue(i <= x && x <= k - 1);
3195              }
3196          }
3197      }
# Line 3009 | Line 3200 | public class CompletableFutureTest exten
3200       * anyOf result completes exceptionally when any component does.
3201       */
3202      public void testAnyOf_exceptional() throws Exception {
3203 <        for (int k = 0; k < 10; ++k) {
3203 >        for (int k = 0; k < 10; k++) {
3204              CompletableFuture[] fs = new CompletableFuture[k];
3205 <            for (int i = 0; i < k; ++i)
3205 >            CFException[] exs = new CFException[k];
3206 >            for (int i = 0; i < k; i++) {
3207                  fs[i] = new CompletableFuture<>();
3208 +                exs[i] = new CFException();
3209 +            }
3210              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3211              checkIncomplete(f);
3212 <            for (int i = 0; i < k; ++i) {
3213 <                fs[i].completeExceptionally(new CFException());
3214 <                checkCompletedWithWrappedCFException(f);
3212 >            for (int i = 0; i < k; i++) {
3213 >                fs[i].completeExceptionally(exs[i]);
3214 >                checkCompletedWithWrappedException(f, exs[0]);
3215 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3216 >            }
3217 >        }
3218 >    }
3219 >
3220 >    public void testAnyOf_exceptional_backwards() throws Exception {
3221 >        for (int k = 0; k < 10; k++) {
3222 >            CompletableFuture[] fs = new CompletableFuture[k];
3223 >            CFException[] exs = new CFException[k];
3224 >            for (int i = 0; i < k; i++) {
3225 >                fs[i] = new CompletableFuture<>();
3226 >                exs[i] = new CFException();
3227 >            }
3228 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3229 >            checkIncomplete(f);
3230 >            for (int i = k - 1; i >= 0; i--) {
3231 >                fs[i].completeExceptionally(exs[i]);
3232 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3233                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3234              }
3235          }
# Line 3030 | Line 3242 | public class CompletableFutureTest exten
3242          CompletableFuture<Integer> f = new CompletableFuture<>();
3243          CompletableFuture<Integer> g = new CompletableFuture<>();
3244          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3033        CompletableFuture<?> h;
3245          ThreadExecutor exec = new ThreadExecutor();
3246  
3247          Runnable[] throwingActions = {
3248              () -> CompletableFuture.supplyAsync(null),
3249              () -> CompletableFuture.supplyAsync(null, exec),
3250 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3250 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3251  
3252              () -> CompletableFuture.runAsync(null),
3253              () -> CompletableFuture.runAsync(null, exec),
# Line 3046 | Line 3257 | public class CompletableFutureTest exten
3257  
3258              () -> f.thenApply(null),
3259              () -> f.thenApplyAsync(null),
3260 <            () -> f.thenApplyAsync((x) -> x, null),
3260 >            () -> f.thenApplyAsync(x -> x, null),
3261              () -> f.thenApplyAsync(null, exec),
3262  
3263              () -> f.thenAccept(null),
3264              () -> f.thenAcceptAsync(null),
3265 <            () -> f.thenAcceptAsync((x) -> {} , null),
3265 >            () -> f.thenAcceptAsync(x -> {} , null),
3266              () -> f.thenAcceptAsync(null, exec),
3267  
3268              () -> f.thenRun(null),
# Line 3086 | Line 3297 | public class CompletableFutureTest exten
3297              () -> f.applyToEither(g, null),
3298              () -> f.applyToEitherAsync(g, null),
3299              () -> f.applyToEitherAsync(g, null, exec),
3300 <            () -> f.applyToEither(nullFuture, (x) -> x),
3301 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3302 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3303 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3300 >            () -> f.applyToEither(nullFuture, x -> x),
3301 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3302 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3303 >            () -> f.applyToEitherAsync(g, x -> x, null),
3304  
3305              () -> f.acceptEither(g, null),
3306              () -> f.acceptEitherAsync(g, null),
3307              () -> f.acceptEitherAsync(g, null, exec),
3308 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3309 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3310 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3311 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3308 >            () -> f.acceptEither(nullFuture, x -> {}),
3309 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3310 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3311 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3312  
3313              () -> f.runAfterEither(g, null),
3314              () -> f.runAfterEitherAsync(g, null),
# Line 3109 | Line 3320 | public class CompletableFutureTest exten
3320  
3321              () -> f.thenCompose(null),
3322              () -> f.thenComposeAsync(null),
3323 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3323 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3324              () -> f.thenComposeAsync(null, exec),
3325  
3326              () -> f.exceptionally(null),
# Line 3127 | Line 3338 | public class CompletableFutureTest exten
3338              () -> CompletableFuture.anyOf(null, f),
3339  
3340              () -> f.obtrudeException(null),
3341 +
3342 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3343 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3344 +            () -> CompletableFuture.delayedExecutor(1L, null),
3345 +
3346 +            () -> f.orTimeout(1L, null),
3347 +            () -> f.completeOnTimeout(42, 1L, null),
3348 +
3349 +            () -> CompletableFuture.failedFuture(null),
3350 +            () -> CompletableFuture.failedStage(null),
3351          };
3352  
3353          assertThrows(NullPointerException.class, throwingActions);
# Line 3134 | Line 3355 | public class CompletableFutureTest exten
3355      }
3356  
3357      /**
3358 +     * Test submissions to an executor that rejects all tasks.
3359 +     */
3360 +    public void testRejectingExecutor() {
3361 +        for (Integer v : new Integer[] { 1, null })
3362 +    {
3363 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3364 +
3365 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3366 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3367 +
3368 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3369 +
3370 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3371 +        srcs.add(complete);
3372 +        srcs.add(incomplete);
3373 +
3374 +        for (CompletableFuture<Integer> src : srcs) {
3375 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3376 +            fs.add(src.thenRunAsync(() -> {}, e));
3377 +            fs.add(src.thenAcceptAsync(z -> {}, e));
3378 +            fs.add(src.thenApplyAsync(z -> z, e));
3379 +
3380 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3381 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3382 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3383 +
3384 +            fs.add(src.applyToEitherAsync(src, z -> z, e));
3385 +            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3386 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3387 +
3388 +            fs.add(src.thenComposeAsync(z -> null, e));
3389 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3390 +            fs.add(src.handleAsync((z, t) -> null, e));
3391 +
3392 +            for (CompletableFuture<?> future : fs) {
3393 +                if (src.isDone())
3394 +                    checkCompletedWithWrappedException(future, e.ex);
3395 +                else
3396 +                    checkIncomplete(future);
3397 +            }
3398 +            futures.addAll(fs);
3399 +        }
3400 +
3401 +        {
3402 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3403 +
3404 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3405 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3406 +
3407 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3408 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3409 +
3410 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3411 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3412 +
3413 +            for (CompletableFuture<?> future : fs)
3414 +                checkIncomplete(future);
3415 +            futures.addAll(fs);
3416 +        }
3417 +
3418 +        {
3419 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3420 +
3421 +            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3422 +            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3423 +
3424 +            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3425 +            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3426 +
3427 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3428 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3429 +
3430 +            for (CompletableFuture<?> future : fs)
3431 +                checkCompletedWithWrappedException(future, e.ex);
3432 +            futures.addAll(fs);
3433 +        }
3434 +
3435 +        incomplete.complete(v);
3436 +
3437 +        for (CompletableFuture<?> future : futures)
3438 +            checkCompletedWithWrappedException(future, e.ex);
3439 +
3440 +        assertEquals(futures.size(), e.count.get());
3441 +    }}
3442 +
3443 +    /**
3444 +     * Test submissions to an executor that rejects all tasks, but
3445 +     * should never be invoked because the dependent future is
3446 +     * explicitly completed.
3447 +     */
3448 +    public void testRejectingExecutorNeverInvoked() {
3449 +        for (Integer v : new Integer[] { 1, null })
3450 +    {
3451 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3452 +
3453 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3454 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3455 +
3456 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3457 +
3458 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3459 +        srcs.add(complete);
3460 +        srcs.add(incomplete);
3461 +
3462 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3463 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3464 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3465 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3466 +
3467 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3468 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3469 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3470 +
3471 +        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3472 +        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3473 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3474 +
3475 +        fs.add(incomplete.thenComposeAsync(z -> null, e));
3476 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3477 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3478 +
3479 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3480 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3481 +
3482 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3483 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3484 +
3485 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3486 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3487 +
3488 +        for (CompletableFuture<?> future : fs)
3489 +            checkIncomplete(future);
3490 +
3491 +        for (CompletableFuture<?> future : fs)
3492 +            future.complete(null);
3493 +
3494 +        incomplete.complete(v);
3495 +
3496 +        for (CompletableFuture<?> future : fs)
3497 +            checkCompletedNormally(future, null);
3498 +
3499 +        assertEquals(0, e.count.get());
3500 +    }}
3501 +
3502 +    /**
3503       * toCompletableFuture returns this CompletableFuture.
3504       */
3505      public void testToCompletableFuture() {
# Line 3141 | Line 3507 | public class CompletableFutureTest exten
3507          assertSame(f, f.toCompletableFuture());
3508      }
3509  
3510 +    // jdk9
3511 +
3512      /**
3513 <     * whenComplete action executes on normal completion, propagating
3146 <     * source result.
3513 >     * newIncompleteFuture returns an incomplete CompletableFuture
3514       */
3515 <    public void testWhenComplete1() {
3516 <        final AtomicInteger a = new AtomicInteger();
3515 >    public void testNewIncompleteFuture() {
3516 >        for (Integer v1 : new Integer[] { 1, null })
3517 >    {
3518          CompletableFuture<Integer> f = new CompletableFuture<>();
3519 <        CompletableFuture<Integer> g =
3520 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3521 <        f.complete(three);
3522 <        checkCompletedNormally(f, three);
3523 <        checkCompletedNormally(g, three);
3524 <        assertEquals(a.get(), 1);
3519 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3520 >        checkIncomplete(f);
3521 >        checkIncomplete(g);
3522 >        f.complete(v1);
3523 >        checkCompletedNormally(f, v1);
3524 >        checkIncomplete(g);
3525 >        g.complete(v1);
3526 >        checkCompletedNormally(g, v1);
3527 >        assertSame(g.getClass(), CompletableFuture.class);
3528 >    }}
3529 >
3530 >    /**
3531 >     * completedStage returns a completed CompletionStage
3532 >     */
3533 >    public void testCompletedStage() {
3534 >        AtomicInteger x = new AtomicInteger(0);
3535 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3536 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3537 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3538 >        assertEquals(x.get(), 1);
3539 >        assertNull(r.get());
3540      }
3541  
3542      /**
3543 <     * whenComplete action executes on exceptional completion, propagating
3544 <     * source result.
3543 >     * defaultExecutor by default returns the commonPool if
3544 >     * it supports more than one thread.
3545       */
3546 <    public void testWhenComplete2() {
3164 <        final AtomicInteger a = new AtomicInteger();
3546 >    public void testDefaultExecutor() {
3547          CompletableFuture<Integer> f = new CompletableFuture<>();
3548 <        CompletableFuture<Integer> g =
3549 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3550 <        f.completeExceptionally(new CFException());
3551 <        assertTrue(f.isCompletedExceptionally());
3552 <        assertTrue(g.isCompletedExceptionally());
3553 <        assertEquals(a.get(), 1);
3548 >        Executor e = f.defaultExecutor();
3549 >        Executor c = ForkJoinPool.commonPool();
3550 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3551 >            assertSame(e, c);
3552 >        else
3553 >            assertNotSame(e, c);
3554      }
3555  
3556      /**
3557 <     * If a whenComplete action throws an exception when triggered by
3558 <     * a normal completion, it completes exceptionally
3557 >     * failedFuture returns a CompletableFuture completed
3558 >     * exceptionally with the given Exception
3559 >     */
3560 >    public void testFailedFuture() {
3561 >        CFException ex = new CFException();
3562 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3563 >        checkCompletedExceptionally(f, ex);
3564 >    }
3565 >
3566 >    /**
3567 >     * failedFuture(null) throws NPE
3568       */
3569 <    public void testWhenComplete3() {
3569 >    public void testFailedFuture_null() {
3570 >        try {
3571 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3572 >            shouldThrow();
3573 >        } catch (NullPointerException success) {}
3574 >    }
3575 >
3576 >    /**
3577 >     * copy returns a CompletableFuture that is completed normally,
3578 >     * with the same value, when source is.
3579 >     */
3580 >    public void testCopy_normalCompletion() {
3581 >        for (boolean createIncomplete : new boolean[] { true, false })
3582 >        for (Integer v1 : new Integer[] { 1, null })
3583 >    {
3584          CompletableFuture<Integer> f = new CompletableFuture<>();
3585 <        CompletableFuture<Integer> g =
3586 <            f.whenComplete((Integer x, Throwable t) ->
3587 <                           { throw new CFException(); } );
3588 <        f.complete(three);
3589 <        checkCompletedNormally(f, three);
3590 <        assertTrue(g.isCompletedExceptionally());
3591 <        checkCompletedWithWrappedCFException(g);
3585 >        if (!createIncomplete) assertTrue(f.complete(v1));
3586 >        CompletableFuture<Integer> g = f.copy();
3587 >        if (createIncomplete) {
3588 >            checkIncomplete(f);
3589 >            checkIncomplete(g);
3590 >            assertTrue(f.complete(v1));
3591 >        }
3592 >        checkCompletedNormally(f, v1);
3593 >        checkCompletedNormally(g, v1);
3594 >    }}
3595 >
3596 >    /**
3597 >     * copy returns a CompletableFuture that is completed exceptionally
3598 >     * when source is.
3599 >     */
3600 >    public void testCopy_exceptionalCompletion() {
3601 >        for (boolean createIncomplete : new boolean[] { true, false })
3602 >    {
3603 >        CFException ex = new CFException();
3604 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3605 >        if (!createIncomplete) f.completeExceptionally(ex);
3606 >        CompletableFuture<Integer> g = f.copy();
3607 >        if (createIncomplete) {
3608 >            checkIncomplete(f);
3609 >            checkIncomplete(g);
3610 >            f.completeExceptionally(ex);
3611 >        }
3612 >        checkCompletedExceptionally(f, ex);
3613 >        checkCompletedWithWrappedException(g, ex);
3614 >    }}
3615 >
3616 >    /**
3617 >     * Completion of a copy does not complete its source.
3618 >     */
3619 >    public void testCopy_oneWayPropagation() {
3620 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3621 >        assertTrue(f.copy().complete(1));
3622 >        assertTrue(f.copy().complete(null));
3623 >        assertTrue(f.copy().cancel(true));
3624 >        assertTrue(f.copy().cancel(false));
3625 >        assertTrue(f.copy().completeExceptionally(new CFException()));
3626 >        checkIncomplete(f);
3627      }
3628  
3629      /**
3630 <     * whenCompleteAsync action executes on normal completion, propagating
3631 <     * source result.
3630 >     * minimalCompletionStage returns a CompletableFuture that is
3631 >     * completed normally, with the same value, when source is.
3632       */
3633 <    public void testWhenCompleteAsync1() {
3194 <        final AtomicInteger a = new AtomicInteger();
3633 >    public void testMinimalCompletionStage() {
3634          CompletableFuture<Integer> f = new CompletableFuture<>();
3635 <        CompletableFuture<Integer> g =
3636 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3637 <        f.complete(three);
3638 <        checkCompletedNormally(f, three);
3639 <        checkCompletedNormally(g, three);
3640 <        assertEquals(a.get(), 1);
3635 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3636 >        AtomicInteger x = new AtomicInteger(0);
3637 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3638 >        checkIncomplete(f);
3639 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3640 >        f.complete(1);
3641 >        checkCompletedNormally(f, 1);
3642 >        assertEquals(x.get(), 1);
3643 >        assertNull(r.get());
3644      }
3645  
3646      /**
3647 <     * whenCompleteAsync action executes on exceptional completion, propagating
3648 <     * source result.
3647 >     * minimalCompletionStage returns a CompletableFuture that is
3648 >     * completed exceptionally when source is.
3649       */
3650 <    public void testWhenCompleteAsync2() {
3209 <        final AtomicInteger a = new AtomicInteger();
3650 >    public void testMinimalCompletionStage2() {
3651          CompletableFuture<Integer> f = new CompletableFuture<>();
3652 <        CompletableFuture<Integer> g =
3653 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3654 <        f.completeExceptionally(new CFException());
3655 <        checkCompletedWithWrappedCFException(f);
3656 <        checkCompletedWithWrappedCFException(g);
3652 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3653 >        AtomicInteger x = new AtomicInteger(0);
3654 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3655 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3656 >        checkIncomplete(f);
3657 >        CFException ex = new CFException();
3658 >        f.completeExceptionally(ex);
3659 >        checkCompletedExceptionally(f, ex);
3660 >        assertEquals(x.get(), 0);
3661 >        assertEquals(r.get().getCause(), ex);
3662 >    }
3663 >
3664 >    /**
3665 >     * failedStage returns a CompletionStage completed
3666 >     * exceptionally with the given Exception
3667 >     */
3668 >    public void testFailedStage() {
3669 >        CFException ex = new CFException();
3670 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3671 >        AtomicInteger x = new AtomicInteger(0);
3672 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3673 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3674 >        assertEquals(x.get(), 0);
3675 >        assertEquals(r.get(), ex);
3676      }
3677  
3678      /**
3679 <     * If a whenCompleteAsync action throws an exception when
3220 <     * triggered by a normal completion, it completes exceptionally
3679 >     * completeAsync completes with value of given supplier
3680       */
3681 <    public void testWhenCompleteAsync3() {
3681 >    public void testCompleteAsync() {
3682 >        for (Integer v1 : new Integer[] { 1, null })
3683 >    {
3684          CompletableFuture<Integer> f = new CompletableFuture<>();
3685 <        CompletableFuture<Integer> g =
3686 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3687 <                           { throw new CFException(); } );
3688 <        f.complete(three);
3689 <        checkCompletedNormally(f, three);
3690 <        checkCompletedWithWrappedCFException(g);
3685 >        f.completeAsync(() -> v1);
3686 >        f.join();
3687 >        checkCompletedNormally(f, v1);
3688 >    }}
3689 >
3690 >    /**
3691 >     * completeAsync completes exceptionally if given supplier throws
3692 >     */
3693 >    public void testCompleteAsync2() {
3694 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3695 >        CFException ex = new CFException();
3696 >        f.completeAsync(() -> { throw ex; });
3697 >        try {
3698 >            f.join();
3699 >            shouldThrow();
3700 >        } catch (CompletionException success) {}
3701 >        checkCompletedWithWrappedException(f, ex);
3702      }
3703  
3704      /**
3705 <     * whenCompleteAsync action executes on normal completion, propagating
3234 <     * source result.
3705 >     * completeAsync with given executor completes with value of given supplier
3706       */
3707 <    public void testWhenCompleteAsync1e() {
3708 <        final AtomicInteger a = new AtomicInteger();
3709 <        ThreadExecutor exec = new ThreadExecutor();
3707 >    public void testCompleteAsync3() {
3708 >        for (Integer v1 : new Integer[] { 1, null })
3709 >    {
3710          CompletableFuture<Integer> f = new CompletableFuture<>();
3711 <        CompletableFuture<Integer> g =
3712 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3713 <                                exec);
3714 <        f.complete(three);
3715 <        checkCompletedNormally(f, three);
3716 <        checkCompletedNormally(g, three);
3717 <        assertEquals(a.get(), 1);
3711 >        ThreadExecutor executor = new ThreadExecutor();
3712 >        f.completeAsync(() -> v1, executor);
3713 >        assertSame(v1, f.join());
3714 >        checkCompletedNormally(f, v1);
3715 >        assertEquals(1, executor.count.get());
3716 >    }}
3717 >
3718 >    /**
3719 >     * completeAsync with given executor completes exceptionally if
3720 >     * given supplier throws
3721 >     */
3722 >    public void testCompleteAsync4() {
3723 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3724 >        CFException ex = new CFException();
3725 >        ThreadExecutor executor = new ThreadExecutor();
3726 >        f.completeAsync(() -> { throw ex; }, executor);
3727 >        try {
3728 >            f.join();
3729 >            shouldThrow();
3730 >        } catch (CompletionException success) {}
3731 >        checkCompletedWithWrappedException(f, ex);
3732 >        assertEquals(1, executor.count.get());
3733      }
3734  
3735      /**
3736 <     * whenCompleteAsync action executes on exceptional completion, propagating
3251 <     * source result.
3736 >     * orTimeout completes with TimeoutException if not complete
3737       */
3738 <    public void testWhenCompleteAsync2e() {
3739 <        final AtomicInteger a = new AtomicInteger();
3255 <        ThreadExecutor exec = new ThreadExecutor();
3738 >    public void testOrTimeout_timesOut() {
3739 >        long timeoutMillis = timeoutMillis();
3740          CompletableFuture<Integer> f = new CompletableFuture<>();
3741 <        CompletableFuture<Integer> g =
3742 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3743 <                                exec);
3744 <        f.completeExceptionally(new CFException());
3261 <        checkCompletedWithWrappedCFException(f);
3262 <        checkCompletedWithWrappedCFException(g);
3741 >        long startTime = System.nanoTime();
3742 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3743 >        checkCompletedWithTimeoutException(f);
3744 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3745      }
3746  
3747      /**
3748 <     * If a whenCompleteAsync action throws an exception when triggered
3267 <     * by a normal completion, it completes exceptionally
3748 >     * orTimeout completes normally if completed before timeout
3749       */
3750 <    public void testWhenCompleteAsync3e() {
3751 <        ThreadExecutor exec = new ThreadExecutor();
3750 >    public void testOrTimeout_completed() {
3751 >        for (Integer v1 : new Integer[] { 1, null })
3752 >    {
3753 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3754 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3755 >        long startTime = System.nanoTime();
3756 >        f.complete(v1);
3757 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3758 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3759 >        g.complete(v1);
3760 >        checkCompletedNormally(f, v1);
3761 >        checkCompletedNormally(g, v1);
3762 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3763 >    }}
3764 >
3765 >    /**
3766 >     * completeOnTimeout completes with given value if not complete
3767 >     */
3768 >    public void testCompleteOnTimeout_timesOut() {
3769 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3770 >                       () -> testCompleteOnTimeout_timesOut(null));
3771 >    }
3772 >
3773 >    /**
3774 >     * completeOnTimeout completes with given value if not complete
3775 >     */
3776 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3777 >        long timeoutMillis = timeoutMillis();
3778          CompletableFuture<Integer> f = new CompletableFuture<>();
3779 +        long startTime = System.nanoTime();
3780 +        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3781 +        assertSame(v, f.join());
3782 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3783 +        f.complete(99);         // should have no effect
3784 +        checkCompletedNormally(f, v);
3785 +    }
3786 +
3787 +    /**
3788 +     * completeOnTimeout has no effect if completed within timeout
3789 +     */
3790 +    public void testCompleteOnTimeout_completed() {
3791 +        for (Integer v1 : new Integer[] { 1, null })
3792 +    {
3793 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3794 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3795 +        long startTime = System.nanoTime();
3796 +        f.complete(v1);
3797 +        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3798 +        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3799 +        g.complete(v1);
3800 +        checkCompletedNormally(f, v1);
3801 +        checkCompletedNormally(g, v1);
3802 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3803 +    }}
3804 +
3805 +    /**
3806 +     * delayedExecutor returns an executor that delays submission
3807 +     */
3808 +    public void testDelayedExecutor() {
3809 +        testInParallel(() -> testDelayedExecutor(null, null),
3810 +                       () -> testDelayedExecutor(null, 1),
3811 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3812 +                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3813 +    }
3814 +
3815 +    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3816 +        long timeoutMillis = timeoutMillis();
3817 +        // Use an "unreasonably long" long timeout to catch lingering threads
3818 +        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3819 +        final Executor delayer, longDelayer;
3820 +        if (executor == null) {
3821 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3822 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3823 +        } else {
3824 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3825 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3826 +        }
3827 +        long startTime = System.nanoTime();
3828 +        CompletableFuture<Integer> f =
3829 +            CompletableFuture.supplyAsync(() -> v, delayer);
3830          CompletableFuture<Integer> g =
3831 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3832 <                                { throw new CFException(); },
3833 <                                exec);
3834 <        f.complete(three);
3835 <        checkCompletedNormally(f, three);
3836 <        checkCompletedWithWrappedCFException(g);
3831 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3832 >
3833 >        assertNull(g.getNow(null));
3834 >
3835 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3836 >        long millisElapsed = millisElapsedSince(startTime);
3837 >        assertTrue(millisElapsed >= timeoutMillis);
3838 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3839 >
3840 >        checkCompletedNormally(f, v);
3841 >
3842 >        checkIncomplete(g);
3843 >        assertTrue(g.cancel(true));
3844 >    }
3845 >
3846 >    //--- tests of implementation details; not part of official tck ---
3847 >
3848 >    Object resultOf(CompletableFuture<?> f) {
3849 >        SecurityManager sm = System.getSecurityManager();
3850 >        if (sm != null) {
3851 >            try {
3852 >                System.setSecurityManager(null);
3853 >            } catch (SecurityException giveUp) {
3854 >                return "Reflection not available";
3855 >            }
3856 >        }
3857 >
3858 >        try {
3859 >            java.lang.reflect.Field resultField
3860 >                = CompletableFuture.class.getDeclaredField("result");
3861 >            resultField.setAccessible(true);
3862 >            return resultField.get(f);
3863 >        } catch (Throwable t) {
3864 >            throw new AssertionError(t);
3865 >        } finally {
3866 >            if (sm != null) System.setSecurityManager(sm);
3867 >        }
3868      }
3869  
3870 +    public void testExceptionPropagationReusesResultObject() {
3871 +        if (!testImplementationDetails) return;
3872 +        for (ExecutionMode m : ExecutionMode.values())
3873 +    {
3874 +        final CFException ex = new CFException();
3875 +        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3876 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3877 +
3878 +        final Runnable noopRunnable = new Noop(m);
3879 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
3880 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
3881 +
3882 +        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3883 +            = new ArrayList<>();
3884 +
3885 +        funs.add(y -> m.thenRun(y, noopRunnable));
3886 +        funs.add(y -> m.thenAccept(y, noopConsumer));
3887 +        funs.add(y -> m.thenApply(y, incFunction));
3888 +
3889 +        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
3890 +        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
3891 +        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
3892 +
3893 +        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
3894 +        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
3895 +        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3896 +        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3897 +        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
3898 +        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
3899 +
3900 +        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3901 +
3902 +        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
3903 +
3904 +        funs.add(y -> CompletableFuture.allOf(y));
3905 +        funs.add(y -> CompletableFuture.allOf(y, v42));
3906 +        funs.add(y -> CompletableFuture.allOf(v42, y));
3907 +        funs.add(y -> CompletableFuture.anyOf(y));
3908 +        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
3909 +        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
3910 +
3911 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3912 +                 fun : funs) {
3913 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3914 +            f.completeExceptionally(ex);
3915 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3916 +            checkCompletedWithWrappedException(src, ex);
3917 +            CompletableFuture<?> dep = fun.apply(src);
3918 +            checkCompletedWithWrappedException(dep, ex);
3919 +            assertSame(resultOf(src), resultOf(dep));
3920 +        }
3921 +
3922 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3923 +                 fun : funs) {
3924 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3925 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3926 +            CompletableFuture<?> dep = fun.apply(src);
3927 +            f.completeExceptionally(ex);
3928 +            checkCompletedWithWrappedException(src, ex);
3929 +            checkCompletedWithWrappedException(dep, ex);
3930 +            assertSame(resultOf(src), resultOf(dep));
3931 +        }
3932 +
3933 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3934 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3935 +                 fun : funs) {
3936 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3937 +            f.cancel(mayInterruptIfRunning);
3938 +            checkCancelled(f);
3939 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3940 +            checkCompletedWithWrappedCancellationException(src);
3941 +            CompletableFuture<?> dep = fun.apply(src);
3942 +            checkCompletedWithWrappedCancellationException(dep);
3943 +            assertSame(resultOf(src), resultOf(dep));
3944 +        }
3945 +
3946 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3947 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3948 +                 fun : funs) {
3949 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3950 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3951 +            CompletableFuture<?> dep = fun.apply(src);
3952 +            f.cancel(mayInterruptIfRunning);
3953 +            checkCancelled(f);
3954 +            checkCompletedWithWrappedCancellationException(src);
3955 +            checkCompletedWithWrappedCancellationException(dep);
3956 +            assertSame(resultOf(src), resultOf(dep));
3957 +        }
3958 +    }}
3959 +
3960      /**
3961 <     * handleAsync action completes normally with function value on
3283 <     * either normal or exceptional completion of source
3961 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
3962       */
3963 <    public void testHandleAsync() {
3964 <        CompletableFuture<Integer> f, g;
3965 <        IntegerHandler r;
3963 >    public void testMinimalCompletionStage_minimality() {
3964 >        if (!testImplementationDetails) return;
3965 >        Function<Method, String> toSignature =
3966 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
3967 >        Predicate<Method> isNotStatic =
3968 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
3969 >        List<Method> minimalMethods =
3970 >            Stream.of(Object.class, CompletionStage.class)
3971 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
3972 >            .filter(isNotStatic)
3973 >            .collect(Collectors.toList());
3974 >        // Methods from CompletableFuture permitted NOT to throw UOE
3975 >        String[] signatureWhitelist = {
3976 >            "newIncompleteFuture[]",
3977 >            "defaultExecutor[]",
3978 >            "minimalCompletionStage[]",
3979 >            "copy[]",
3980 >        };
3981 >        Set<String> permittedMethodSignatures =
3982 >            Stream.concat(minimalMethods.stream().map(toSignature),
3983 >                          Stream.of(signatureWhitelist))
3984 >            .collect(Collectors.toSet());
3985 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3986 >            .filter(isNotStatic)
3987 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3988 >            .collect(Collectors.toList());
3989 >
3990 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
3991 >        CompletionStage<Integer> min =
3992 >            new CompletableFuture<Integer>().minimalCompletionStage();
3993 >        stages.add(min);
3994 >        stages.add(min.thenApply(x -> x));
3995 >        stages.add(CompletableFuture.completedStage(1));
3996 >        stages.add(CompletableFuture.failedStage(new CFException()));
3997 >
3998 >        List<Method> bugs = new ArrayList<>();
3999 >        for (Method method : allMethods) {
4000 >            Class<?>[] parameterTypes = method.getParameterTypes();
4001 >            Object[] args = new Object[parameterTypes.length];
4002 >            // Manufacture boxed primitives for primitive params
4003 >            for (int i = 0; i < args.length; i++) {
4004 >                Class<?> type = parameterTypes[i];
4005 >                if (parameterTypes[i] == boolean.class)
4006 >                    args[i] = false;
4007 >                else if (parameterTypes[i] == int.class)
4008 >                    args[i] = 0;
4009 >                else if (parameterTypes[i] == long.class)
4010 >                    args[i] = 0L;
4011 >            }
4012 >            for (CompletionStage<Integer> stage : stages) {
4013 >                try {
4014 >                    method.invoke(stage, args);
4015 >                    bugs.add(method);
4016 >                }
4017 >                catch (java.lang.reflect.InvocationTargetException expected) {
4018 >                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4019 >                        bugs.add(method);
4020 >                        // expected.getCause().printStackTrace();
4021 >                    }
4022 >                }
4023 >                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4024 >            }
4025 >        }
4026 >        if (!bugs.isEmpty())
4027 >            throw new Error("Methods did not throw UOE: " + bugs);
4028 >    }
4029  
4030 <        f = new CompletableFuture<>();
4031 <        g = f.handleAsync(r = new IntegerHandler());
4032 <        assertFalse(r.ran);
4033 <        f.completeExceptionally(new CFException());
4034 <        checkCompletedWithWrappedCFException(f);
4035 <        checkCompletedNormally(g, three);
4036 <        assertTrue(r.ran);
4030 >    /**
4031 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4032 >     * is completed normally, with the same value, when source is.
4033 >     */
4034 >    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4035 >        for (boolean createIncomplete : new boolean[] { true, false })
4036 >        for (Integer v1 : new Integer[] { 1, null })
4037 >    {
4038 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4039 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4040 >        if (!createIncomplete) assertTrue(f.complete(v1));
4041 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4042 >        if (createIncomplete) {
4043 >            checkIncomplete(f);
4044 >            checkIncomplete(g);
4045 >            assertTrue(f.complete(v1));
4046 >        }
4047 >        checkCompletedNormally(f, v1);
4048 >        checkCompletedNormally(g, v1);
4049 >    }}
4050  
4051 <        f = new CompletableFuture<>();
4052 <        g = f.handleAsync(r = new IntegerHandler());
4053 <        assertFalse(r.ran);
4054 <        f.completeExceptionally(new CFException());
4055 <        checkCompletedWithWrappedCFException(f);
4056 <        checkCompletedNormally(g, three);
4057 <        assertTrue(r.ran);
4051 >    /**
4052 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4053 >     * is completed exceptionally when source is.
4054 >     */
4055 >    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4056 >        for (boolean createIncomplete : new boolean[] { true, false })
4057 >    {
4058 >        CFException ex = new CFException();
4059 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4060 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4061 >        if (!createIncomplete) f.completeExceptionally(ex);
4062 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4063 >        if (createIncomplete) {
4064 >            checkIncomplete(f);
4065 >            checkIncomplete(g);
4066 >            f.completeExceptionally(ex);
4067 >        }
4068 >        checkCompletedExceptionally(f, ex);
4069 >        checkCompletedWithWrappedException(g, ex);
4070 >    }}
4071  
4072 <        f = new CompletableFuture<>();
4073 <        g = f.handleAsync(r = new IntegerHandler());
4074 <        assertFalse(r.ran);
4075 <        f.complete(one);
4076 <        checkCompletedNormally(f, one);
4077 <        checkCompletedNormally(g, two);
4078 <        assertTrue(r.ran);
4072 >    /**
4073 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4074 >     */
4075 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4076 >        for (Integer v1 : new Integer[] { 1, null })
4077 >    {
4078 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4079 >        CompletionStage minimal = f.minimalCompletionStage();
4080 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4081 >        assertTrue(g.complete(v1));
4082 >        checkCompletedNormally(g, v1);
4083 >        checkIncomplete(f);
4084 >        checkIncomplete(minimal.toCompletableFuture());
4085 >    }}
4086  
4087 <        f = new CompletableFuture<>();
4088 <        g = f.handleAsync(r = new IntegerHandler());
4089 <        assertFalse(r.ran);
4090 <        f.complete(one);
4091 <        checkCompletedNormally(f, one);
4092 <        checkCompletedNormally(g, two);
4093 <        assertTrue(r.ran);
4087 >    /**
4088 >     * minimalStage.toCompletableFuture().join() awaits completion
4089 >     */
4090 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4091 >        for (boolean createIncomplete : new boolean[] { true, false })
4092 >        for (Integer v1 : new Integer[] { 1, null })
4093 >    {
4094 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4095 >        if (!createIncomplete) assertTrue(f.complete(v1));
4096 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4097 >        if (createIncomplete) assertTrue(f.complete(v1));
4098 >        assertEquals(v1, minimal.toCompletableFuture().join());
4099 >        assertEquals(v1, minimal.toCompletableFuture().get());
4100 >        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4101 >    }}
4102 >
4103 >    /**
4104 >     * Completion of a toCompletableFuture copy of a minimal stage
4105 >     * does not complete its source.
4106 >     */
4107 >    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4108 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4109 >        CompletionStage<Integer> g = f.minimalCompletionStage();
4110 >        assertTrue(g.toCompletableFuture().complete(1));
4111 >        assertTrue(g.toCompletableFuture().complete(null));
4112 >        assertTrue(g.toCompletableFuture().cancel(true));
4113 >        assertTrue(g.toCompletableFuture().cancel(false));
4114 >        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4115 >        checkIncomplete(g.toCompletableFuture());
4116 >        f.complete(1);
4117 >        checkCompletedNormally(g.toCompletableFuture(), 1);
4118 >    }
4119 >
4120 >    /** Demo utility method for external reliable toCompletableFuture */
4121 >    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4122 >        CompletableFuture<T> f = new CompletableFuture<>();
4123 >        stage.handle((T t, Throwable ex) -> {
4124 >                         if (ex != null) f.completeExceptionally(ex);
4125 >                         else f.complete(t);
4126 >                         return null;
4127 >                     });
4128 >        return f;
4129 >    }
4130 >
4131 >    /** Demo utility method to join a CompletionStage */
4132 >    static <T> T join(CompletionStage<T> stage) {
4133 >        return toCompletableFuture(stage).join();
4134      }
4135  
4136      /**
4137 <     * handleAsync action with Executor completes normally with
3324 <     * function value on either normal or exceptional completion of
3325 <     * source
4137 >     * Joining a minimal stage "by hand" works
4138       */
4139 <    public void testHandleAsync2() {
4140 <        CompletableFuture<Integer> f, g;
4141 <        ThreadExecutor exec = new ThreadExecutor();
4142 <        IntegerHandler r;
4139 >    public void testMinimalCompletionStage_join_by_hand() {
4140 >        for (boolean createIncomplete : new boolean[] { true, false })
4141 >        for (Integer v1 : new Integer[] { 1, null })
4142 >    {
4143 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4144 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4145 >        CompletableFuture<Integer> g = new CompletableFuture<>();
4146 >        if (!createIncomplete) assertTrue(f.complete(v1));
4147 >        minimal.thenAccept(x -> g.complete(x));
4148 >        if (createIncomplete) assertTrue(f.complete(v1));
4149 >        g.join();
4150 >        checkCompletedNormally(g, v1);
4151 >        checkCompletedNormally(f, v1);
4152 >        assertEquals(v1, join(minimal));
4153 >    }}
4154  
4155 <        f = new CompletableFuture<>();
4156 <        g = f.handleAsync(r = new IntegerHandler(), exec);
4157 <        assertFalse(r.ran);
4158 <        f.completeExceptionally(new CFException());
4159 <        checkCompletedWithWrappedCFException(f);
4160 <        checkCompletedNormally(g, three);
4161 <        assertTrue(r.ran);
4155 >    static class Monad {
4156 >        static class ZeroException extends RuntimeException {
4157 >            public ZeroException() { super("monadic zero"); }
4158 >        }
4159 >        // "return", "unit"
4160 >        static <T> CompletableFuture<T> unit(T value) {
4161 >            return completedFuture(value);
4162 >        }
4163 >        // monadic zero ?
4164 >        static <T> CompletableFuture<T> zero() {
4165 >            return failedFuture(new ZeroException());
4166 >        }
4167 >        // >=>
4168 >        static <T,U,V> Function<T, CompletableFuture<V>> compose
4169 >            (Function<T, CompletableFuture<U>> f,
4170 >             Function<U, CompletableFuture<V>> g) {
4171 >            return x -> f.apply(x).thenCompose(g);
4172 >        }
4173  
4174 <        f = new CompletableFuture<>();
4175 <        g = f.handleAsync(r = new IntegerHandler(), exec);
4176 <        assertFalse(r.ran);
4177 <        f.completeExceptionally(new CFException());
4178 <        checkCompletedWithWrappedCFException(f);
4179 <        checkCompletedNormally(g, three);
4180 <        assertTrue(r.ran);
4174 >        static void assertZero(CompletableFuture<?> f) {
4175 >            try {
4176 >                f.getNow(null);
4177 >                throw new AssertionFailedError("should throw");
4178 >            } catch (CompletionException success) {
4179 >                assertTrue(success.getCause() instanceof ZeroException);
4180 >            }
4181 >        }
4182  
4183 <        f = new CompletableFuture<>();
4184 <        g = f.handleAsync(r = new IntegerHandler(), exec);
4185 <        assertFalse(r.ran);
4186 <        f.complete(one);
4187 <        checkCompletedNormally(f, one);
4188 <        checkCompletedNormally(g, two);
4189 <        assertTrue(r.ran);
4183 >        static <T> void assertFutureEquals(CompletableFuture<T> f,
4184 >                                           CompletableFuture<T> g) {
4185 >            T fval = null, gval = null;
4186 >            Throwable fex = null, gex = null;
4187 >
4188 >            try { fval = f.get(); }
4189 >            catch (ExecutionException ex) { fex = ex.getCause(); }
4190 >            catch (Throwable ex) { fex = ex; }
4191 >
4192 >            try { gval = g.get(); }
4193 >            catch (ExecutionException ex) { gex = ex.getCause(); }
4194 >            catch (Throwable ex) { gex = ex; }
4195 >
4196 >            if (fex != null || gex != null)
4197 >                assertSame(fex.getClass(), gex.getClass());
4198 >            else
4199 >                assertEquals(fval, gval);
4200 >        }
4201  
4202 <        f = new CompletableFuture<>();
4203 <        g = f.handleAsync(r = new IntegerHandler(), exec);
4204 <        assertFalse(r.ran);
4205 <        f.complete(one);
4206 <        checkCompletedNormally(f, one);
4207 <        checkCompletedNormally(g, two);
4208 <        assertTrue(r.ran);
4202 >        static class PlusFuture<T> extends CompletableFuture<T> {
4203 >            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4204 >        }
4205 >
4206 >        /** Implements "monadic plus". */
4207 >        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4208 >                                             CompletableFuture<? extends T> g) {
4209 >            PlusFuture<T> plus = new PlusFuture<T>();
4210 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4211 >                try {
4212 >                    if (ex == null) {
4213 >                        if (plus.complete(result))
4214 >                            if (plus.firstFailure.get() != null)
4215 >                                plus.firstFailure.set(null);
4216 >                    }
4217 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4218 >                        if (plus.isDone())
4219 >                            plus.firstFailure.set(null);
4220 >                    }
4221 >                    else {
4222 >                        // first failure has precedence
4223 >                        Throwable first = plus.firstFailure.getAndSet(null);
4224 >
4225 >                        // may fail with "Self-suppression not permitted"
4226 >                        try { first.addSuppressed(ex); }
4227 >                        catch (Exception ignored) {}
4228 >
4229 >                        plus.completeExceptionally(first);
4230 >                    }
4231 >                } catch (Throwable unexpected) {
4232 >                    plus.completeExceptionally(unexpected);
4233 >                }
4234 >            };
4235 >            f.whenComplete(action);
4236 >            g.whenComplete(action);
4237 >            return plus;
4238 >        }
4239      }
4240  
4241 +    /**
4242 +     * CompletableFuture is an additive monad - sort of.
4243 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4244 +     */
4245 +    public void testAdditiveMonad() throws Throwable {
4246 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4247 +        CompletableFuture<Long> zero = Monad.zero();
4248 +
4249 +        // Some mutually non-commutative functions
4250 +        Function<Long, CompletableFuture<Long>> triple
4251 +            = x -> Monad.unit(3 * x);
4252 +        Function<Long, CompletableFuture<Long>> inc
4253 +            = x -> Monad.unit(x + 1);
4254 +
4255 +        // unit is a right identity: m >>= unit === m
4256 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4257 +                                 inc.apply(5L));
4258 +        // unit is a left identity: (unit x) >>= f === f x
4259 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4260 +                                 inc.apply(5L));
4261 +
4262 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4263 +        Monad.assertFutureEquals(
4264 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4265 +            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4266 +
4267 +        // The case for CompletableFuture as an additive monad is weaker...
4268 +
4269 +        // zero is a monadic zero
4270 +        Monad.assertZero(zero);
4271 +
4272 +        // left zero: zero >>= f === zero
4273 +        Monad.assertZero(zero.thenCompose(inc));
4274 +        // right zero: f >>= (\x -> zero) === zero
4275 +        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4276 +
4277 +        // f plus zero === f
4278 +        Monad.assertFutureEquals(Monad.unit(5L),
4279 +                                 Monad.plus(Monad.unit(5L), zero));
4280 +        // zero plus f === f
4281 +        Monad.assertFutureEquals(Monad.unit(5L),
4282 +                                 Monad.plus(zero, Monad.unit(5L)));
4283 +        // zero plus zero === zero
4284 +        Monad.assertZero(Monad.plus(zero, zero));
4285 +        {
4286 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4287 +                                                   Monad.unit(8L));
4288 +            // non-determinism
4289 +            assertTrue(f.get() == 5L || f.get() == 8L);
4290 +        }
4291 +
4292 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4293 +        // f plus godot === f (doesn't wait for godot)
4294 +        Monad.assertFutureEquals(Monad.unit(5L),
4295 +                                 Monad.plus(Monad.unit(5L), godot));
4296 +        // godot plus f === f (doesn't wait for godot)
4297 +        Monad.assertFutureEquals(Monad.unit(5L),
4298 +                                 Monad.plus(godot, Monad.unit(5L)));
4299 +    }
4300 +
4301 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4302 +    public void testRecursiveChains() throws Throwable {
4303 +        for (ExecutionMode m : ExecutionMode.values())
4304 +        for (boolean addDeadEnds : new boolean[] { true, false })
4305 +    {
4306 +        final int val = 42;
4307 +        final int n = expensiveTests ? 1_000 : 2;
4308 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4309 +        CompletableFuture<Integer> tail = head;
4310 +        for (int i = 0; i < n; i++) {
4311 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4312 +            tail = m.thenApply(tail, v -> v + 1);
4313 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4314 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4315 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4316 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4317 +        }
4318 +        head.complete(val);
4319 +        assertEquals(val + 3 * n, (int) tail.join());
4320 +    }}
4321 +
4322 +    /**
4323 +     * A single CompletableFuture with many dependents.
4324 +     * A demo of scalability - runtime is O(n).
4325 +     */
4326 +    public void testManyDependents() throws Throwable {
4327 +        final int n = expensiveTests ? 1_000_000 : 10;
4328 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4329 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4330 +        final AtomicInteger count = new AtomicInteger(0);
4331 +        for (int i = 0; i < n; i++) {
4332 +            head.thenRun(() -> count.getAndIncrement());
4333 +            head.thenAccept(x -> count.getAndIncrement());
4334 +            head.thenApply(x -> count.getAndIncrement());
4335 +
4336 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4337 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4338 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4339 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4340 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4341 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4342 +
4343 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4344 +            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4345 +            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4346 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4347 +            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4348 +            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4349 +        }
4350 +        head.complete(null);
4351 +        assertEquals(5 * 3 * n, count.get());
4352 +    }
4353 +
4354 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4355 +    public void testCoCompletionGarbageRetention() throws Throwable {
4356 +        final int n = expensiveTests ? 1_000_000 : 10;
4357 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4358 +        CompletableFuture<Integer> f;
4359 +        for (int i = 0; i < n; i++) {
4360 +            f = new CompletableFuture<>();
4361 +            f.runAfterEither(incomplete, () -> {});
4362 +            f.complete(null);
4363 +
4364 +            f = new CompletableFuture<>();
4365 +            f.acceptEither(incomplete, x -> {});
4366 +            f.complete(null);
4367 +
4368 +            f = new CompletableFuture<>();
4369 +            f.applyToEither(incomplete, x -> x);
4370 +            f.complete(null);
4371 +
4372 +            f = new CompletableFuture<>();
4373 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4374 +            f.complete(null);
4375 +        }
4376 +
4377 +        for (int i = 0; i < n; i++) {
4378 +            f = new CompletableFuture<>();
4379 +            incomplete.runAfterEither(f, () -> {});
4380 +            f.complete(null);
4381 +
4382 +            f = new CompletableFuture<>();
4383 +            incomplete.acceptEither(f, x -> {});
4384 +            f.complete(null);
4385 +
4386 +            f = new CompletableFuture<>();
4387 +            incomplete.applyToEither(f, x -> x);
4388 +            f.complete(null);
4389 +
4390 +            f = new CompletableFuture<>();
4391 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4392 +            f.complete(null);
4393 +        }
4394 +    }
4395 +
4396 +    /**
4397 +     * Reproduction recipe for:
4398 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4399 +     * cvs update -D '2016-05-01' ./src/main/java/util/concurrent/CompletableFuture.java && ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testAnyOfGarbageRetention tck; cvs update -A
4400 +     */
4401 +    public void testAnyOfGarbageRetention() throws Throwable {
4402 +        for (Integer v : new Integer[] { 1, null })
4403 +    {
4404 +        final int n = expensiveTests ? 100_000 : 10;
4405 +        CompletableFuture<Integer>[] fs
4406 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4407 +        for (int i = 0; i < fs.length; i++)
4408 +            fs[i] = new CompletableFuture<>();
4409 +        fs[fs.length - 1].complete(v);
4410 +        for (int i = 0; i < n; i++)
4411 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4412 +    }}
4413 +
4414 +    /**
4415 +     * Checks for garbage retention with allOf.
4416 +     *
4417 +     * As of 2016-07, fails with OOME:
4418 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4419 +     */
4420 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4421 +        final int n = expensiveTests ? 100_000 : 10;
4422 +        CompletableFuture<Integer>[] fs
4423 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4424 +        for (int i = 0; i < fs.length; i++)
4425 +            fs[i] = new CompletableFuture<>();
4426 +        for (int i = 0; i < n; i++)
4427 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4428 +    }
4429 +
4430 +    /**
4431 +     * Checks for garbage retention when a dependent future is
4432 +     * cancelled and garbage-collected.
4433 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4434 +     *
4435 +     * As of 2016-07, fails with OOME:
4436 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4437 +     */
4438 +    public void testCancelledGarbageRetention() throws Throwable {
4439 +        final int n = expensiveTests ? 100_000 : 10;
4440 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4441 +        for (int i = 0; i < n; i++)
4442 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4443 +    }
4444 +
4445 +    /**
4446 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4447 +     * is invoked many times.
4448 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4449 +     *
4450 +     * As of 2016-07, fails with OOME:
4451 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4452 +     */
4453 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4454 +        final int n = expensiveTests ? 900_000 : 10;
4455 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4456 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4457 +        for (int i = 0; i < n; i++)
4458 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4459 +    }
4460 +
4461 + //     static <U> U join(CompletionStage<U> stage) {
4462 + //         CompletableFuture<U> f = new CompletableFuture<>();
4463 + //         stage.whenComplete((v, ex) -> {
4464 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4465 + //         });
4466 + //         return f.join();
4467 + //     }
4468 +
4469 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4470 + //         CompletableFuture<U> f = new CompletableFuture<>();
4471 + //         stage.whenComplete((v, ex) -> {
4472 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4473 + //         });
4474 + //         return f.isDone();
4475 + //     }
4476 +
4477 + //     static <U> U join2(CompletionStage<U> stage) {
4478 + //         return stage.toCompletableFuture().copy().join();
4479 + //     }
4480 +
4481 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4482 + //         return stage.toCompletableFuture().copy().isDone();
4483 + //     }
4484 +
4485   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines