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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines