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.46 by jsr166, Mon Jun 2 17:41:22 2014 UTC vs.
Revision 1.222 by jsr166, Mon Dec 16 21:18:49 2019 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;
23 < import static java.util.concurrent.TimeUnit.SECONDS;
24 < import java.util.*;
25 < import java.util.function.Supplier;
26 < import java.util.function.Consumer;
36 > import java.util.concurrent.atomic.AtomicReference;
37   import java.util.function.BiConsumer;
28 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 42 | 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); }
64 <        try {
65 <            assertEquals(value, f.getNow(null));
66 <        } 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) {
96 <        try {
97 <            f.get(LONG_DELAY_MS, MILLISECONDS);
98 <            shouldThrow();
99 <        } catch (ExecutionException success) {
100 <            assertTrue(success.getCause() instanceof CFException);
101 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
102 <        try {
84 <            f.join();
85 <            shouldThrow();
86 <        } catch (CompletionException success) {
87 <            assertTrue(success.getCause() instanceof CFException);
88 <        }
89 <        try {
90 <            f.getNow(null);
91 <            shouldThrow();
92 <        } catch (CompletionException success) {
93 <            assertTrue(success.getCause() instanceof CFException);
94 <        }
95 <        try {
96 <            f.get();
97 <            shouldThrow();
98 <        } catch (ExecutionException success) {
99 <            assertTrue(success.getCause() instanceof CFException);
100 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
101 <        assertTrue(f.isDone());
102 <        assertFalse(f.isCancelled());
103 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
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 checkCompletedWithWrappedCFException(CompletableFuture<?> f,
106 <                                              CFException ex) {
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 <            assertSame(ex, success.getCause());
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 <            assertSame(ex, success.getCause());
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 <            assertSame(ex, success.getCause());
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 <            assertSame(ex, success.getCause());
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 153 | Line 194 | public class CompletableFutureTest exten
194              shouldThrow();
195          } catch (CancellationException success) {
196          } catch (Throwable fail) { threadUnexpectedException(fail); }
156        assertTrue(f.isDone());
157        assertTrue(f.isCompletedExceptionally());
158        assertTrue(f.isCancelled());
159        assertTrue(f.toString().contains("[Completed exceptionally]"));
160    }
197  
198 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
199 <        try {
164 <            f.get(LONG_DELAY_MS, MILLISECONDS);
165 <            shouldThrow();
166 <        } catch (ExecutionException success) {
167 <            assertTrue(success.getCause() instanceof CancellationException);
168 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
169 <        try {
170 <            f.join();
171 <            shouldThrow();
172 <        } catch (CompletionException success) {
173 <            assertTrue(success.getCause() instanceof CancellationException);
174 <        }
175 <        try {
176 <            f.getNow(null);
177 <            shouldThrow();
178 <        } catch (CompletionException success) {
179 <            assertTrue(success.getCause() instanceof CancellationException);
180 <        }
181 <        try {
182 <            f.get();
183 <            shouldThrow();
184 <        } catch (ExecutionException success) {
185 <            assertTrue(success.getCause() instanceof CancellationException);
186 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
198 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
199 >
200          assertTrue(f.isDone());
188        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 204 | 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 216 | 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 226 | 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 238 | 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 259 | 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());
267 <        checkCompletedWithWrappedCFException(f);
283 >        for (Integer v1 : new Integer[] { 1, null })
284 >    {
285 >        CFException ex;
286 >        CompletableFuture<Integer> f;
287 >
288          f = new CompletableFuture<>();
289 <        f.obtrudeException(new CFException());
290 <        checkCompletedWithWrappedCFException(f);
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 >        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 +        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 <        CompletableFuture g = f.thenRun(new Noop());
322 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
323          assertEquals(1, f.getNumberOfDependents());
324          assertEquals(0, g.getNumberOfDependents());
325 <        CompletableFuture h = f.thenRun(new Noop());
325 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
326          assertEquals(2, f.getNumberOfDependents());
327 <        f.complete(1);
327 >        assertEquals(0, h.getNumberOfDependents());
328 >        assertTrue(f.complete(v1));
329          checkCompletedNormally(g, null);
330 +        checkCompletedNormally(h, null);
331          assertEquals(0, f.getNumberOfDependents());
332          assertEquals(0, g.getNumberOfDependents());
333 <    }
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]"));
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 <        f = new CompletableFuture<String>();
366 <        f.completeExceptionally(new IndexOutOfBoundsException());
367 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
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 318 | Line 381 | public class CompletableFutureTest exten
381          checkCompletedNormally(f, "test");
382      }
383  
384 <    // Choose non-commutative actions for better coverage
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 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
393 >        void assertInvoked() { assertEquals(1, invocationCount); }
394 >    }
395  
396 <    // A non-commutative function that handles and produces null values as well.
397 <    static Integer subtract(Integer x, Integer y) {
398 <        return (x == null && y == null) ? null :
399 <            ((x == null) ? 42 : x.intValue())
400 <            - ((y == null) ? 99 : y.intValue());
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 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 >        public Integer get() {
414 >            invoked();
415 >            return value;
416 >        }
417      }
418  
419      // A function that handles and produces null values as well.
# Line 332 | Line 421 | public class CompletableFutureTest exten
421          return (x == null) ? null : x + 1;
422      }
423  
424 <    static final Supplier<Integer> supplyOne =
425 <        () -> Integer.valueOf(1);
426 <    static final Function<Integer, Integer> inc =
427 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
339 <    static final BiFunction<Integer, Integer, Integer> subtract =
340 <        (Integer x, Integer y) -> subtract(x, y);
341 <    static final class IncAction implements Consumer<Integer> {
342 <        int invocationCount = 0;
343 <        Integer value;
424 >    static class NoopConsumer extends CheckedIntegerAction
425 >        implements Consumer<Integer>
426 >    {
427 >        NoopConsumer(ExecutionMode m) { super(m); }
428          public void accept(Integer x) {
429 <            invocationCount++;
430 <            value = inc(x);
429 >            invoked();
430 >            value = x;
431          }
432      }
433 <    static final class IncFunction implements Function<Integer,Integer> {
434 <        int invocationCount = 0;
435 <        Integer value;
433 >
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 <            invocationCount++;
439 >            invoked();
440              return value = inc(x);
441          }
442      }
443 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
444 <        int invocationCount = 0;
445 <        Integer value;
446 <        // Check this action was invoked exactly once when result is computed.
443 >
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 >    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 <            invocationCount++;
457 >            invoked();
458              value = subtract(x, y);
459          }
460      }
461 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
462 <        int invocationCount = 0;
463 <        Integer value;
464 <        // Check this action was invoked exactly once when result is computed.
461 >
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 <            invocationCount++;
467 >            invoked();
468              return value = subtract(x, y);
469          }
470      }
471 <    static final class Noop implements Runnable {
472 <        int invocationCount = 0;
471 >
472 >    static class Noop extends CheckedAction implements Runnable {
473 >        Noop(ExecutionMode m) { super(m); }
474          public void run() {
475 <            invocationCount++;
475 >            invoked();
476          }
477      }
478  
479 <    static final class FailingSupplier implements Supplier<Integer> {
480 <        int invocationCount = 0;
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 <            invocationCount++;
486 <            throw new CFException();
485 >            invoked();
486 >            throw ex;
487          }
488      }
489 <    static final class FailingConsumer implements Consumer<Integer> {
490 <        int invocationCount = 0;
489 >
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 <            invocationCount++;
497 <            throw new CFException();
496 >            invoked();
497 >            value = x;
498 >            throw ex;
499          }
500      }
501 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
502 <        int invocationCount = 0;
501 >
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 <            invocationCount++;
509 <            throw new CFException();
508 >            invoked();
509 >            value = subtract(x, y);
510 >            throw ex;
511          }
512      }
513 <    static final class FailingFunction implements Function<Integer, Integer> {
514 <        int invocationCount = 0;
513 >
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 <            invocationCount++;
521 <            throw new CFException();
520 >            invoked();
521 >            value = x;
522 >            throw ex;
523          }
524      }
525 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
526 <        int invocationCount = 0;
525 >
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 <            invocationCount++;
533 <            throw new CFException();
532 >            invoked();
533 >            value = subtract(x, y);
534 >            throw ex;
535          }
536      }
537 <    static final class FailingNoop implements Runnable {
538 <        int invocationCount = 0;
537 >
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 <            invocationCount++;
543 <            throw new CFException();
542 >            invoked();
543 >            throw ex;
544          }
545      }
546  
547 <    static final class CompletableFutureInc
548 <        implements Function<Integer, CompletableFuture<Integer>> {
549 <        int invocationCount = 0;
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 <            invocationCount++;
553 <            CompletableFuture<Integer> f = new CompletableFuture<>();
554 <            f.complete(inc(x));
432 <            return f;
552 >            invoked();
553 >            value = x;
554 >            return CompletableFuture.completedFuture(inc(x));
555          }
556      }
557  
558 <    static final class FailingCompletableFutureFunction
559 <        implements Function<Integer, CompletableFuture<Integer>> {
560 <        int invocationCount = 0;
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 >    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 >    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 <            invocationCount++;
586 <            throw new CFException();
585 >            invoked();
586 >            value = x;
587 >            throw ex;
588 >        }
589 >    }
590 >
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      // Used for explicit executor tests
601      static final class ThreadExecutor implements Executor {
602 <        AtomicInteger count = new AtomicInteger(0);
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          public void execute(Runnable r) {
609              count.getAndIncrement();
610 <            new Thread(r).start();
610 >            new Thread(tg, r).start();
611          }
612      }
613  
614 +    static final boolean defaultExecutorIsCommonPool
615 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
616 +
617      /**
618       * Permits the testing of parallel code for the 3 different
619 <     * execution modes without repeating all the testing code.
619 >     * execution modes without copy/pasting all the test methods.
620       */
621      enum ExecutionMode {
622 <        DEFAULT {
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);
# Line 519 | Line 691 | public class CompletableFutureTest exten
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 <
705 <        DEFAULT_ASYNC {
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);
# Line 583 | Line 773 | public class CompletableFutureTest exten
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 +            public <T> CompletableFuture<T> exceptionallyCompose
783 +                (CompletableFuture<T> f, Function<Throwable, ? extends CompletionStage<T>> fn) {
784 +                return f.exceptionallyComposeAsync(fn);
785 +            }
786 +
787          },
788  
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());
# Line 647 | Line 857 | public class CompletableFutureTest exten
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          };
871  
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
# Line 686 | Line 909 | public class CompletableFutureTest exten
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      /**
# Line 693 | Line 922 | public class CompletableFutureTest exten
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 a = new AtomicInteger(0);
929 >        final AtomicInteger ran = new AtomicInteger(0);
930          final CompletableFuture<Integer> f = new CompletableFuture<>();
931 <        if (!createIncomplete) f.complete(v1);
932 <        final CompletableFuture<Integer> g = f.exceptionally
933 <            ((Throwable t) -> {
934 <                // Should not be called
935 <                a.getAndIncrement();
706 <                throw new AssertionError();
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) f.complete(v1);
937 >        if (createIncomplete) assertTrue(f.complete(v1));
938  
939          checkCompletedNormally(g, v1);
940          checkCompletedNormally(f, v1);
941 <        assertEquals(0, a.get());
941 >        assertEquals(0, ran.get());
942      }}
943  
715
944      /**
945       * exceptionally action completes with function value on source
946       * exception
947       */
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 a = new AtomicInteger(0);
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 = f.exceptionally
958 <            ((Throwable t) -> {
959 <                threadAssertSame(t, ex);
960 <                a.getAndIncrement();
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, a.get());
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 +     * whenComplete action executes on normal completion, propagating
999 +     * source result.
1000 +     */
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 +     * whenComplete action executes on exceptional completion, propagating
1026 +     * source result.
1027 +     */
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 +
1073 +        checkCompletedWithWrappedCancellationException(g);
1074 +        checkCancelled(f);
1075 +        assertEquals(1, ran.get());
1076 +    }}
1077 +
1078 +    /**
1079 +     * If a whenComplete action throws an exception when triggered by
1080 +     * a normal completion, it completes exceptionally
1081 +     */
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 a = new AtomicInteger(0);
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 >     * 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 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 = f.exceptionally
1123 <            ((Throwable t) -> {
1124 <                threadAssertSame(t, ex1);
1125 <                a.getAndIncrement();
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 <        checkCompletedWithWrappedCFException(g, ex2);
1134 <        assertEquals(1, a.get());
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      /**
# Line 768 | Line 1149 | public class CompletableFutureTest exten
1149          for (Integer v1 : new Integer[] { 1, null })
1150      {
1151          final CompletableFuture<Integer> f = new CompletableFuture<>();
1152 <        final AtomicInteger a = new AtomicInteger(0);
1153 <        if (!createIncomplete) f.complete(v1);
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 x, Throwable t) -> {
1157 <                threadAssertSame(x, v1);
1158 <                threadAssertNull(t);
1159 <                a.getAndIncrement();
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) f.complete(v1);
1163 >        if (createIncomplete) assertTrue(f.complete(v1));
1164  
1165          checkCompletedNormally(g, inc(v1));
1166          checkCompletedNormally(f, v1);
1167 <        assertEquals(1, a.get());
1167 >        assertEquals(1, ran.get());
1168      }}
1169  
1170      /**
# Line 795 | Line 1177 | public class CompletableFutureTest exten
1177          for (Integer v1 : new Integer[] { 1, null })
1178      {
1179          final CompletableFuture<Integer> f = new CompletableFuture<>();
1180 <        final AtomicInteger a = new AtomicInteger(0);
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 x, Throwable t) -> {
1186 <                threadAssertNull(x);
1187 <                threadAssertSame(t, ex);
1188 <                a.getAndIncrement();
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 <        checkCompletedWithWrappedCFException(f, ex);
1196 <        assertEquals(1, a.get());
1195 >        checkCompletedExceptionally(f, ex);
1196 >        assertEquals(1, ran.get());
1197      }}
1198  
1199      /**
# Line 824 | Line 1207 | public class CompletableFutureTest exten
1207          for (Integer v1 : new Integer[] { 1, null })
1208      {
1209          final CompletableFuture<Integer> f = new CompletableFuture<>();
1210 <        final AtomicInteger a = new AtomicInteger(0);
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 x, Throwable t) -> {
1215 <                threadAssertNull(x);
1216 <                threadAssertTrue(t instanceof CancellationException);
1217 <                a.getAndIncrement();
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          checkCompletedNormally(g, v1);
1224          checkCancelled(f);
1225 <        assertEquals(1, a.get());
1225 >        assertEquals(1, ran.get());
1226      }}
1227  
1228      /**
1229 <     * handle result completes exceptionally if action does
1229 >     * If a "handle action" throws an exception when triggered by
1230 >     * a normal completion, it completes exceptionally
1231       */
1232 <    public void testHandle_sourceFailedActionFailed() {
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 a = new AtomicInteger(0);
1239 <        final CFException ex1 = new CFException();
1240 <        final CFException ex2 = new CFException();
855 <        if (!createIncomplete) f.completeExceptionally(ex1);
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 x, Throwable t) -> {
1244 <                threadAssertNull(x);
1245 <                threadAssertSame(ex1, t);
1246 <                a.getAndIncrement();
1247 <                throw ex2;
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) f.completeExceptionally(ex1);
1250 >        if (createIncomplete) assertTrue(f.complete(v1));
1251  
1252 <        checkCompletedWithWrappedCFException(g, ex2);
1253 <        checkCompletedWithWrappedCFException(f, ex1);
1254 <        assertEquals(1, a.get());
1252 >        checkCompletedWithWrappedException(g, ex);
1253 >        checkCompletedNormally(f, v1);
1254 >        assertEquals(1, ran.get());
1255      }}
1256  
1257 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1258 <        for (ExecutionMode m : ExecutionMode.values())
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 (Integer v1 : new Integer[] { 1, null })
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 <        final AtomicInteger a = new AtomicInteger(0);
1271 <        final CFException ex = new CFException();
879 <        if (!createIncomplete) f.complete(v1);
1270 >
1271 >        if (!createIncomplete) f.completeExceptionally(ex1);
1272          final CompletableFuture<Integer> g = m.handle
1273              (f,
1274 <             (Integer x, Throwable t) -> {
1275 <                threadAssertSame(x, v1);
1276 <                threadAssertNull(t);
1277 <                a.getAndIncrement();
1278 <                throw ex;
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.complete(v1);
1281 >        if (createIncomplete) f.completeExceptionally(ex1);
1282  
1283 <        checkCompletedWithWrappedCFException(g, ex);
1284 <        checkCompletedNormally(f, v1);
1285 <        assertEquals(1, a.get());
1283 >        checkCompletedWithWrappedException(g, ex2);
1284 >        checkCompletedExceptionally(f, ex1);
1285 >        assertEquals(1, ran.get());
1286      }}
1287  
1288      /**
1289       * runAsync completes after running Runnable
1290       */
1291 <    public void testRunAsync() {
1292 <        Noop r = new Noop();
1293 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1294 <        assertNull(f.join());
1295 <        assertEquals(1, r.invocationCount);
1296 <        checkCompletedNormally(f, null);
1297 <    }
1298 <
1299 <    /**
907 <     * runAsync with executor completes after running Runnable
908 <     */
909 <    public void testRunAsync2() {
910 <        Noop r = new Noop();
911 <        ThreadExecutor exec = new ThreadExecutor();
912 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
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());
914        assertEquals(1, r.invocationCount);
1301          checkCompletedNormally(f, null);
1302 <        assertEquals(1, exec.count.get());
1303 <    }
1302 >        r.assertInvoked();
1303 >    }}
1304  
1305      /**
1306       * failing runAsync completes exceptionally after running Runnable
1307       */
1308 <    public void testRunAsync3() {
1309 <        FailingNoop r = new FailingNoop();
1310 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1311 <        checkCompletedWithWrappedCFException(f);
1312 <        assertEquals(1, r.invocationCount);
1313 <    }
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 <    /**
1322 <     * supplyAsync completes with result of supplier
1323 <     */
1324 <    public void testSupplyAsync() {
1325 <        CompletableFuture<Integer> f;
1326 <        f = CompletableFuture.supplyAsync(supplyOne);
1327 <        assertEquals(f.join(), one);
1328 <        checkCompletedNormally(f, one);
1321 >    @SuppressWarnings("FutureReturnValueIgnored")
1322 >    public void testRunAsync_rejectingExecutor() {
1323 >        CountingRejectingExecutor e = new CountingRejectingExecutor();
1324 >        try {
1325 >            CompletableFuture.runAsync(() -> {}, e);
1326 >            shouldThrow();
1327 >        } catch (Throwable t) {
1328 >            assertSame(e.ex, t);
1329 >        }
1330 >
1331 >        assertEquals(1, e.count.get());
1332      }
1333  
1334      /**
1335 <     * supplyAsync with executor completes with result of supplier
1335 >     * supplyAsync completes with result of supplier
1336       */
1337 <    public void testSupplyAsync2() {
1338 <        CompletableFuture<Integer> f;
1339 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1340 <        assertEquals(f.join(), one);
1341 <        checkCompletedNormally(f, one);
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       * Failing supplyAsync completes exceptionally
1354       */
1355 <    public void testSupplyAsync3() {
1356 <        FailingSupplier r = new FailingSupplier();
1357 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1358 <        checkCompletedWithWrappedCFException(f);
1359 <        assertEquals(1, r.invocationCount);
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 >        assertEquals(1, e.count.get());
1379      }
1380  
1381      // seq completion methods
# Line 961 | Line 1383 | public class CompletableFutureTest exten
1383      /**
1384       * thenRun result completes normally after normal completion of source
1385       */
1386 <    public void testThenRun() {
1387 <        CompletableFuture<Integer> f;
1388 <        CompletableFuture<Void> g;
1389 <        Noop r;
1390 <
1391 <        f = new CompletableFuture<>();
1392 <        g = f.thenRun(r = new Noop());
971 <        f.complete(null);
972 <        checkCompletedNormally(g, null);
973 <        assertEquals(1, r.invocationCount);
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 <        f = new CompletableFuture<>();
1395 <        f.complete(null);
1396 <        g = f.thenRun(r = new Noop());
1397 <        checkCompletedNormally(g, null);
1398 <        assertEquals(1, r.invocationCount);
1399 <    }
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       * thenRun result completes exceptionally after exceptional
1417       * completion of source
1418       */
1419 <    public void testThenRun2() {
1420 <        CompletableFuture<Integer> f;
1421 <        CompletableFuture<Void> g;
1422 <        Noop r;
1423 <
1424 <        f = new CompletableFuture<>();
1425 <        g = f.thenRun(r = new Noop());
993 <        f.completeExceptionally(new CFException());
994 <        checkCompletedWithWrappedCFException(g);
995 <        assertEquals(0, r.invocationCount);
996 <
997 <        f = new CompletableFuture<>();
998 <        f.completeExceptionally(new CFException());
999 <        g = f.thenRun(r = new Noop());
1000 <        checkCompletedWithWrappedCFException(g);
1001 <        assertEquals(0, r.invocationCount);
1002 <    }
1003 <
1004 <    /**
1005 <     * thenRun result completes exceptionally if action does
1006 <     */
1007 <    public void testThenRun3() {
1008 <        CompletableFuture<Integer> f;
1009 <        CompletableFuture<Void> g;
1010 <        FailingNoop r;
1011 <
1012 <        f = new CompletableFuture<>();
1013 <        g = f.thenRun(r = new FailingNoop());
1014 <        f.complete(null);
1015 <        checkCompletedWithWrappedCFException(g);
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 <        f = new CompletableFuture<>();
1428 <        f.complete(null);
1429 <        g = f.thenRun(r = new FailingNoop());
1430 <        checkCompletedWithWrappedCFException(g);
1431 <    }
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       * thenRun result completes exceptionally if source cancelled
1450       */
1451 <    public void testThenRun4() {
1452 <        CompletableFuture<Integer> f;
1453 <        CompletableFuture<Void> g;
1454 <        Noop r;
1455 <
1456 <        f = new CompletableFuture<>();
1457 <        g = f.thenRun(r = new Noop());
1033 <        assertTrue(f.cancel(true));
1034 <        checkCompletedWithWrappedCancellationException(g);
1035 <
1036 <        f = new CompletableFuture<>();
1037 <        assertTrue(f.cancel(true));
1038 <        g = f.thenRun(r = new Noop());
1039 <        checkCompletedWithWrappedCancellationException(g);
1040 <    }
1041 <
1042 <    /**
1043 <     * thenApply result completes normally after normal completion of source
1044 <     */
1045 <    public void testThenApply() {
1046 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1047 <        CompletableFuture<Integer> g = f.thenApply(inc);
1048 <        f.complete(one);
1049 <        checkCompletedNormally(g, two);
1050 <    }
1051 <
1052 <    /**
1053 <     * thenApply result completes exceptionally after exceptional
1054 <     * completion of source
1055 <     */
1056 <    public void testThenApply2() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1058 <        CompletableFuture<Integer> g = f.thenApply(inc);
1059 <        f.completeExceptionally(new CFException());
1060 <        checkCompletedWithWrappedCFException(g);
1061 <    }
1062 <
1063 <    /**
1064 <     * thenApply result completes exceptionally if action does
1065 <     */
1066 <    public void testThenApply3() {
1067 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1068 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1069 <        f.complete(one);
1070 <        checkCompletedWithWrappedCFException(g);
1071 <    }
1072 <
1073 <    /**
1074 <     * thenApply result completes exceptionally if source cancelled
1075 <     */
1076 <    public void testThenApply4() {
1077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1078 <        CompletableFuture<Integer> g = f.thenApply(inc);
1079 <        assertTrue(f.cancel(true));
1080 <        checkCompletedWithWrappedCancellationException(g);
1081 <    }
1082 <
1083 <    /**
1084 <     * thenAccept result completes normally after normal completion of source
1085 <     */
1086 <    public void testThenAccept() {
1087 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1088 <        IncAction r = new IncAction();
1089 <        CompletableFuture<Void> g = f.thenAccept(r);
1090 <        f.complete(one);
1091 <        checkCompletedNormally(g, null);
1092 <        assertEquals(r.value, (Integer) 2);
1093 <    }
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 <    /**
1460 <     * thenAccept result completes exceptionally after exceptional
1461 <     * completion of source
1462 <     */
1463 <    public void testThenAccept2() {
1464 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1465 <        IncAction r = new IncAction();
1466 <        CompletableFuture<Void> g = f.thenAccept(r);
1467 <        f.completeExceptionally(new CFException());
1468 <        checkCompletedWithWrappedCFException(g);
1469 <    }
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 <     * thenAccept result completes exceptionally if action does
1481 >     * thenRun result completes exceptionally if action does
1482       */
1483 <    public void testThenAccept3() {
1484 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1485 <        FailingConsumer r = new FailingConsumer();
1486 <        CompletableFuture<Void> g = f.thenAccept(r);
1487 <        f.complete(one);
1488 <        checkCompletedWithWrappedCFException(g);
1489 <        assertEquals(1, r.invocationCount);
1117 <    }
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 <    /**
1492 <     * thenAccept result completes exceptionally if source cancelled
1493 <     */
1494 <    public void testThenAccept4() {
1495 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1496 <        IncAction r = new IncAction();
1497 <        CompletableFuture<Void> g = f.thenAccept(r);
1498 <        assertTrue(f.cancel(true));
1499 <        checkCompletedWithWrappedCancellationException(g);
1500 <    }
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 <     * thenCombine result completes normally after normal completion
1132 <     * of sources
1509 >     * thenApply result completes normally after normal completion of source
1510       */
1511 <    public void testThenCombine_normalCompletion1() {
1135 <        for (boolean createIncomplete : new boolean[] { true, false })
1136 <        for (boolean fFirst : new boolean[] { true, false })
1511 >    public void testThenApply_normalCompletion() {
1512          for (ExecutionMode m : ExecutionMode.values())
1513          for (Integer v1 : new Integer[] { 1, null })
1514 <        for (Integer v2 : new Integer[] { 2, null }) {
1140 <
1514 >    {
1515          final CompletableFuture<Integer> f = new CompletableFuture<>();
1516 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1517 <        final SubtractFunction r = new SubtractFunction();
1144 <        CompletableFuture<Integer> h = null;
1145 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1146 <
1147 <        if (fFirst)
1148 <            f.complete(v1);
1149 <        else
1150 <            g.complete(v2);
1151 <        if (createIncomplete) checkIncomplete(h);
1152 <        assertEquals(0, r.invocationCount);
1153 <        if (!fFirst)
1154 <            f.complete(v1);
1155 <        else
1156 <            g.complete(v2);
1157 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1516 >        final IncFunction[] rs = new IncFunction[4];
1517 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1518  
1519 <        checkCompletedNormally(h, subtract(v1, v2));
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 <        checkCompletedNormally(g, v2);
1533 <        assertEquals(1, r.invocationCount);
1163 <        }
1164 <    }
1532 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1533 >    }}
1534  
1535      /**
1536 <     * thenCombine result completes exceptionally after exceptional
1537 <     * completion of either source
1536 >     * thenApply result completes exceptionally after exceptional
1537 >     * completion of source
1538       */
1539 <    public void testThenCombine_exceptionalCompletion1() {
1539 >    public void testThenApply_exceptionalCompletion() {
1540          for (ExecutionMode m : ExecutionMode.values())
1541 <        for (Integer v1 : new Integer[] { 1, null }) {
1173 <
1174 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1175 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1176 <        final SubtractFunction r = new SubtractFunction();
1177 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1541 >    {
1542          final CFException ex = new CFException();
1179
1180        f.completeExceptionally(ex);
1181        checkIncomplete(h);
1182        g.complete(v1);
1183
1184        checkCompletedWithWrappedCFException(h, ex);
1185        checkCompletedWithWrappedCFException(f, ex);
1186        assertEquals(0, r.invocationCount);
1187        checkCompletedNormally(g, v1);
1188        }
1189    }
1190
1191    public void testThenCombine_exceptionalCompletion2() {
1192        for (ExecutionMode m : ExecutionMode.values())
1193        for (Integer v1 : new Integer[] { 1, null }) {
1194
1543          final CompletableFuture<Integer> f = new CompletableFuture<>();
1544 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1545 <        final SubtractFunction r = new SubtractFunction();
1198 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1199 <        final CFException ex = new CFException();
1200 <
1201 <        g.completeExceptionally(ex);
1202 <        checkIncomplete(h);
1203 <        f.complete(v1);
1544 >        final IncFunction[] rs = new IncFunction[4];
1545 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1546  
1547 <        checkCompletedWithWrappedCFException(h, ex);
1548 <        checkCompletedWithWrappedCFException(g, ex);
1549 <        assertEquals(0, r.invocationCount);
1550 <        checkCompletedNormally(f, v1);
1551 <        }
1552 <    }
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 <    public void testThenCombine_exceptionalCompletion3() {
1561 >    /**
1562 >     * thenApply result completes exceptionally if source cancelled
1563 >     */
1564 >    public void testThenApply_sourceCancelled() {
1565          for (ExecutionMode m : ExecutionMode.values())
1566 <        for (Integer v1 : new Integer[] { 1, null }) {
1567 <
1566 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1567 >    {
1568          final CompletableFuture<Integer> f = new CompletableFuture<>();
1569 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1570 <        final SubtractFunction r = new SubtractFunction();
1219 <        final CFException ex = new CFException();
1569 >        final IncFunction[] rs = new IncFunction[4];
1570 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1571  
1572 <        g.completeExceptionally(ex);
1573 <        f.complete(v1);
1574 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        checkCompletedWithWrappedCFException(h, ex);
1579 <        checkCompletedWithWrappedCFException(g, ex);
1580 <        assertEquals(0, r.invocationCount);
1581 <        checkCompletedNormally(f, v1);
1582 <        }
1583 <    }
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 <    public void testThenCombine_exceptionalCompletion4() {
1586 >    /**
1587 >     * thenApply result completes exceptionally if action does
1588 >     */
1589 >    public void testThenApply_actionFailed() {
1590          for (ExecutionMode m : ExecutionMode.values())
1591 <        for (Integer v1 : new Integer[] { 1, null }) {
1592 <
1591 >        for (Integer v1 : new Integer[] { 1, null })
1592 >    {
1593          final CompletableFuture<Integer> f = new CompletableFuture<>();
1594 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1595 <        final SubtractFunction r = new SubtractFunction();
1239 <        final CFException ex = new CFException();
1594 >        final FailingFunction[] rs = new FailingFunction[4];
1595 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1596  
1597 <        f.completeExceptionally(ex);
1598 <        g.complete(v1);
1599 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1600 <
1601 <        checkCompletedWithWrappedCFException(h, ex);
1602 <        checkCompletedWithWrappedCFException(f, ex);
1603 <        assertEquals(0, r.invocationCount);
1604 <        checkCompletedNormally(g, v1);
1605 <        }
1606 <    }
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 <     * thenCombine result completes exceptionally if action does
1611 >     * thenAccept result completes normally after normal completion of source
1612       */
1613 <    public void testThenCombine_actionFailed1() {
1613 >    public void testThenAccept_normalCompletion() {
1614          for (ExecutionMode m : ExecutionMode.values())
1615          for (Integer v1 : new Integer[] { 1, null })
1616 <        for (Integer v2 : new Integer[] { 2, null }) {
1259 <
1616 >    {
1617          final CompletableFuture<Integer> f = new CompletableFuture<>();
1618 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1619 <        final FailingBiFunction r = new FailingBiFunction();
1263 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1618 >        final NoopConsumer[] rs = new NoopConsumer[4];
1619 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1620  
1621 <        f.complete(v1);
1622 <        checkIncomplete(h);
1623 <        g.complete(v2);
1624 <
1625 <        checkCompletedWithWrappedCFException(h);
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 <        checkCompletedNormally(g, v2);
1635 <        }
1273 <    }
1634 >        for (NoopConsumer r : rs) r.assertValue(v1);
1635 >    }}
1636  
1637 <    public void testThenCombine_actionFailed2() {
1637 >    /**
1638 >     * thenAccept result completes exceptionally after exceptional
1639 >     * completion of source
1640 >     */
1641 >    public void testThenAccept_exceptionalCompletion() {
1642          for (ExecutionMode m : ExecutionMode.values())
1643 <        for (Integer v1 : new Integer[] { 1, null })
1644 <        for (Integer v2 : new Integer[] { 2, null }) {
1279 <
1643 >    {
1644 >        final CFException ex = new CFException();
1645          final CompletableFuture<Integer> f = new CompletableFuture<>();
1646 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1647 <        final FailingBiFunction r = new FailingBiFunction();
1283 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1284 <
1285 <        g.complete(v2);
1286 <        checkIncomplete(h);
1287 <        f.complete(v1);
1646 >        final NoopConsumer[] rs = new NoopConsumer[4];
1647 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1648  
1649 <        checkCompletedWithWrappedCFException(h);
1650 <        checkCompletedNormally(f, v1);
1651 <        checkCompletedNormally(g, v2);
1652 <        }
1653 <    }
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 <     * thenCombine result completes exceptionally if either source cancelled
1664 >     * thenAccept result completes exceptionally if source cancelled
1665       */
1666 <    public void testThenCombine_sourceCancelled1() {
1666 >    public void testThenAccept_sourceCancelled() {
1667          for (ExecutionMode m : ExecutionMode.values())
1668          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1669 <        for (Integer v1 : new Integer[] { 1, null }) {
1302 <
1669 >    {
1670          final CompletableFuture<Integer> f = new CompletableFuture<>();
1671 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1672 <        final SubtractFunction r = new SubtractFunction();
1306 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        checkIncomplete(h);
1678 <        g.complete(v1);
1677 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1678 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1679  
1680 <        checkCompletedWithWrappedCancellationException(h);
1680 >        checkCompletedWithWrappedCancellationException(h0);
1681 >        checkCompletedWithWrappedCancellationException(h1);
1682 >        checkCompletedWithWrappedCancellationException(h2);
1683 >        checkCompletedWithWrappedCancellationException(h3);
1684          checkCancelled(f);
1685 <        assertEquals(0, r.invocationCount);
1686 <        checkCompletedNormally(g, v1);
1316 <        }
1317 <    }
1685 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1686 >    }}
1687  
1688 <    public void testThenCombine_sourceCancelled2() {
1688 >    /**
1689 >     * thenAccept result completes exceptionally if action does
1690 >     */
1691 >    public void testThenAccept_actionFailed() {
1692          for (ExecutionMode m : ExecutionMode.values())
1693 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1694 <        for (Integer v1 : new Integer[] { 1, null }) {
1323 <
1693 >        for (Integer v1 : new Integer[] { 1, null })
1694 >    {
1695          final CompletableFuture<Integer> f = new CompletableFuture<>();
1696 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 <        final SubtractFunction r = new SubtractFunction();
1327 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1328 <
1329 <        assertTrue(g.cancel(mayInterruptIfRunning));
1330 <        checkIncomplete(h);
1331 <        f.complete(v1);
1696 >        final FailingConsumer[] rs = new FailingConsumer[4];
1697 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1698  
1699 <        checkCompletedWithWrappedCancellationException(h);
1700 <        checkCancelled(g);
1701 <        assertEquals(0, r.invocationCount);
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 <        }
1338 <    }
1710 >    }}
1711  
1712 <    public void testThenCombine_sourceCancelled3() {
1712 >    /**
1713 >     * thenCombine result completes normally after normal completion
1714 >     * of sources
1715 >     */
1716 >    public void testThenCombine_normalCompletion() {
1717          for (ExecutionMode m : ExecutionMode.values())
1718 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1719 <        for (Integer v1 : new Integer[] { 1, null }) {
1720 <
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 r = new SubtractFunction();
1724 >        final SubtractFunction[] rs = new SubtractFunction[6];
1725 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1726  
1727 <        assertTrue(g.cancel(mayInterruptIfRunning));
1728 <        f.complete(v1);
1729 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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  
1353        checkCompletedWithWrappedCancellationException(h);
1354        checkCancelled(g);
1355        assertEquals(0, r.invocationCount);
1753          checkCompletedNormally(f, v1);
1754 <        }
1755 <    }
1359 <
1360 <    public void testThenCombine_sourceCancelled4() {
1361 <        for (ExecutionMode m : ExecutionMode.values())
1362 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1363 <        for (Integer v1 : new Integer[] { 1, null }) {
1364 <
1365 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1366 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1367 <        final SubtractFunction r = new SubtractFunction();
1368 <
1369 <        assertTrue(f.cancel(mayInterruptIfRunning));
1370 <        g.complete(v1);
1371 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1372 <
1373 <        checkCompletedWithWrappedCancellationException(h);
1374 <        checkCancelled(f);
1375 <        assertEquals(0, r.invocationCount);
1376 <        checkCompletedNormally(g, v1);
1377 <        }
1378 <    }
1754 >        checkCompletedNormally(g, v2);
1755 >    }}
1756  
1757      /**
1758 <     * thenAcceptBoth result completes normally after normal
1759 <     * completion of sources
1758 >     * thenCombine result completes exceptionally after exceptional
1759 >     * completion of either source
1760       */
1761 <    public void testThenAcceptBoth_normalCompletion1() {
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1388 <
1766 >    {
1767          final CompletableFuture<Integer> f = new CompletableFuture<>();
1768          final CompletableFuture<Integer> g = new CompletableFuture<>();
1769 <        final SubtractAction r = new SubtractAction();
1770 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1771 <
1772 <        f.complete(v1);
1773 <        checkIncomplete(h);
1774 <        assertEquals(0, r.invocationCount);
1775 <        g.complete(v2);
1776 <
1777 <        checkCompletedNormally(h, null);
1778 <        assertEquals(subtract(v1, v2), r.value);
1779 <        checkCompletedNormally(f, v1);
1780 <        checkCompletedNormally(g, v2);
1781 <        }
1782 <    }
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 <    public void testThenAcceptBoth_normalCompletion2() {
1801 >    /**
1802 >     * thenCombine result completes exceptionally if either source cancelled
1803 >     */
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1410 <
1810 >    {
1811          final CompletableFuture<Integer> f = new CompletableFuture<>();
1812          final CompletableFuture<Integer> g = new CompletableFuture<>();
1813 <        final SubtractAction r = new SubtractAction();
1814 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1815 <
1816 <        g.complete(v2);
1817 <        checkIncomplete(h);
1818 <        assertEquals(0, r.invocationCount);
1819 <        f.complete(v1);
1820 <
1821 <        checkCompletedNormally(h, null);
1822 <        assertEquals(subtract(v1, v2), r.value);
1823 <        checkCompletedNormally(f, v1);
1824 <        checkCompletedNormally(g, v2);
1825 <        }
1826 <    }
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 <    public void testThenAcceptBoth_normalCompletion3() {
1844 >    /**
1845 >     * thenCombine result completes exceptionally if action does
1846 >     */
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 <
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 SubtractAction r = new SubtractAction();
1856 <
1857 <        g.complete(v2);
1858 <        f.complete(v1);
1859 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1860 <
1861 <        checkCompletedNormally(h, null);
1862 <        assertEquals(subtract(v1, v2), r.value);
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 <        }
1446 <    }
1878 >    }}
1879  
1880 <    public void testThenAcceptBoth_normalCompletion4() {
1880 >    /**
1881 >     * thenAcceptBoth result completes normally after normal
1882 >     * completion of sources
1883 >     */
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 <
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 r = new SubtractAction();
1893 <
1894 <        f.complete(v1);
1895 <        g.complete(v2);
1896 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1897 <
1898 <        checkCompletedNormally(h, null);
1899 <        assertEquals(subtract(v1, v2), r.value);
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 <        }
1466 <    }
1919 >    }}
1920  
1921      /**
1922       * thenAcceptBoth result completes exceptionally after exceptional
1923       * completion of either source
1924       */
1925 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1473 <        for (ExecutionMode m : ExecutionMode.values())
1474 <        for (Integer v1 : new Integer[] { 1, null }) {
1475 <
1476 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1477 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1478 <        final SubtractAction r = new SubtractAction();
1479 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1480 <        final CFException ex = new CFException();
1481 <
1482 <        f.completeExceptionally(ex);
1483 <        checkIncomplete(h);
1484 <        g.complete(v1);
1485 <
1486 <        checkCompletedWithWrappedCFException(h, ex);
1487 <        checkCompletedWithWrappedCFException(f, ex);
1488 <        assertEquals(0, r.invocationCount);
1489 <        checkCompletedNormally(g, v1);
1490 <        }
1491 <    }
1492 <
1493 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1494 <        for (ExecutionMode m : ExecutionMode.values())
1495 <        for (Integer v1 : new Integer[] { 1, null }) {
1496 <
1497 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1498 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1499 <        final SubtractAction r = new SubtractAction();
1500 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1501 <        final CFException ex = new CFException();
1502 <
1503 <        g.completeExceptionally(ex);
1504 <        checkIncomplete(h);
1505 <        f.complete(v1);
1506 <
1507 <        checkCompletedWithWrappedCFException(h, ex);
1508 <        checkCompletedWithWrappedCFException(g, ex);
1509 <        assertEquals(0, r.invocationCount);
1510 <        checkCompletedNormally(f, v1);
1511 <        }
1512 <    }
1513 <
1514 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1925 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1926          for (ExecutionMode m : ExecutionMode.values())
1927 <        for (Integer v1 : new Integer[] { 1, null }) {
1928 <
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<>();
1520        final SubtractAction r = new SubtractAction();
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 <        g.completeExceptionally(ex);
1966 <        f.complete(v1);
1967 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1968 <
1527 <        checkCompletedWithWrappedCFException(h, ex);
1528 <        checkCompletedWithWrappedCFException(g, ex);
1529 <        assertEquals(0, r.invocationCount);
1530 <        checkCompletedNormally(f, v1);
1531 <        }
1532 <    }
1533 <
1534 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1965 >    /**
1966 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1967 >     */
1968 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1969          for (ExecutionMode m : ExecutionMode.values())
1970 <        for (Integer v1 : new Integer[] { 1, null }) {
1971 <
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 r = new SubtractAction();
1978 <        final CFException ex = new CFException();
1979 <
1980 <        f.completeExceptionally(ex);
1981 <        g.complete(v1);
1982 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1983 <
1984 <        checkCompletedWithWrappedCFException(h, ex);
1985 <        checkCompletedWithWrappedCFException(f, ex);
1986 <        assertEquals(0, r.invocationCount);
1987 <        checkCompletedNormally(g, v1);
1988 <        }
1989 <    }
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       * thenAcceptBoth result completes exceptionally if action does
2010       */
2011 <    public void testThenAcceptBoth_actionFailed1() {
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 <
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 r = new FailingBiConsumer();
2020 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2021 <
2022 <        f.complete(v1);
2023 <        checkIncomplete(h);
2024 <        g.complete(v2);
2025 <
2026 <        checkCompletedWithWrappedCFException(h);
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 <        }
1575 <    }
2042 >    }}
2043  
2044 <    public void testThenAcceptBoth_actionFailed2() {
2044 >    /**
2045 >     * runAfterBoth result completes normally after normal
2046 >     * completion of sources
2047 >     */
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 <
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 FailingBiConsumer r = new FailingBiConsumer();
2057 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2058 <
2059 <        g.complete(v2);
2060 <        checkIncomplete(h);
2061 <        f.complete(v1);
2062 <
2063 <        checkCompletedWithWrappedCFException(h);
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 <        }
1595 <    }
2083 >    }}
2084  
2085      /**
2086 <     * thenAcceptBoth result completes exceptionally if either source cancelled
2086 >     * runAfterBoth result completes exceptionally after exceptional
2087 >     * completion of either source
2088       */
2089 <    public void testThenAcceptBoth_sourceCancelled1() {
2089 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2090          for (ExecutionMode m : ExecutionMode.values())
2091 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2092 <        for (Integer v1 : new Integer[] { 1, null }) {
2093 <
2094 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1606 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1607 <        final SubtractAction r = new SubtractAction();
1608 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1609 <
1610 <        assertTrue(f.cancel(mayInterruptIfRunning));
1611 <        checkIncomplete(h);
1612 <        g.complete(v1);
1613 <
1614 <        checkCompletedWithWrappedCancellationException(h);
1615 <        checkCancelled(f);
1616 <        assertEquals(0, r.invocationCount);
1617 <        checkCompletedNormally(g, v1);
1618 <        }
1619 <    }
1620 <
1621 <    public void testThenAcceptBoth_sourceCancelled2() {
1622 <        for (ExecutionMode m : ExecutionMode.values())
1623 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1624 <        for (Integer v1 : new Integer[] { 1, null }) {
1625 <
1626 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1627 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1628 <        final SubtractAction r = new SubtractAction();
1629 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1630 <
1631 <        assertTrue(g.cancel(mayInterruptIfRunning));
1632 <        checkIncomplete(h);
1633 <        f.complete(v1);
1634 <
1635 <        checkCompletedWithWrappedCancellationException(h);
1636 <        checkCancelled(g);
1637 <        assertEquals(0, r.invocationCount);
1638 <        checkCompletedNormally(f, v1);
1639 <        }
1640 <    }
1641 <
1642 <    public void testThenAcceptBoth_sourceCancelled3() {
1643 <        for (ExecutionMode m : ExecutionMode.values())
1644 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1645 <        for (Integer v1 : new Integer[] { 1, null }) {
1646 <
1647 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1648 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1649 <        final SubtractAction r = new SubtractAction();
1650 <
1651 <        assertTrue(g.cancel(mayInterruptIfRunning));
1652 <        f.complete(v1);
1653 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1654 <
1655 <        checkCompletedWithWrappedCancellationException(h);
1656 <        checkCancelled(g);
1657 <        assertEquals(0, r.invocationCount);
1658 <        checkCompletedNormally(f, v1);
1659 <        }
1660 <    }
1661 <
1662 <    public void testThenAcceptBoth_sourceCancelled4() {
1663 <        for (ExecutionMode m : ExecutionMode.values())
1664 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1665 <        for (Integer v1 : new Integer[] { 1, null }) {
1666 <
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 SubtractAction r = new SubtractAction();
2098 <
2099 <        assertTrue(f.cancel(mayInterruptIfRunning));
2100 <        g.complete(v1);
2101 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2102 <
2103 <        checkCompletedWithWrappedCancellationException(h);
2104 <        checkCancelled(f);
2105 <        assertEquals(0, r.invocationCount);
2106 <        checkCompletedNormally(g, v1);
2107 <        }
2108 <    }
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 <     * runAfterBoth result completes normally after normal
1684 <     * completion of sources
2130 >     * runAfterBoth result completes exceptionally if either source cancelled
2131       */
2132 <    public void testRunAfterBoth_normalCompletion1() {
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1690 <
2138 >    {
2139          final CompletableFuture<Integer> f = new CompletableFuture<>();
2140          final CompletableFuture<Integer> g = new CompletableFuture<>();
2141 <        final Noop r = new Noop();
2142 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2143 <
2144 <        f.complete(v1);
2145 <        checkIncomplete(h);
2146 <        assertEquals(0, r.invocationCount);
2147 <        g.complete(v2);
2148 <
2149 <        checkCompletedNormally(h, null);
2150 <        assertEquals(1, r.invocationCount);
2151 <        checkCompletedNormally(f, v1);
2152 <        checkCompletedNormally(g, v2);
2153 <        }
2154 <    }
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 <    public void testRunAfterBoth_normalCompletion2() {
2172 >    /**
2173 >     * runAfterBoth result completes exceptionally if action does
2174 >     */
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 <
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 Noop r = new Noop();
2184 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2185 <
2186 <        g.complete(v2);
2187 <        checkIncomplete(h);
2188 <        assertEquals(0, r.invocationCount);
2189 <        f.complete(v1);
2190 <
2191 <        checkCompletedNormally(h, null);
2192 <        assertEquals(1, r.invocationCount);
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 <        }
1728 <    }
2206 >    }}
2207  
2208 <    public void testRunAfterBoth_normalCompletion3() {
2208 >    /**
2209 >     * applyToEither result completes normally after normal completion
2210 >     * of either source
2211 >     */
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 <
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 Noop r = new Noop();
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);
1740        f.complete(v1);
1741        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2236  
2237 <        checkCompletedNormally(h, null);
2238 <        assertEquals(1, r.invocationCount);
2239 <        checkCompletedNormally(f, v1);
2240 <        checkCompletedNormally(g, v2);
2241 <        }
2242 <    }
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  
1750    public void testRunAfterBoth_normalCompletion4() {
1751        for (ExecutionMode m : ExecutionMode.values())
1752        for (Integer v1 : new Integer[] { 1, null })
1753        for (Integer v2 : new Integer[] { 2, null }) {
1754
1755        final CompletableFuture<Integer> f = new CompletableFuture<>();
1756        final CompletableFuture<Integer> g = new CompletableFuture<>();
1757        final Noop r = new Noop();
1758
1759        f.complete(v1);
1760        g.complete(v2);
1761        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1762
1763        checkCompletedNormally(h, null);
1764        assertEquals(1, r.invocationCount);
2247          checkCompletedNormally(f, v1);
2248          checkCompletedNormally(g, v2);
2249 <        }
2250 <    }
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 <     * runAfterBoth result completes exceptionally after exceptional
2257 >     * applyToEither result completes exceptionally after exceptional
2258       * completion of either source
2259       */
2260 <    public void testRunAfterBoth_exceptionalCompletion1() {
2260 >    public void testApplyToEither_exceptionalCompletion() {
2261          for (ExecutionMode m : ExecutionMode.values())
2262 <        for (Integer v1 : new Integer[] { 1, null }) {
2263 <
2262 >        for (Integer v1 : new Integer[] { 1, null })
2263 >    {
2264          final CompletableFuture<Integer> f = new CompletableFuture<>();
2265          final CompletableFuture<Integer> g = new CompletableFuture<>();
1780        final Noop r = new Noop();
1781        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        checkIncomplete(h);
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 <        checkCompletedWithWrappedCFException(h, ex);
2286 <        checkCompletedWithWrappedCFException(f, ex);
2287 <        assertEquals(0, r.invocationCount);
2288 <        checkCompletedNormally(g, v1);
2289 <        }
2290 <    }
2291 <
2292 <    public void testRunAfterBoth_exceptionalCompletion2() {
2293 <        for (ExecutionMode m : ExecutionMode.values())
1797 <        for (Integer v1 : new Integer[] { 1, null }) {
1798 <
1799 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1800 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1801 <        final Noop r = new Noop();
1802 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1803 <        final CFException ex = new CFException();
1804 <
1805 <        g.completeExceptionally(ex);
1806 <        checkIncomplete(h);
1807 <        f.complete(v1);
1808 <
1809 <        checkCompletedWithWrappedCFException(h, ex);
1810 <        checkCompletedWithWrappedCFException(g, ex);
1811 <        assertEquals(0, r.invocationCount);
1812 <        checkCompletedNormally(f, v1);
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 >            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 <    }
2296 <
2297 <    public void testRunAfterBoth_exceptionalCompletion3() {
2298 <        for (ExecutionMode m : ExecutionMode.values())
2299 <        for (Integer v1 : new Integer[] { 1, null }) {
2300 <
1820 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1821 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1822 <        final Noop r = new Noop();
1823 <        final CFException ex = new CFException();
1824 <
1825 <        g.completeExceptionally(ex);
1826 <        f.complete(v1);
1827 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1828 <
1829 <        checkCompletedWithWrappedCFException(h, ex);
1830 <        checkCompletedWithWrappedCFException(g, ex);
1831 <        assertEquals(0, r.invocationCount);
1832 <        checkCompletedNormally(f, v1);
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          }
1834    }
1835
1836    public void testRunAfterBoth_exceptionalCompletion4() {
1837        for (ExecutionMode m : ExecutionMode.values())
1838        for (Integer v1 : new Integer[] { 1, null }) {
2302  
2303 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1841 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1842 <        final Noop r = new Noop();
1843 <        final CFException ex = new CFException();
1844 <
1845 <        f.completeExceptionally(ex);
1846 <        g.complete(v1);
1847 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1848 <
1849 <        checkCompletedWithWrappedCFException(h, ex);
1850 <        checkCompletedWithWrappedCFException(f, ex);
1851 <        assertEquals(0, r.invocationCount);
2303 >        checkCompletedExceptionally(f, ex);
2304          checkCompletedNormally(g, v1);
2305 <        }
2306 <    }
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 <    /**
1857 <     * runAfterBoth result completes exceptionally if action does
1858 <     */
1859 <    public void testRunAfterBoth_actionFailed1() {
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1863 <
2317 >    {
2318          final CompletableFuture<Integer> f = new CompletableFuture<>();
2319          final CompletableFuture<Integer> g = new CompletableFuture<>();
2320 <        final FailingNoop r = new FailingNoop();
2321 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        f.complete(v1);
2325 <        checkIncomplete(h);
2326 <        g.complete(v2);
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 <        checkCompletedWithWrappedCFException(h);
2332 <        checkCompletedNormally(f, v1);
2333 <        checkCompletedNormally(g, v2);
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          }
1877    }
1878
1879    public void testRunAfterBoth_actionFailed2() {
1880        for (ExecutionMode m : ExecutionMode.values())
1881        for (Integer v1 : new Integer[] { 1, null })
1882        for (Integer v2 : new Integer[] { 2, null }) {
1883
1884        final CompletableFuture<Integer> f = new CompletableFuture<>();
1885        final CompletableFuture<Integer> g = new CompletableFuture<>();
1886        final FailingNoop r = new FailingNoop();
1887        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1888
1889        g.complete(v2);
1890        checkIncomplete(h);
1891        f.complete(v1);
2360  
1893        checkCompletedWithWrappedCFException(h);
2361          checkCompletedNormally(f, v1);
2362 <        checkCompletedNormally(g, v2);
2363 <        }
1897 <    }
2362 >        checkCompletedExceptionally(g, ex);
2363 >    }}
2364  
2365      /**
2366 <     * runAfterBoth result completes exceptionally if either source cancelled
2366 >     * applyToEither result completes exceptionally if either source cancelled
2367       */
2368 <    public void testRunAfterBoth_sourceCancelled1() {
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 <
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 Noop r = new Noop();
2376 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2375 >        final IncFunction[] rs = new IncFunction[6];
2376 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2377  
2378 <        assertTrue(f.cancel(mayInterruptIfRunning));
2379 <        checkIncomplete(h);
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 <        checkCompletedWithWrappedCancellationException(h);
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          checkCancelled(f);
1918        assertEquals(0, r.invocationCount);
2412          checkCompletedNormally(g, v1);
2413 <        }
2414 <    }
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 testRunAfterBoth_sourceCancelled2() {
2420 >    public void testApplyToEither_sourceCancelled2() {
2421          for (ExecutionMode m : ExecutionMode.values())
2422          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2423 <        for (Integer v1 : new Integer[] { 1, null }) {
2424 <
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 Noop r = new Noop();
2429 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2428 >        final IncFunction[] rs = new IncFunction[6];
2429 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2430  
2431 <        assertTrue(g.cancel(mayInterruptIfRunning));
2432 <        checkIncomplete(h);
2433 <        f.complete(v1);
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 <        checkCompletedWithWrappedCancellationException(h);
2439 <        checkCancelled(g);
2440 <        assertEquals(0, r.invocationCount);
2441 <        checkCompletedNormally(f, v1);
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 <    }
2447 <
2448 <    public void testRunAfterBoth_sourceCancelled3() {
2449 <        for (ExecutionMode m : ExecutionMode.values())
2450 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2451 <        for (Integer v1 : new Integer[] { 1, null }) {
1948 <
1949 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1950 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1951 <        final Noop r = new Noop();
1952 <
1953 <        assertTrue(g.cancel(mayInterruptIfRunning));
1954 <        f.complete(v1);
1955 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1956 <
1957 <        checkCompletedWithWrappedCancellationException(h);
1958 <        checkCancelled(g);
1959 <        assertEquals(0, r.invocationCount);
1960 <        checkCompletedNormally(f, v1);
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 <    }
2454 <
2455 <    public void testRunAfterBoth_sourceCancelled4() {
2456 <        for (ExecutionMode m : ExecutionMode.values())
2457 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2458 <        for (Integer v1 : new Integer[] { 1, null }) {
1968 <
1969 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1970 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1971 <        final Noop r = new Noop();
1972 <
1973 <        assertTrue(f.cancel(mayInterruptIfRunning));
1974 <        g.complete(v1);
1975 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1976 <
1977 <        checkCompletedWithWrappedCancellationException(h);
1978 <        checkCancelled(f);
1979 <        assertEquals(0, r.invocationCount);
1980 <        checkCompletedNormally(g, v1);
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 <    }
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 >        checkCompletedNormally(f, v1);
2469 >        checkCancelled(g);
2470 >    }}
2471  
2472      /**
2473 <     * applyToEither result completes normally after normal completion
1986 <     * of either source
2473 >     * applyToEither result completes exceptionally if action does
2474       */
2475 <    public void testApplyToEither_normalCompletion1() {
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 <
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 IncFunction r = new IncFunction();
2483 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <        checkCompletedNormally(h, inc(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 <        checkCompletedNormally(h, inc(v1));
2005 <        }
2006 <    }
2511 >    }}
2512  
2513 <    public void testApplyToEither_normalCompletion2() {
2513 >    /**
2514 >     * acceptEither result completes normally after normal completion
2515 >     * of either source
2516 >     */
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 <
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 IncFunction r = new IncFunction();
2525 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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);
2019        checkCompletedNormally(h, inc(v2));
2020        f.complete(v1);
2545  
2546 <        checkCompletedNormally(f, v1);
2547 <        checkCompletedNormally(g, v2);
2548 <        checkCompletedNormally(h, inc(v2));
2549 <        }
2550 <    }
2551 <    public void testApplyToEither_normalCompletion3() {
2552 <        for (ExecutionMode m : ExecutionMode.values())
2553 <        for (Integer v1 : new Integer[] { 1, null })
2554 <        for (Integer v2 : new Integer[] { 2, null }) {
2031 <
2032 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2033 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2034 <        final IncFunction r = new IncFunction();
2035 <
2036 <        f.complete(v1);
2037 <        g.complete(v2);
2038 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <
2559 <        // unspecified behavior
2560 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2561 <                   Objects.equals(h.join(), inc(v2)));
2562 <        assertEquals(1, r.invocationCount);
2563 <        }
2048 <    }
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 <     * applyToEither result completes exceptionally after exceptional
2566 >     * acceptEither result completes exceptionally after exceptional
2567       * completion of either source
2568       */
2569 <    public void testApplyToEither_exceptionalCompletion1() {
2569 >    public void testAcceptEither_exceptionalCompletion() {
2570          for (ExecutionMode m : ExecutionMode.values())
2571 <        for (Integer v1 : new Integer[] { 1, null }) {
2572 <
2571 >        for (Integer v1 : new Integer[] { 1, null })
2572 >    {
2573          final CompletableFuture<Integer> f = new CompletableFuture<>();
2574          final CompletableFuture<Integer> g = new CompletableFuture<>();
2060        final IncFunction r = new IncFunction();
2061        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <        checkCompletedWithWrappedCFException(h, 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 <        assertEquals(0, r.invocationCount);
2596 <        checkCompletedNormally(g, v1);
2597 <        checkCompletedWithWrappedCFException(f, ex);
2598 <        checkCompletedWithWrappedCFException(h, ex);
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 <    }
2606 <
2607 <    public void testApplyToEither_exceptionalCompletion2() {
2608 <        for (ExecutionMode m : ExecutionMode.values())
2609 <        for (Integer v1 : new Integer[] { 1, null }) {
2610 <
2079 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2080 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2081 <        final IncFunction r = new IncFunction();
2082 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2083 <        final CFException ex = new CFException();
2084 <
2085 <        g.completeExceptionally(ex);
2086 <        checkCompletedWithWrappedCFException(h, ex);
2087 <        f.complete(v1);
2088 <
2089 <        assertEquals(0, r.invocationCount);
2090 <        checkCompletedNormally(f, v1);
2091 <        checkCompletedWithWrappedCFException(g, ex);
2092 <        checkCompletedWithWrappedCFException(h, ex);
2605 >        try {
2606 >            assertNull(h5.join());
2607 >            rs[5].assertValue(v1);
2608 >        } catch (CompletionException ok) {
2609 >            checkCompletedWithWrappedException(h5, ex);
2610 >            rs[5].assertNotInvoked();
2611          }
2094    }
2612  
2613 <    public void testApplyToEither_exceptionalCompletion3() {
2614 <        for (ExecutionMode m : ExecutionMode.values())
2615 <        for (Integer v1 : new Integer[] { 1, null }) {
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<>();
2102        final IncFunction r = new IncFunction();
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 <        g.completeExceptionally(ex);
2635 <        f.complete(v1);
2636 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <        // unspecified behavior
2642 <        Integer v;
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 <            assertEquals(inc(v1), h.join());
2651 <            assertEquals(1, r.invocationCount);
2650 >            assertNull(h1.join());
2651 >            rs[1].assertValue(v1);
2652          } catch (CompletionException ok) {
2653 <            checkCompletedWithWrappedCFException(h, ex);
2654 <            assertEquals(0, r.invocationCount);
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  
2119        checkCompletedWithWrappedCFException(g, ex);
2671          checkCompletedNormally(f, v1);
2672 <        }
2673 <    }
2672 >        checkCompletedExceptionally(g, ex);
2673 >    }}
2674  
2675 <    public void testApplyToEither_exceptionalCompletion4() {
2675 >    /**
2676 >     * acceptEither result completes exceptionally if either source cancelled
2677 >     */
2678 >    public void testAcceptEither_sourceCancelled() {
2679          for (ExecutionMode m : ExecutionMode.values())
2680 <        for (Integer v1 : new Integer[] { 1, null }) {
2681 <
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 IncFunction r = new IncFunction();
2686 <        final CFException ex = new CFException();
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  
2133        f.completeExceptionally(ex);
2702          g.complete(v1);
2135        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2703  
2704 <        // unspecified behavior
2705 <        Integer v;
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 <            assertEquals(inc(v1), h.join());
2716 <            assertEquals(1, r.invocationCount);
2715 >            assertNull(h5.join());
2716 >            rs[5].assertValue(v1);
2717          } catch (CompletionException ok) {
2718 <            checkCompletedWithWrappedCFException(h, ex);
2719 <            assertEquals(0, r.invocationCount);
2718 >            checkCompletedWithWrappedCancellationException(h5);
2719 >            rs[5].assertNotInvoked();
2720          }
2721  
2722 <        checkCompletedWithWrappedCFException(f, ex);
2722 >        checkCancelled(f);
2723          checkCompletedNormally(g, v1);
2724 <        }
2725 <    }
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 <     * applyToEither result completes exceptionally if action does
2732 >     * acceptEither result completes exceptionally if action does
2733       */
2734 <    public void testApplyToEither_actionFailed1() {
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 <
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 FailingFunction r = new FailingFunction();
2742 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <        checkCompletedWithWrappedCFException(h);
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 <        }
2171 <    }
2770 >    }}
2771  
2772 <    public void testApplyToEither_actionFailed2() {
2772 >    /**
2773 >     * runAfterEither result completes normally after normal completion
2774 >     * of either source
2775 >     */
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 <
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 FailingFunction r = new FailingFunction();
2785 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <        checkCompletedWithWrappedCFException(h);
2811 <        f.complete(v1);
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 <        }
2817 <    }
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 <     * applyToEither result completes exceptionally if either source cancelled
2826 >     * runAfterEither result completes exceptionally after exceptional
2827 >     * completion of either source
2828       */
2829 <    public void testApplyToEither_sourceCancelled1() {
2829 >    public void testRunAfterEither_exceptionalCompletion() {
2830          for (ExecutionMode m : ExecutionMode.values())
2831 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2832 <        for (Integer v1 : new Integer[] { 1, null }) {
2198 <
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 IncFunction r = new IncFunction();
2836 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <        assertTrue(f.cancel(mayInterruptIfRunning));
2840 <        checkCompletedWithWrappedCancellationException(h);
2841 <        g.complete(v1);
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 <        checkCancelled(f);
2209 <        assertEquals(0, r.invocationCount);
2873 >        checkCompletedExceptionally(f, ex);
2874          checkCompletedNormally(g, v1);
2875 <        checkCompletedWithWrappedCancellationException(h);
2876 <        }
2877 <    }
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 testApplyToEither_sourceCancelled2() {
2883 >    public void testRunAfterEither_exceptionalCompletion2() {
2884          for (ExecutionMode m : ExecutionMode.values())
2885 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2886 <        for (Integer v1 : new Integer[] { 1, null }) {
2887 <
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 IncFunction r = new IncFunction();
2891 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <        assertTrue(g.cancel(mayInterruptIfRunning));
2895 <        checkCompletedWithWrappedCancellationException(h);
2896 <        f.complete(v1);
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 <        checkCancelled(g);
2902 <        assertEquals(0, r.invocationCount);
2903 <        checkCompletedNormally(f, v1);
2904 <        checkCompletedWithWrappedCancellationException(h);
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          }
2234    }
2235
2236    public void testApplyToEither_sourceCancelled3() {
2237        for (ExecutionMode m : ExecutionMode.values())
2238        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2239        for (Integer v1 : new Integer[] { 1, null }) {
2240
2241        final CompletableFuture<Integer> f = new CompletableFuture<>();
2242        final CompletableFuture<Integer> g = new CompletableFuture<>();
2243        final IncFunction r = new IncFunction();
2244
2245        assertTrue(g.cancel(mayInterruptIfRunning));
2246        f.complete(v1);
2247        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2248
2249        // unspecified behavior
2250        Integer v;
2923          try {
2924 <            assertEquals(inc(v1), h.join());
2925 <            assertEquals(1, r.invocationCount);
2924 >            assertNull(h3.join());
2925 >            rs[3].assertInvoked();
2926          } catch (CompletionException ok) {
2927 <            checkCompletedWithWrappedCancellationException(h);
2928 <            assertEquals(0, r.invocationCount);
2927 >            checkCompletedWithWrappedException(h3, ex);
2928 >            rs[3].assertNotInvoked();
2929          }
2930  
2259        checkCancelled(g);
2931          checkCompletedNormally(f, v1);
2932 <        }
2933 <    }
2932 >        checkCompletedExceptionally(g, ex);
2933 >    }}
2934  
2935 <    public void testApplyToEither_sourceCancelled4() {
2935 >    /**
2936 >     * runAfterEither result completes exceptionally if either source cancelled
2937 >     */
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 <
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 IncFunction r = new IncFunction();
2945 >        final Noop[] rs = new Noop[6];
2946 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2947  
2948 <        assertTrue(f.cancel(mayInterruptIfRunning));
2949 <        g.complete(v1);
2950 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2951 <
2952 <        // unspecified behavior
2953 <        Integer v;
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 <            assertEquals(inc(v1), h.join());
2969 <            assertEquals(1, r.invocationCount);
2968 >            assertNull(h4.join());
2969 >            rs[4].assertInvoked();
2970          } catch (CompletionException ok) {
2971 <            checkCompletedWithWrappedCancellationException(h);
2972 <            assertEquals(0, r.invocationCount);
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          checkCancelled(f);
2983          checkCompletedNormally(g, v1);
2984 <        }
2985 <    }
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 <     * acceptEither result completes normally after normal completion
2294 <     * of either source
2992 >     * runAfterEither result completes exceptionally if action does
2993       */
2994 <    public void testAcceptEither_normalCompletion1() {
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 <
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 IncAction r = new IncAction();
3002 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
3001 >        final FailingRunnable[] rs = new FailingRunnable[6];
3002 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
3003  
3004 <        f.complete(v1);
3005 <        checkCompletedNormally(h, null);
3006 <        assertEquals(inc(v1), r.value);
3007 <        g.complete(v2);
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 <        checkCompletedNormally(h, null);
3023 <        }
2315 <    }
2316 <
2317 <    public void testAcceptEither_normalCompletion2() {
2318 <        for (ExecutionMode m : ExecutionMode.values())
2319 <        for (Integer v1 : new Integer[] { 1, null })
2320 <        for (Integer v2 : new Integer[] { 2, null }) {
2321 <
2322 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2323 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2324 <        final IncAction r = new IncAction();
2325 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2326 <
2327 <        g.complete(v2);
2328 <        checkCompletedNormally(h, null);
2329 <        assertEquals(inc(v2), r.value);
2330 <        f.complete(v1);
3022 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
3023 >    }}
3024  
3025 <        checkCompletedNormally(f, v1);
3026 <        checkCompletedNormally(g, v2);
3027 <        checkCompletedNormally(h, null);
3028 <        }
2336 <    }
2337 <    public void testAcceptEither_normalCompletion3() {
3025 >    /**
3026 >     * thenCompose result completes normally after normal completion of source
3027 >     */
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 <        for (Integer v2 : new Integer[] { 2, null }) {
2341 <
3032 >    {
3033          final CompletableFuture<Integer> f = new CompletableFuture<>();
3034 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3035 <        final IncAction r = new IncAction();
3036 <
3037 <        f.complete(v1);
2347 <        g.complete(v2);
2348 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
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(h, null);
3039 >        checkCompletedNormally(g, inc(v1));
3040          checkCompletedNormally(f, v1);
3041 <        checkCompletedNormally(g, v2);
3042 <
2354 <        // unspecified behavior
2355 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2356 <                   Objects.equals(r.value, inc(v2)));
2357 <        }
2358 <    }
3041 >        r.assertValue(v1);
3042 >    }}
3043  
3044      /**
3045 <     * acceptEither result completes exceptionally after exceptional
3046 <     * completion of either source
3045 >     * thenCompose result completes exceptionally after exceptional
3046 >     * completion of source
3047       */
3048 <    public void testAcceptEither_exceptionalCompletion1() {
3048 >    public void testThenCompose_exceptionalCompletion() {
3049          for (ExecutionMode m : ExecutionMode.values())
3050 <        for (Integer v1 : new Integer[] { 1, null }) {
3051 <
2368 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2369 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2370 <        final IncAction r = new IncAction();
2371 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
3050 >        for (boolean createIncomplete : new boolean[] { true, false })
3051 >    {
3052          final CFException ex = new CFException();
3053 <
2374 <        f.completeExceptionally(ex);
2375 <        checkCompletedWithWrappedCFException(h, ex);
2376 <        g.complete(v1);
2377 <
2378 <        assertEquals(0, r.invocationCount);
2379 <        checkCompletedNormally(g, v1);
2380 <        checkCompletedWithWrappedCFException(f, ex);
2381 <        checkCompletedWithWrappedCFException(h, ex);
2382 <        }
2383 <    }
2384 <
2385 <    public void testAcceptEither_exceptionalCompletion2() {
2386 <        for (ExecutionMode m : ExecutionMode.values())
2387 <        for (Integer v1 : new Integer[] { 1, null }) {
2388 <
3053 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3054          final CompletableFuture<Integer> f = new CompletableFuture<>();
3055 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3056 <        final IncAction r = new IncAction();
3057 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2393 <        final CFException ex = new CFException();
2394 <
2395 <        g.completeExceptionally(ex);
2396 <        checkCompletedWithWrappedCFException(h, ex);
2397 <        f.complete(v1);
3055 >        if (!createIncomplete) f.completeExceptionally(ex);
3056 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3057 >        if (createIncomplete) f.completeExceptionally(ex);
3058  
3059 <        assertEquals(0, r.invocationCount);
3060 <        checkCompletedNormally(f, v1);
3061 <        checkCompletedWithWrappedCFException(g, ex);
3062 <        checkCompletedWithWrappedCFException(h, ex);
2403 <        }
2404 <    }
3059 >        checkCompletedWithWrappedException(g, ex);
3060 >        checkCompletedExceptionally(f, ex);
3061 >        r.assertNotInvoked();
3062 >    }}
3063  
3064 <    public void testAcceptEither_exceptionalCompletion3() {
3064 >    /**
3065 >     * thenCompose result completes exceptionally if action does
3066 >     */
3067 >    public void testThenCompose_actionFailed() {
3068          for (ExecutionMode m : ExecutionMode.values())
3069 <        for (Integer v1 : new Integer[] { 1, null }) {
3070 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
3074 <        final IncAction r = new IncAction();
3075 <        final CFException ex = new CFException();
3076 <
3077 <        g.completeExceptionally(ex);
2416 <        f.complete(v1);
2417 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2418 <
2419 <        // unspecified behavior
2420 <        Integer v;
2421 <        try {
2422 <            assertNull(h.join());
2423 <            assertEquals(1, r.invocationCount);
2424 <            assertEquals(inc(v1), r.value);
2425 <        } catch (CompletionException ok) {
2426 <            checkCompletedWithWrappedCFException(h, ex);
2427 <            assertEquals(0, r.invocationCount);
2428 <        }
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 <        checkCompletedWithWrappedCFException(g, ex);
3079 >        checkCompletedWithWrappedException(g, r.ex);
3080          checkCompletedNormally(f, v1);
3081 <        }
2433 <    }
3081 >    }}
3082  
3083 <    public void testAcceptEither_exceptionalCompletion4() {
3083 >    /**
3084 >     * thenCompose result completes exceptionally if source cancelled
3085 >     */
3086 >    public void testThenCompose_sourceCancelled() {
3087          for (ExecutionMode m : ExecutionMode.values())
3088 <        for (Integer v1 : new Integer[] { 1, null }) {
3089 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
3093 <        final IncAction r = new IncAction();
3094 <        final CFException ex = new CFException();
3095 <
3096 <        f.completeExceptionally(ex);
3097 <        g.complete(v1);
2446 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2447 <
2448 <        // unspecified behavior
2449 <        Integer v;
2450 <        try {
2451 <            assertNull(h.join());
2452 <            assertEquals(1, r.invocationCount);
2453 <            assertEquals(inc(v1), r.value);
2454 <        } catch (CompletionException ok) {
2455 <            checkCompletedWithWrappedCFException(h, ex);
2456 <            assertEquals(0, r.invocationCount);
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  
3100 <        checkCompletedWithWrappedCFException(f, ex);
3101 <        checkCompletedNormally(g, v1);
3102 <        }
2462 <    }
3100 >        checkCompletedWithWrappedCancellationException(g);
3101 >        checkCancelled(f);
3102 >    }}
3103  
3104      /**
3105 <     * acceptEither result completes exceptionally if action does
3105 >     * thenCompose result completes exceptionally if the result of the action does
3106       */
3107 <    public void testAcceptEither_actionFailed1() {
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 <        for (Integer v2 : new Integer[] { 2, null }) {
3112 <
3111 >    {
3112 >        final CFException ex = new CFException();
3113          final CompletableFuture<Integer> f = new CompletableFuture<>();
3114          final CompletableFuture<Integer> g = new CompletableFuture<>();
3115 <        final FailingConsumer r = new FailingConsumer();
3116 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
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 <        f.complete(v1);
3152 <        checkCompletedWithWrappedCFException(h);
2479 <        g.complete(v2);
3151 >        checkCompletedExceptionally(g, ex);
3152 >        checkCompletedWithWrappedException(h, ex);
3153          checkCompletedNormally(f, v1);
3154 <        checkCompletedNormally(g, v2);
2482 <        }
2483 <    }
3154 >    }}
3155  
3156 <    public void testAcceptEither_actionFailed2() {
3156 >    /**
3157 >     * exceptionallyCompose result completes normally after normal
3158 >     * completion of source
3159 >     */
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 <        for (Integer v2 : new Integer[] { 2, null }) {
2489 <
3164 >    {
3165          final CompletableFuture<Integer> f = new CompletableFuture<>();
3166 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3167 <        final FailingConsumer r = new FailingConsumer();
3168 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
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  
2495        g.complete(v2);
2496        checkCompletedWithWrappedCFException(h);
2497        f.complete(v1);
3172          checkCompletedNormally(f, v1);
3173 <        checkCompletedNormally(g, v2);
3174 <        }
3175 <    }
3173 >        checkCompletedNormally(g, v1);
3174 >        r.assertNotInvoked();
3175 >    }}
3176  
3177      /**
3178 <     * acceptEither result completes exceptionally if either source cancelled
3178 >     * exceptionallyCompose result completes normally after exceptional
3179 >     * completion of source
3180       */
3181 <    public void testAcceptEither_sourceCancelled1() {
3181 >    public void testExceptionallyCompose_exceptionalCompletion() {
3182          for (ExecutionMode m : ExecutionMode.values())
3183 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3184 <        for (Integer v1 : new Integer[] { 1, null }) {
3185 <
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 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3190 <        final IncAction r = new IncAction();
3191 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2515 <
2516 <        assertTrue(f.cancel(mayInterruptIfRunning));
2517 <        checkCompletedWithWrappedCancellationException(h);
2518 <        g.complete(v1);
3189 >        if (!createIncomplete) f.completeExceptionally(ex);
3190 >        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3191 >        if (createIncomplete) f.completeExceptionally(ex);
3192  
3193 <        checkCancelled(f);
3194 <        assertEquals(0, r.invocationCount);
3195 <        checkCompletedNormally(g, v1);
3196 <        checkCompletedWithWrappedCancellationException(h);
2524 <        }
2525 <    }
3193 >        checkCompletedExceptionally(f, ex);
3194 >        checkCompletedNormally(g, r.value);
3195 >        r.assertInvoked();
3196 >    }}
3197  
3198 <    public void testAcceptEither_sourceCancelled2() {
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 mayInterruptIfRunning : new boolean[] { true, false })
3204 <        for (Integer v1 : new Integer[] { 1, null }) {
3205 <
3203 >        for (boolean createIncomplete : new boolean[] { true, false })
3204 >    {
3205 >        final CFException ex = new CFException();
3206          final CompletableFuture<Integer> f = new CompletableFuture<>();
3207 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3208 <        final IncAction r = new IncAction();
3209 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
3210 <
3211 <        assertTrue(g.cancel(mayInterruptIfRunning));
2538 <        checkCompletedWithWrappedCancellationException(h);
2539 <        f.complete(v1);
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 <        checkCancelled(g);
3214 <        assertEquals(0, r.invocationCount);
3215 <        checkCompletedNormally(f, v1);
3216 <        checkCompletedWithWrappedCancellationException(h);
2545 <        }
2546 <    }
3213 >        checkCompletedExceptionally(f, ex);
3214 >        checkCompletedWithWrappedException(g, r.ex);
3215 >        r.assertInvoked();
3216 >    }}
3217  
3218 <    public void testAcceptEither_sourceCancelled3() {
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 (boolean mayInterruptIfRunning : new boolean[] { true, false })
3225 <        for (Integer v1 : new Integer[] { 1, null }) {
3226 <
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 IncAction r = new IncAction();
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 >        checkCompletedExceptionally(g, ex);
3267 >        checkCompletedWithWrappedException(h, ex);
3268 >        checkCompletedExceptionally(f, ex0);
3269 >    }}
3270  
3271 <        assertTrue(g.cancel(mayInterruptIfRunning));
2558 <        f.complete(v1);
2559 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
3271 >    // other static methods
3272  
3273 <        // unspecified behavior
3274 <        Integer v;
3275 <        try {
3276 <            assertNull(h.join());
3277 <            assertEquals(1, r.invocationCount);
3278 <            assertEquals(inc(v1), r.value);
3279 <        } catch (CompletionException ok) {
3280 <            checkCompletedWithWrappedCancellationException(h);
2569 <            assertEquals(0, r.invocationCount);
2570 <        }
3273 >    /**
3274 >     * allOf(no component futures) returns a future completed normally
3275 >     * with the value null
3276 >     */
3277 >    public void testAllOf_empty() throws Exception {
3278 >        CompletableFuture<Void> f = CompletableFuture.allOf();
3279 >        checkCompletedNormally(f, null);
3280 >    }
3281  
3282 <        checkCancelled(g);
3283 <        checkCompletedNormally(f, v1);
3282 >    /**
3283 >     * allOf returns a future completed normally with the value null
3284 >     * when all components complete normally
3285 >     */
3286 >    public void testAllOf_normal() throws Exception {
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 testAcceptEither_sourceCancelled4() {
3304 <        for (ExecutionMode m : ExecutionMode.values())
3305 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3306 <        for (Integer v1 : new Integer[] { 1, null }) {
3307 <
3308 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3309 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3310 <        final IncAction r = new IncAction();
3311 <
3312 <        assertTrue(f.cancel(mayInterruptIfRunning));
3313 <        g.complete(v1);
3314 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
3315 <
3316 <        // unspecified behavior
2591 <        Integer v;
2592 <        try {
2593 <            assertNull(h.join());
2594 <            assertEquals(1, r.invocationCount);
2595 <            assertEquals(inc(v1), r.value);
2596 <        } catch (CompletionException ok) {
2597 <            checkCompletedWithWrappedCancellationException(h);
2598 <            assertEquals(0, r.invocationCount);
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 = k - 1; i >= 0; i--) {
3311 >                checkIncomplete(f);
3312 >                checkIncomplete(CompletableFuture.allOf(fs));
3313 >                fs[i].complete(one);
3314 >            }
3315 >            checkCompletedNormally(f, null);
3316 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3317          }
3318 +    }
3319  
3320 <        checkCancelled(f);
3321 <        checkCompletedNormally(g, v1);
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 <     * runAfterEither result completes normally after normal completion
2608 <     * of either source
3345 >     * anyOf(no component futures) returns an incomplete future
3346       */
3347 <    public void testRunAfterEither_normalCompletion1() {
2611 <        for (ExecutionMode m : ExecutionMode.values())
3347 >    public void testAnyOf_empty() throws Exception {
3348          for (Integer v1 : new Integer[] { 1, null })
3349 <        for (Integer v2 : new Integer[] { 2, null }) {
3350 <
3351 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2616 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2617 <        final Noop r = new Noop();
2618 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3349 >    {
3350 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
3351 >        checkIncomplete(f);
3352  
3353          f.complete(v1);
2621        checkCompletedNormally(h, null);
2622        assertEquals(1, r.invocationCount);
2623        g.complete(v2);
2624
3354          checkCompletedNormally(f, v1);
3355 <        checkCompletedNormally(g, v2);
3356 <        checkCompletedNormally(h, null);
3357 <        assertEquals(1, r.invocationCount);
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++) {
3363 >            CompletableFuture[] fs = new CompletableFuture[k];
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(i);
3370 >                checkCompletedNormally(f, 0);
3371 >                int x = (int) CompletableFuture.anyOf(fs).join();
3372 >                assertTrue(0 <= x && x <= i);
3373 >            }
3374          }
3375      }
3376 <
3377 <    public void testRunAfterEither_normalCompletion2() {
3378 <        for (ExecutionMode m : ExecutionMode.values())
3379 <        for (Integer v1 : new Integer[] { 1, null })
3380 <        for (Integer v2 : new Integer[] { 2, null }) {
3381 <
3382 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3383 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3384 <        final Noop r = new Noop();
3385 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3386 <
3387 <        g.complete(v2);
3388 <        checkCompletedNormally(h, null);
2644 <        assertEquals(1, r.invocationCount);
2645 <        f.complete(v1);
2646 <
2647 <        checkCompletedNormally(f, v1);
2648 <        checkCompletedNormally(g, v2);
2649 <        checkCompletedNormally(h, null);
2650 <        assertEquals(1, r.invocationCount);
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      }
2653    public void testRunAfterEither_normalCompletion3() {
2654        for (ExecutionMode m : ExecutionMode.values())
2655        for (Integer v1 : new Integer[] { 1, null })
2656        for (Integer v2 : new Integer[] { 2, null }) {
3391  
3392 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3393 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3394 <        final Noop r = new Noop();
3395 <
3396 <        f.complete(v1);
3397 <        g.complete(v2);
3398 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3392 >    /**
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++) {
3397 >            CompletableFuture[] fs = new CompletableFuture[k];
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(exs[i]);
3407 >                checkCompletedWithWrappedException(f, exs[0]);
3408 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3409 >            }
3410 >        }
3411 >    }
3412  
3413 <        checkCompletedNormally(h, null);
3414 <        checkCompletedNormally(f, v1);
3415 <        checkCompletedNormally(g, v2);
3416 <        assertEquals(1, r.invocationCount);
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          }
3429      }
3430  
3431      /**
3432 <     * runAfterEither result completes exceptionally after exceptional
2675 <     * completion of either source
3432 >     * Completion methods throw NullPointerException with null arguments
3433       */
3434 <    public void testRunAfterEither_exceptionalCompletion1() {
3435 <        for (ExecutionMode m : ExecutionMode.values())
3436 <        for (Integer v1 : new Integer[] { 1, null }) {
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;
3439 >        ThreadExecutor exec = new ThreadExecutor();
3440  
3441 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3442 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2683 <        final Noop r = new Noop();
2684 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2685 <        final CFException ex = new CFException();
3441 >        assertThrows(
3442 >            NullPointerException.class,
3443  
3444 <        f.completeExceptionally(ex);
3445 <        checkCompletedWithWrappedCFException(h, ex);
3446 <        g.complete(v1);
3444 >            () -> CompletableFuture.supplyAsync(null),
3445 >            () -> CompletableFuture.supplyAsync(null, exec),
3446 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3447  
3448 <        assertEquals(0, r.invocationCount);
3449 <        checkCompletedNormally(g, v1);
3450 <        checkCompletedWithWrappedCFException(f, ex);
2694 <        checkCompletedWithWrappedCFException(h, ex);
2695 <        }
2696 <    }
3448 >            () -> CompletableFuture.runAsync(null),
3449 >            () -> CompletableFuture.runAsync(null, exec),
3450 >            () -> CompletableFuture.runAsync(() -> {}, null),
3451  
3452 <    public void testRunAfterEither_exceptionalCompletion2() {
2699 <        for (ExecutionMode m : ExecutionMode.values())
2700 <        for (Integer v1 : new Integer[] { 1, null }) {
3452 >            () -> f.completeExceptionally(null),
3453  
3454 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3455 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3456 <        final Noop r = new Noop();
3457 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2706 <        final CFException ex = new CFException();
3454 >            () -> f.thenApply(null),
3455 >            () -> f.thenApplyAsync(null),
3456 >            () -> f.thenApplyAsync(x -> x, null),
3457 >            () -> f.thenApplyAsync(null, exec),
3458  
3459 <        g.completeExceptionally(ex);
3460 <        checkCompletedWithWrappedCFException(h, ex);
3461 <        f.complete(v1);
3459 >            () -> f.thenAccept(null),
3460 >            () -> f.thenAcceptAsync(null),
3461 >            () -> f.thenAcceptAsync(x -> {} , null),
3462 >            () -> f.thenAcceptAsync(null, exec),
3463  
3464 <        assertEquals(0, r.invocationCount);
3465 <        checkCompletedNormally(f, v1);
3466 <        checkCompletedWithWrappedCFException(g, ex);
3467 <        checkCompletedWithWrappedCFException(h, ex);
2716 <        }
2717 <    }
3464 >            () -> f.thenRun(null),
3465 >            () -> f.thenRunAsync(null),
3466 >            () -> f.thenRunAsync(() -> {} , null),
3467 >            () -> f.thenRunAsync(null, exec),
3468  
3469 <    public void testRunAfterEither_exceptionalCompletion3() {
3470 <        for (ExecutionMode m : ExecutionMode.values())
3471 <        for (Integer v1 : new Integer[] { 1, null }) {
3469 >            () -> f.thenCombine(g, null),
3470 >            () -> f.thenCombineAsync(g, null),
3471 >            () -> f.thenCombineAsync(g, null, exec),
3472 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3473 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3474 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3475 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3476  
3477 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3478 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3479 <        final Noop r = new Noop();
3480 <        final CFException ex = new CFException();
3477 >            () -> f.thenAcceptBoth(g, null),
3478 >            () -> f.thenAcceptBothAsync(g, null),
3479 >            () -> f.thenAcceptBothAsync(g, null, exec),
3480 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3481 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3482 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3483 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3484  
3485 <        g.completeExceptionally(ex);
3486 <        f.complete(v1);
3487 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3485 >            () -> f.runAfterBoth(g, null),
3486 >            () -> f.runAfterBothAsync(g, null),
3487 >            () -> f.runAfterBothAsync(g, null, exec),
3488 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3489 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3490 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3491 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3492  
3493 <        // unspecified behavior
3494 <        Integer v;
3495 <        try {
3496 <            assertNull(h.join());
3497 <            assertEquals(1, r.invocationCount);
3498 <        } catch (CompletionException ok) {
3499 <            checkCompletedWithWrappedCFException(h, ex);
2739 <            assertEquals(0, r.invocationCount);
2740 <        }
3493 >            () -> f.applyToEither(g, null),
3494 >            () -> f.applyToEitherAsync(g, null),
3495 >            () -> f.applyToEitherAsync(g, null, exec),
3496 >            () -> f.applyToEither(nullFuture, x -> x),
3497 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3498 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3499 >            () -> f.applyToEitherAsync(g, x -> x, null),
3500  
3501 <        checkCompletedWithWrappedCFException(g, ex);
3502 <        checkCompletedNormally(f, v1);
3503 <        }
3504 <    }
3501 >            () -> f.acceptEither(g, null),
3502 >            () -> f.acceptEitherAsync(g, null),
3503 >            () -> f.acceptEitherAsync(g, null, exec),
3504 >            () -> f.acceptEither(nullFuture, x -> {}),
3505 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3506 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3507 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3508  
3509 <    public void testRunAfterEither_exceptionalCompletion4() {
3510 <        for (ExecutionMode m : ExecutionMode.values())
3511 <        for (Integer v1 : new Integer[] { 1, null }) {
3509 >            () -> f.runAfterEither(g, null),
3510 >            () -> f.runAfterEitherAsync(g, null),
3511 >            () -> f.runAfterEitherAsync(g, null, exec),
3512 >            () -> f.runAfterEither(nullFuture, () -> {}),
3513 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3514 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3515 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3516  
3517 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3518 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3519 <        final Noop r = new Noop();
3520 <        final CFException ex = new CFException();
3517 >            () -> f.thenCompose(null),
3518 >            () -> f.thenComposeAsync(null),
3519 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3520 >            () -> f.thenComposeAsync(null, exec),
3521  
3522 <        f.completeExceptionally(ex);
2757 <        g.complete(v1);
2758 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3522 >            () -> f.exceptionally(null),
3523  
3524 <        // unspecified behavior
2761 <        Integer v;
2762 <        try {
2763 <            assertNull(h.join());
2764 <            assertEquals(1, r.invocationCount);
2765 <        } catch (CompletionException ok) {
2766 <            checkCompletedWithWrappedCFException(h, ex);
2767 <            assertEquals(0, r.invocationCount);
2768 <        }
3524 >            () -> f.handle(null),
3525  
3526 <        checkCompletedWithWrappedCFException(f, ex);
3527 <        checkCompletedNormally(g, v1);
3528 <        }
3529 <    }
3526 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3527 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3528 >            () -> CompletableFuture.allOf(f, null),
3529 >            () -> CompletableFuture.allOf(null, f),
3530  
3531 <    /**
3532 <     * runAfterEither result completes exceptionally if action does
3533 <     */
3534 <    public void testRunAfterEither_actionFailed1() {
2779 <        for (ExecutionMode m : ExecutionMode.values())
2780 <        for (Integer v1 : new Integer[] { 1, null })
2781 <        for (Integer v2 : new Integer[] { 2, null }) {
3531 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3532 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3533 >            () -> CompletableFuture.anyOf(f, null),
3534 >            () -> CompletableFuture.anyOf(null, f),
3535  
3536 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2784 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2785 <        final FailingNoop r = new FailingNoop();
2786 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3536 >            () -> f.obtrudeException(null),
3537  
3538 <        f.complete(v1);
3539 <        checkCompletedWithWrappedCFException(h);
3540 <        g.complete(v2);
2791 <        checkCompletedNormally(f, v1);
2792 <        checkCompletedNormally(g, v2);
2793 <        }
2794 <    }
3538 >            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3539 >            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3540 >            () -> CompletableFuture.delayedExecutor(1L, null),
3541  
3542 <    public void testRunAfterEither_actionFailed2() {
3543 <        for (ExecutionMode m : ExecutionMode.values())
2798 <        for (Integer v1 : new Integer[] { 1, null })
2799 <        for (Integer v2 : new Integer[] { 2, null }) {
3542 >            () -> f.orTimeout(1L, null),
3543 >            () -> f.completeOnTimeout(42, 1L, null),
3544  
3545 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3546 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2803 <        final FailingNoop r = new FailingNoop();
2804 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3545 >            () -> CompletableFuture.failedFuture(null),
3546 >            () -> CompletableFuture.failedStage(null));
3547  
3548 <        g.complete(v2);
2807 <        checkCompletedWithWrappedCFException(h);
2808 <        f.complete(v1);
2809 <        checkCompletedNormally(f, v1);
2810 <        checkCompletedNormally(g, v2);
2811 <        }
3548 >        assertEquals(0, exec.count.get());
3549      }
3550  
3551      /**
3552 <     * runAfterEither result completes exceptionally if either source cancelled
3552 >     * Test submissions to an executor that rejects all tasks.
3553       */
3554 <    public void testRunAfterEither_sourceCancelled1() {
3555 <        for (ExecutionMode m : ExecutionMode.values())
3556 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3557 <        for (Integer v1 : new Integer[] { 1, null }) {
3554 >    public void testRejectingExecutor() {
3555 >        for (Integer v : new Integer[] { 1, null })
3556 >    {
3557 >        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3558  
3559 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3560 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2824 <        final Noop r = new Noop();
2825 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3559 >        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3560 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3561  
3562 <        assertTrue(f.cancel(mayInterruptIfRunning));
2828 <        checkCompletedWithWrappedCancellationException(h);
2829 <        g.complete(v1);
3562 >        List<CompletableFuture<?>> futures = new ArrayList<>();
3563  
3564 <        checkCancelled(f);
3565 <        assertEquals(0, r.invocationCount);
3566 <        checkCompletedNormally(g, v1);
3567 <        checkCompletedWithWrappedCancellationException(h);
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          }
2836    }
3594  
3595 <    public void testRunAfterEither_sourceCancelled2() {
3596 <        for (ExecutionMode m : ExecutionMode.values())
2840 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2841 <        for (Integer v1 : new Integer[] { 1, null }) {
3595 >        {
3596 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3597  
3598 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3599 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2845 <        final Noop r = new Noop();
2846 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3598 >            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3599 >            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3600  
3601 <        assertTrue(g.cancel(mayInterruptIfRunning));
3602 <        checkCompletedWithWrappedCancellationException(h);
2850 <        f.complete(v1);
3601 >            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3602 >            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3603  
3604 <        checkCancelled(g);
3605 <        assertEquals(0, r.invocationCount);
3606 <        checkCompletedNormally(f, v1);
3607 <        checkCompletedWithWrappedCancellationException(h);
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          }
2857    }
3611  
3612 <    public void testRunAfterEither_sourceCancelled3() {
3613 <        for (ExecutionMode m : ExecutionMode.values())
2861 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2862 <        for (Integer v1 : new Integer[] { 1, null }) {
3612 >        {
3613 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3614  
3615 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3616 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2866 <        final Noop r = new Noop();
3615 >            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3616 >            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3617  
3618 <        assertTrue(g.cancel(mayInterruptIfRunning));
3619 <        f.complete(v1);
2870 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3618 >            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3619 >            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3620  
3621 <        // unspecified behavior
3622 <        Integer v;
2874 <        try {
2875 <            assertNull(h.join());
2876 <            assertEquals(1, r.invocationCount);
2877 <        } catch (CompletionException ok) {
2878 <            checkCompletedWithWrappedCancellationException(h);
2879 <            assertEquals(0, r.invocationCount);
2880 <        }
3621 >            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3622 >            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3623  
3624 <        checkCancelled(g);
3625 <        checkCompletedNormally(f, v1);
3624 >            for (CompletableFuture<?> future : fs)
3625 >                checkCompletedWithWrappedException(future, e.ex);
3626 >            futures.addAll(fs);
3627          }
2885    }
2886
2887    public void testRunAfterEither_sourceCancelled4() {
2888        for (ExecutionMode m : ExecutionMode.values())
2889        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2890        for (Integer v1 : new Integer[] { 1, null }) {
3628  
3629 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2893 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2894 <        final Noop r = new Noop();
3629 >        incomplete.complete(v);
3630  
3631 <        assertTrue(f.cancel(mayInterruptIfRunning));
3632 <        g.complete(v1);
2898 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2899 <
2900 <        // unspecified behavior
2901 <        Integer v;
2902 <        try {
2903 <            assertNull(h.join());
2904 <            assertEquals(1, r.invocationCount);
2905 <        } catch (CompletionException ok) {
2906 <            checkCompletedWithWrappedCancellationException(h);
2907 <            assertEquals(0, r.invocationCount);
2908 <        }
3631 >        for (CompletableFuture<?> future : futures)
3632 >            checkCompletedWithWrappedException(future, e.ex);
3633  
3634 <        checkCancelled(f);
3635 <        checkCompletedNormally(g, v1);
2912 <        }
2913 <    }
3634 >        assertEquals(futures.size(), e.count.get());
3635 >    }}
3636  
3637      /**
3638 <     * thenCompose result completes normally after normal completion of source
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 testThenCompose_normalCompletion1() {
3643 <        for (ExecutionMode m : ExecutionMode.values())
3644 <        for (Integer v1 : new Integer[] { 1, null }) {
3645 <
2922 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2923 <        final CompletableFutureInc r = new CompletableFutureInc();
2924 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2925 <        f.complete(v1);
2926 <        checkCompletedNormally(g, inc(v1));
2927 <        checkCompletedNormally(f, v1);
2928 <        assertEquals(1, r.invocationCount);
2929 <        }
2930 <    }
3642 >    public void testRejectingExecutorNeverInvoked() {
3643 >        for (Integer v : new Integer[] { 1, null })
3644 >    {
3645 >        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3646  
3647 <    public void testThenCompose_normalCompletion2() {
3648 <        for (ExecutionMode m : ExecutionMode.values())
2934 <        for (Integer v1 : new Integer[] { 1, null }) {
3647 >        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3648 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3649  
3650 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3651 <        final CompletableFutureInc r = new CompletableFutureInc();
3652 <        f.complete(v1);
3653 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2940 <        checkCompletedNormally(g, inc(v1));
2941 <        checkCompletedNormally(f, v1);
2942 <        assertEquals(1, r.invocationCount);
2943 <        }
2944 <    }
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 <    /**
3656 <     * thenCompose result completes exceptionally after exceptional
3657 <     * completion of source
2949 <     */
2950 <    public void testThenCompose_exceptionalCompletion1() {
2951 <        for (ExecutionMode m : ExecutionMode.values()) {
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 <        final CFException ex = new CFException();
3660 <        final CompletableFutureInc r = new CompletableFutureInc();
3661 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2956 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2957 <        f.completeExceptionally(ex);
2958 <        checkCompletedWithWrappedCFException(g, ex);
2959 <        checkCompletedWithWrappedCFException(f, ex);
2960 <        }
2961 <    }
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 <    public void testThenCompose_exceptionalCompletion2() {
3664 <        for (ExecutionMode m : ExecutionMode.values()) {
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 <        final CFException ex = new CFException();
3668 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2968 <        f.completeExceptionally(ex);
2969 <        final CompletableFutureInc r = new CompletableFutureInc();
2970 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2971 <        checkCompletedWithWrappedCFException(g, ex);
2972 <        checkCompletedWithWrappedCFException(f, ex);
2973 <        }
2974 <    }
3667 >        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3668 >        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3669  
3670 <    /**
3671 <     * thenCompose result completes exceptionally if action does
2978 <     */
2979 <    public void testThenCompose_actionFailed1() {
2980 <        for (ExecutionMode m : ExecutionMode.values())
2981 <        for (Integer v1 : new Integer[] { 1, null }) {
3670 >        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3671 >        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3672  
3673 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3674 <        final FailingCompletableFutureFunction r
2985 <            = new FailingCompletableFutureFunction();
2986 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2987 <        f.complete(v1);
2988 <        checkCompletedWithWrappedCFException(g);
2989 <        checkCompletedNormally(f, v1);
2990 <        }
2991 <    }
3673 >        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3674 >        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3675  
3676 <    public void testThenCompose_actionFailed2() {
3677 <        for (ExecutionMode m : ExecutionMode.values())
2995 <        for (Integer v1 : new Integer[] { 1, null }) {
3676 >        for (CompletableFuture<?> future : fs)
3677 >            checkIncomplete(future);
3678  
3679 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3680 <        f.complete(v1);
2999 <        final FailingCompletableFutureFunction r
3000 <            = new FailingCompletableFutureFunction();
3001 <        final CompletableFuture<Integer> g = f.thenCompose(r);
3002 <        checkCompletedWithWrappedCFException(g);
3003 <        checkCompletedNormally(f, v1);
3004 <        }
3005 <    }
3679 >        for (CompletableFuture<?> future : fs)
3680 >            future.complete(null);
3681  
3682 <    /**
3008 <     * thenCompose result completes exceptionally if source cancelled
3009 <     */
3010 <    public void testThenCompose_sourceCancelled1() {
3011 <        for (ExecutionMode m : ExecutionMode.values())
3012 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
3682 >        incomplete.complete(v);
3683  
3684 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3685 <        final CompletableFutureInc r = new CompletableFutureInc();
3016 <        final CompletableFuture<Integer> g = f.thenCompose(r);
3017 <        assertTrue(f.cancel(mayInterruptIfRunning));
3018 <        checkCompletedWithWrappedCancellationException(g);
3019 <        checkCancelled(f);
3020 <        }
3021 <    }
3684 >        for (CompletableFuture<?> future : fs)
3685 >            checkCompletedNormally(future, null);
3686  
3687 <    public void testThenCompose_sourceCancelled2() {
3688 <        for (ExecutionMode m : ExecutionMode.values())
3025 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
3687 >        assertEquals(0, e.count.get());
3688 >    }}
3689  
3690 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3691 <        assertTrue(f.cancel(mayInterruptIfRunning));
3692 <        final CompletableFutureInc r = new CompletableFutureInc();
3693 <        final CompletableFuture<Integer> g = f.thenCompose(r);
3694 <        checkCompletedWithWrappedCancellationException(g);
3695 <        checkCancelled(f);
3033 <        }
3690 >    /**
3691 >     * toCompletableFuture returns this CompletableFuture.
3692 >     */
3693 >    public void testToCompletableFuture() {
3694 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3695 >        assertSame(f, f.toCompletableFuture());
3696      }
3697  
3698 <    // asyncs
3698 >    // jdk9
3699  
3700      /**
3701 <     * thenRunAsync result completes normally after normal completion of source
3701 >     * newIncompleteFuture returns an incomplete CompletableFuture
3702       */
3703 <    public void testThenRunAsync() {
3703 >    public void testNewIncompleteFuture() {
3704 >        for (Integer v1 : new Integer[] { 1, null })
3705 >    {
3706          CompletableFuture<Integer> f = new CompletableFuture<>();
3707 <        Noop r = new Noop();
3708 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3709 <        f.complete(null);
3710 <        checkCompletedNormally(g, null);
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 <        // reordered version
3719 <        f = new CompletableFuture<>();
3720 <        f.complete(null);
3721 <        r = new Noop();
3722 <        g = f.thenRunAsync(r);
3723 <        checkCompletedNormally(g, null);
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 <     * thenRunAsync result completes exceptionally after exceptional
3732 <     * completion of source
3731 >     * defaultExecutor by default returns the commonPool if
3732 >     * it supports more than one thread.
3733       */
3734 <    public void testThenRunAsync2() {
3734 >    public void testDefaultExecutor() {
3735          CompletableFuture<Integer> f = new CompletableFuture<>();
3736 <        Noop r = new Noop();
3737 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3738 <        f.completeExceptionally(new CFException());
3739 <        try {
3740 <            g.join();
3741 <            shouldThrow();
3068 <        } catch (CompletionException success) {}
3069 <        checkCompletedWithWrappedCFException(g);
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 <     * thenRunAsync result completes exceptionally if action does
3745 >     * failedFuture returns a CompletableFuture completed
3746 >     * exceptionally with the given Exception
3747       */
3748 <    public void testThenRunAsync3() {
3749 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3750 <        FailingNoop r = new FailingNoop();
3751 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3079 <        f.complete(null);
3080 <        checkCompletedWithWrappedCFException(g);
3748 >    public void testFailedFuture() {
3749 >        CFException ex = new CFException();
3750 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3751 >        checkCompletedExceptionally(f, ex);
3752      }
3753  
3754      /**
3755 <     * thenRunAsync result completes exceptionally if source cancelled
3755 >     * failedFuture(null) throws NPE
3756       */
3757 <    public void testThenRunAsync4() {
3758 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3759 <        Noop r = new Noop();
3760 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3761 <        assertTrue(f.cancel(true));
3091 <        checkCompletedWithWrappedCancellationException(g);
3757 >    public void testFailedFuture_null() {
3758 >        try {
3759 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3760 >            shouldThrow();
3761 >        } catch (NullPointerException success) {}
3762      }
3763  
3764      /**
3765 <     * thenApplyAsync result completes normally after normal completion of source
3765 >     * copy returns a CompletableFuture that is completed normally,
3766 >     * with the same value, when source is.
3767       */
3768 <    public void testThenApplyAsync() {
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 = f.thenApplyAsync(inc);
3774 <        f.complete(one);
3775 <        checkCompletedNormally(g, two);
3776 <    }
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 <     * thenApplyAsync result completes exceptionally after exceptional
3786 <     * completion of source
3785 >     * copy returns a CompletableFuture that is completed exceptionally
3786 >     * when source is.
3787       */
3788 <    public void testThenApplyAsync2() {
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 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3794 <        f.completeExceptionally(new CFException());
3795 <        checkCompletedWithWrappedCFException(g);
3796 <    }
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 <     * thenApplyAsync result completes exceptionally if action does
3805 >     * Completion of a copy does not complete its source.
3806       */
3807 <    public void testThenApplyAsync3() {
3807 >    public void testCopy_oneWayPropagation() {
3808          CompletableFuture<Integer> f = new CompletableFuture<>();
3809 <        FailingFunction r = new FailingFunction();
3810 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3811 <        f.complete(null);
3812 <        checkCompletedWithWrappedCFException(g);
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 <     * thenApplyAsync result completes exceptionally if source cancelled
3818 >     * minimalCompletionStage returns a CompletableFuture that is
3819 >     * completed normally, with the same value, when source is.
3820       */
3821 <    public void testThenApplyAsync4() {
3821 >    public void testMinimalCompletionStage() {
3822          CompletableFuture<Integer> f = new CompletableFuture<>();
3823 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3824 <        assertTrue(f.cancel(true));
3825 <        checkCompletedWithWrappedCancellationException(g);
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 <     * thenAcceptAsync result completes normally after normal
3836 <     * completion of source
3835 >     * minimalCompletionStage returns a CompletableFuture that is
3836 >     * completed exceptionally when source is.
3837       */
3838 <    public void testThenAcceptAsync() {
3838 >    public void testMinimalCompletionStage2() {
3839          CompletableFuture<Integer> f = new CompletableFuture<>();
3840 <        IncAction r = new IncAction();
3841 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3842 <        f.complete(one);
3843 <        checkCompletedNormally(g, null);
3844 <        assertEquals(r.value, (Integer) 2);
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 <     * thenAcceptAsync result completes exceptionally after exceptional
3854 <     * completion of source
3853 >     * failedStage returns a CompletionStage completed
3854 >     * exceptionally with the given Exception
3855       */
3856 <    public void testThenAcceptAsync2() {
3857 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3858 <        IncAction r = new IncAction();
3859 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3860 <        f.completeExceptionally(new CFException());
3861 <        checkCompletedWithWrappedCFException(g);
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 <     * thenAcceptAsync result completes exceptionally if action does
3867 >     * completeAsync completes with value of given supplier
3868       */
3869 <    public void testThenAcceptAsync3() {
3869 >    public void testCompleteAsync() {
3870 >        for (Integer v1 : new Integer[] { 1, null })
3871 >    {
3872          CompletableFuture<Integer> f = new CompletableFuture<>();
3873 <        FailingConsumer r = new FailingConsumer();
3874 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3875 <        f.complete(null);
3876 <        checkCompletedWithWrappedCFException(g);
3170 <    }
3873 >        f.completeAsync(() -> v1);
3874 >        f.join();
3875 >        checkCompletedNormally(f, v1);
3876 >    }}
3877  
3878      /**
3879 <     * thenAcceptAsync result completes exceptionally if source cancelled
3879 >     * completeAsync completes exceptionally if given supplier throws
3880       */
3881 <    public void testThenAcceptAsync4() {
3881 >    public void testCompleteAsync2() {
3882          CompletableFuture<Integer> f = new CompletableFuture<>();
3883 <        IncAction r = new IncAction();
3884 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3885 <        assertTrue(f.cancel(true));
3886 <        checkCompletedWithWrappedCancellationException(g);
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  
3183    // async with explicit executors
3184
3892      /**
3893 <     * thenRunAsync result completes normally after normal completion of source
3893 >     * completeAsync with given executor completes with value of given supplier
3894       */
3895 <    public void testThenRunAsyncE() {
3895 >    public void testCompleteAsync3() {
3896 >        for (Integer v1 : new Integer[] { 1, null })
3897 >    {
3898          CompletableFuture<Integer> f = new CompletableFuture<>();
3899 <        Noop r = new Noop();
3900 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3901 <        f.complete(null);
3902 <        checkCompletedNormally(g, null);
3903 <
3904 <        // reordered version
3196 <        f = new CompletableFuture<>();
3197 <        f.complete(null);
3198 <        r = new Noop();
3199 <        g = f.thenRunAsync(r, new ThreadExecutor());
3200 <        checkCompletedNormally(g, null);
3201 <    }
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 <     * thenRunAsync result completes exceptionally after exceptional
3908 <     * completion of source
3907 >     * completeAsync with given executor completes exceptionally if
3908 >     * given supplier throws
3909       */
3910 <    public void testThenRunAsync2E() {
3910 >    public void testCompleteAsync4() {
3911          CompletableFuture<Integer> f = new CompletableFuture<>();
3912 <        Noop r = new Noop();
3913 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3914 <        f.completeExceptionally(new CFException());
3912 >        CFException ex = new CFException();
3913 >        ThreadExecutor executor = new ThreadExecutor();
3914 >        f.completeAsync(() -> { throw ex; }, executor);
3915          try {
3916 <            g.join();
3916 >            f.join();
3917              shouldThrow();
3918          } catch (CompletionException success) {}
3919 <        checkCompletedWithWrappedCFException(g);
3919 >        checkCompletedWithWrappedException(f, ex);
3920 >        assertEquals(1, executor.count.get());
3921      }
3922  
3923      /**
3924 <     * thenRunAsync result completes exceptionally if action does
3924 >     * orTimeout completes with TimeoutException if not complete
3925       */
3926 <    public void testThenRunAsync3E() {
3926 >    public void testOrTimeout_timesOut() {
3927 >        long timeoutMillis = timeoutMillis();
3928          CompletableFuture<Integer> f = new CompletableFuture<>();
3929 <        FailingNoop r = new FailingNoop();
3930 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3931 <        f.complete(null);
3932 <        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 <     * thenRunAsync result completes exceptionally if source cancelled
3936 >     * orTimeout completes normally if completed before timeout
3937       */
3938 <    public void testThenRunAsync4E() {
3938 >    public void testOrTimeout_completed() {
3939 >        for (Integer v1 : new Integer[] { 1, null })
3940 >    {
3941          CompletableFuture<Integer> f = new CompletableFuture<>();
3942 <        Noop r = new Noop();
3943 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3944 <        assertTrue(f.cancel(true));
3945 <        checkCompletedWithWrappedCancellationException(g);
3946 <    }
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 <     * thenApplyAsync result completes normally after normal completion of source
3954 >     * completeOnTimeout completes with given value if not complete
3955       */
3956 <    public void testThenApplyAsyncE() {
3957 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3958 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3247 <        f.complete(one);
3248 <        checkCompletedNormally(g, two);
3956 >    public void testCompleteOnTimeout_timesOut() {
3957 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3958 >                       () -> testCompleteOnTimeout_timesOut(null));
3959      }
3960  
3961      /**
3962 <     * thenApplyAsync result completes exceptionally after exceptional
3253 <     * completion of source
3962 >     * completeOnTimeout completes with given value if not complete
3963       */
3964 <    public void testThenApplyAsync2E() {
3964 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3965 >        long timeoutMillis = timeoutMillis();
3966          CompletableFuture<Integer> f = new CompletableFuture<>();
3967 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3968 <        f.completeExceptionally(new CFException());
3969 <        checkCompletedWithWrappedCFException(g);
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 <     * thenApplyAsync result completes exceptionally if action does
3976 >     * completeOnTimeout has no effect if completed within timeout
3977       */
3978 <    public void testThenApplyAsync3E() {
3978 >    public void testCompleteOnTimeout_completed() {
3979 >        for (Integer v1 : new Integer[] { 1, null })
3980 >    {
3981          CompletableFuture<Integer> f = new CompletableFuture<>();
3982 <        FailingFunction r = new FailingFunction();
3983 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3984 <        f.complete(null);
3985 <        checkCompletedWithWrappedCFException(g);
3986 <    }
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 <     * thenApplyAsync result completes exceptionally if source cancelled
3994 >     * delayedExecutor returns an executor that delays submission
3995       */
3996 <    public void testThenApplyAsync4E() {
3997 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3998 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3999 <        assertTrue(f.cancel(true));
4000 <        checkCompletedWithWrappedCancellationException(g);
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 >            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 <     * thenAcceptAsync result completes normally after normal
3285 <     * completion of source
4149 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
4150       */
4151 <    public void testThenAcceptAsyncE() {
4152 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4153 <        IncAction r = new IncAction();
4154 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
4155 <        f.complete(one);
4156 <        checkCompletedNormally(g, null);
4157 <        assertEquals(r.value, (Integer) 2);
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      (type == boolean.class) args[i] = false;
4194 >                else if (type == int.class)     args[i] = 0;
4195 >                else if (type == long.class)    args[i] = 0L;
4196 >            }
4197 >            for (CompletionStage<Integer> stage : stages) {
4198 >                try {
4199 >                    method.invoke(stage, args);
4200 >                    bugs.add(method);
4201 >                }
4202 >                catch (java.lang.reflect.InvocationTargetException expected) {
4203 >                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4204 >                        bugs.add(method);
4205 >                        // expected.getCause().printStackTrace();
4206 >                    }
4207 >                }
4208 >                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4209 >            }
4210 >        }
4211 >        if (!bugs.isEmpty())
4212 >            throw new Error("Methods did not throw UOE: " + bugs);
4213      }
4214  
4215      /**
4216 <     * thenAcceptAsync result completes exceptionally after exceptional
4217 <     * completion of source
4216 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4217 >     * is completed normally, with the same value, when source is.
4218       */
4219 <    public void testThenAcceptAsync2E() {
4219 >    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4220 >        for (boolean createIncomplete : new boolean[] { true, false })
4221 >        for (Integer v1 : new Integer[] { 1, null })
4222 >    {
4223          CompletableFuture<Integer> f = new CompletableFuture<>();
4224 <        IncAction r = new IncAction();
4225 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
4226 <        f.completeExceptionally(new CFException());
4227 <        checkCompletedWithWrappedCFException(g);
4228 <    }
4224 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4225 >        if (!createIncomplete) assertTrue(f.complete(v1));
4226 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4227 >        if (createIncomplete) {
4228 >            checkIncomplete(f);
4229 >            checkIncomplete(g);
4230 >            assertTrue(f.complete(v1));
4231 >        }
4232 >        checkCompletedNormally(f, v1);
4233 >        checkCompletedNormally(g, v1);
4234 >    }}
4235  
4236      /**
4237 <     * thenAcceptAsync result completes exceptionally if action does
4237 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4238 >     * is completed exceptionally when source is.
4239       */
4240 <    public void testThenAcceptAsync3E() {
4240 >    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4241 >        for (boolean createIncomplete : new boolean[] { true, false })
4242 >    {
4243 >        CFException ex = new CFException();
4244          CompletableFuture<Integer> f = new CompletableFuture<>();
4245 <        FailingConsumer r = new FailingConsumer();
4246 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
4247 <        f.complete(null);
4248 <        checkCompletedWithWrappedCFException(g);
4249 <    }
4245 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4246 >        if (!createIncomplete) f.completeExceptionally(ex);
4247 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4248 >        if (createIncomplete) {
4249 >            checkIncomplete(f);
4250 >            checkIncomplete(g);
4251 >            f.completeExceptionally(ex);
4252 >        }
4253 >        checkCompletedExceptionally(f, ex);
4254 >        checkCompletedWithWrappedException(g, ex);
4255 >    }}
4256  
4257      /**
4258 <     * thenAcceptAsync result completes exceptionally if source cancelled
4258 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4259       */
4260 <    public void testThenAcceptAsync4E() {
4260 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4261 >        for (Integer v1 : new Integer[] { 1, null })
4262 >    {
4263          CompletableFuture<Integer> f = new CompletableFuture<>();
4264 <        IncAction r = new IncAction();
4265 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
4266 <        assertTrue(f.cancel(true));
4267 <        checkCompletedWithWrappedCancellationException(g);
4268 <    }
4269 <
4270 <    // other static methods
4264 >        CompletionStage minimal = f.minimalCompletionStage();
4265 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4266 >        assertTrue(g.complete(v1));
4267 >        checkCompletedNormally(g, v1);
4268 >        checkIncomplete(f);
4269 >        checkIncomplete(minimal.toCompletableFuture());
4270 >    }}
4271  
4272      /**
4273 <     * allOf(no component futures) returns a future completed normally
3334 <     * with the value null
4273 >     * minimalStage.toCompletableFuture().join() awaits completion
4274       */
4275 <    public void testAllOf_empty() throws Exception {
4276 <        CompletableFuture<Void> f = CompletableFuture.allOf();
4277 <        checkCompletedNormally(f, null);
4278 <    }
4275 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4276 >        for (boolean createIncomplete : new boolean[] { true, false })
4277 >        for (Integer v1 : new Integer[] { 1, null })
4278 >    {
4279 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4280 >        if (!createIncomplete) assertTrue(f.complete(v1));
4281 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4282 >        if (createIncomplete) assertTrue(f.complete(v1));
4283 >        assertEquals(v1, minimal.toCompletableFuture().join());
4284 >        assertEquals(v1, minimal.toCompletableFuture().get());
4285 >        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4286 >    }}
4287  
4288      /**
4289 <     * allOf returns a future completed normally with the value null
4290 <     * when all components complete normally
4289 >     * Completion of a toCompletableFuture copy of a minimal stage
4290 >     * does not complete its source.
4291       */
4292 <    public void testAllOf_normal() throws Exception {
4293 <        for (int k = 1; k < 20; ++k) {
4294 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
4295 <            for (int i = 0; i < k; ++i)
4296 <                fs[i] = new CompletableFuture<>();
4297 <            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
4298 <            for (int i = 0; i < k; ++i) {
4299 <                checkIncomplete(f);
4300 <                checkIncomplete(CompletableFuture.allOf(fs));
4301 <                fs[i].complete(one);
4302 <            }
3356 <            checkCompletedNormally(f, null);
3357 <            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3358 <        }
4292 >    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4293 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4294 >        CompletionStage<Integer> g = f.minimalCompletionStage();
4295 >        assertTrue(g.toCompletableFuture().complete(1));
4296 >        assertTrue(g.toCompletableFuture().complete(null));
4297 >        assertTrue(g.toCompletableFuture().cancel(true));
4298 >        assertTrue(g.toCompletableFuture().cancel(false));
4299 >        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4300 >        checkIncomplete(g.toCompletableFuture());
4301 >        f.complete(1);
4302 >        checkCompletedNormally(g.toCompletableFuture(), 1);
4303      }
4304  
4305 <    /**
4306 <     * anyOf(no component futures) returns an incomplete future
4307 <     */
4308 <    public void testAnyOf_empty() throws Exception {
4309 <        CompletableFuture<Object> f = CompletableFuture.anyOf();
4310 <        checkIncomplete(f);
4305 >    /** Demo utility method for external reliable toCompletableFuture */
4306 >    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4307 >        CompletableFuture<T> f = new CompletableFuture<>();
4308 >        stage.handle((T t, Throwable ex) -> {
4309 >                         if (ex != null) f.completeExceptionally(ex);
4310 >                         else f.complete(t);
4311 >                         return null;
4312 >                     });
4313 >        return f;
4314      }
4315  
4316 <    /**
4317 <     * anyOf returns a future completed normally with a value when
4318 <     * a component future does
3372 <     */
3373 <    public void testAnyOf_normal() throws Exception {
3374 <        for (int k = 0; k < 10; ++k) {
3375 <            CompletableFuture[] fs = new CompletableFuture[k];
3376 <            for (int i = 0; i < k; ++i)
3377 <                fs[i] = new CompletableFuture<>();
3378 <            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3379 <            checkIncomplete(f);
3380 <            for (int i = 0; i < k; ++i) {
3381 <                fs[i].complete(one);
3382 <                checkCompletedNormally(f, one);
3383 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3384 <            }
3385 <        }
4316 >    /** Demo utility method to join a CompletionStage */
4317 >    static <T> T join(CompletionStage<T> stage) {
4318 >        return toCompletableFuture(stage).join();
4319      }
4320  
4321      /**
4322 <     * anyOf result completes exceptionally when any component does.
4322 >     * Joining a minimal stage "by hand" works
4323       */
4324 <    public void testAnyOf_exceptional() throws Exception {
4325 <        for (int k = 0; k < 10; ++k) {
4326 <            CompletableFuture[] fs = new CompletableFuture[k];
4327 <            for (int i = 0; i < k; ++i)
4328 <                fs[i] = new CompletableFuture<>();
4329 <            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
4330 <            checkIncomplete(f);
4331 <            for (int i = 0; i < k; ++i) {
4332 <                fs[i].completeExceptionally(new CFException());
4333 <                checkCompletedWithWrappedCFException(f);
4334 <                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
4324 >    public void testMinimalCompletionStage_join_by_hand() {
4325 >        for (boolean createIncomplete : new boolean[] { true, false })
4326 >        for (Integer v1 : new Integer[] { 1, null })
4327 >    {
4328 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4329 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4330 >        CompletableFuture<Integer> g = new CompletableFuture<>();
4331 >        if (!createIncomplete) assertTrue(f.complete(v1));
4332 >        minimal.thenAccept(x -> g.complete(x));
4333 >        if (createIncomplete) assertTrue(f.complete(v1));
4334 >        g.join();
4335 >        checkCompletedNormally(g, v1);
4336 >        checkCompletedNormally(f, v1);
4337 >        assertEquals(v1, join(minimal));
4338 >    }}
4339 >
4340 >    static class Monad {
4341 >        static class ZeroException extends RuntimeException {
4342 >            public ZeroException() { super("monadic zero"); }
4343 >        }
4344 >        // "return", "unit"
4345 >        static <T> CompletableFuture<T> unit(T value) {
4346 >            return completedFuture(value);
4347 >        }
4348 >        // monadic zero ?
4349 >        static <T> CompletableFuture<T> zero() {
4350 >            return failedFuture(new ZeroException());
4351 >        }
4352 >        // >=>
4353 >        static <T,U,V> Function<T, CompletableFuture<V>> compose
4354 >            (Function<T, CompletableFuture<U>> f,
4355 >             Function<U, CompletableFuture<V>> g) {
4356 >            return x -> f.apply(x).thenCompose(g);
4357 >        }
4358 >
4359 >        static void assertZero(CompletableFuture<?> f) {
4360 >            try {
4361 >                f.getNow(null);
4362 >                throw new AssertionError("should throw");
4363 >            } catch (CompletionException success) {
4364 >                assertTrue(success.getCause() instanceof ZeroException);
4365              }
4366          }
4367 <    }
4367 >
4368 >        static <T> void assertFutureEquals(CompletableFuture<T> f,
4369 >                                           CompletableFuture<T> g) {
4370 >            T fval = null, gval = null;
4371 >            Throwable fex = null, gex = null;
4372 >
4373 >            try { fval = f.get(); }
4374 >            catch (ExecutionException ex) { fex = ex.getCause(); }
4375 >            catch (Throwable ex) { fex = ex; }
4376 >
4377 >            try { gval = g.get(); }
4378 >            catch (ExecutionException ex) { gex = ex.getCause(); }
4379 >            catch (Throwable ex) { gex = ex; }
4380 >
4381 >            if (fex != null || gex != null)
4382 >                assertSame(fex.getClass(), gex.getClass());
4383 >            else
4384 >                assertEquals(fval, gval);
4385 >        }
4386 >
4387 >        static class PlusFuture<T> extends CompletableFuture<T> {
4388 >            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4389 >        }
4390 >
4391 >        /** Implements "monadic plus". */
4392 >        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4393 >                                             CompletableFuture<? extends T> g) {
4394 >            PlusFuture<T> plus = new PlusFuture<T>();
4395 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4396 >                try {
4397 >                    if (ex == null) {
4398 >                        if (plus.complete(result))
4399 >                            if (plus.firstFailure.get() != null)
4400 >                                plus.firstFailure.set(null);
4401 >                    }
4402 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4403 >                        if (plus.isDone())
4404 >                            plus.firstFailure.set(null);
4405 >                    }
4406 >                    else {
4407 >                        // first failure has precedence
4408 >                        Throwable first = plus.firstFailure.getAndSet(null);
4409 >
4410 >                        // may fail with "Self-suppression not permitted"
4411 >                        try { first.addSuppressed(ex); }
4412 >                        catch (Exception ignored) {}
4413 >
4414 >                        plus.completeExceptionally(first);
4415 >                    }
4416 >                } catch (Throwable unexpected) {
4417 >                    plus.completeExceptionally(unexpected);
4418 >                }
4419 >            };
4420 >            f.whenComplete(action);
4421 >            g.whenComplete(action);
4422 >            return plus;
4423 >        }
4424 >    }
4425 >
4426 >    /**
4427 >     * CompletableFuture is an additive monad - sort of.
4428 >     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4429 >     */
4430 >    public void testAdditiveMonad() throws Throwable {
4431 >        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4432 >        CompletableFuture<Long> zero = Monad.zero();
4433 >
4434 >        // Some mutually non-commutative functions
4435 >        Function<Long, CompletableFuture<Long>> triple
4436 >            = x -> Monad.unit(3 * x);
4437 >        Function<Long, CompletableFuture<Long>> inc
4438 >            = x -> Monad.unit(x + 1);
4439 >
4440 >        // unit is a right identity: m >>= unit === m
4441 >        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4442 >                                 inc.apply(5L));
4443 >        // unit is a left identity: (unit x) >>= f === f x
4444 >        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4445 >                                 inc.apply(5L));
4446 >
4447 >        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4448 >        Monad.assertFutureEquals(
4449 >            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4450 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4451 >
4452 >        // The case for CompletableFuture as an additive monad is weaker...
4453 >
4454 >        // zero is a monadic zero
4455 >        Monad.assertZero(zero);
4456 >
4457 >        // left zero: zero >>= f === zero
4458 >        Monad.assertZero(zero.thenCompose(inc));
4459 >        // right zero: f >>= (\x -> zero) === zero
4460 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4461 >
4462 >        // f plus zero === f
4463 >        Monad.assertFutureEquals(Monad.unit(5L),
4464 >                                 Monad.plus(Monad.unit(5L), zero));
4465 >        // zero plus f === f
4466 >        Monad.assertFutureEquals(Monad.unit(5L),
4467 >                                 Monad.plus(zero, Monad.unit(5L)));
4468 >        // zero plus zero === zero
4469 >        Monad.assertZero(Monad.plus(zero, zero));
4470 >        {
4471 >            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4472 >                                                   Monad.unit(8L));
4473 >            // non-determinism
4474 >            assertTrue(f.get() == 5L || f.get() == 8L);
4475 >        }
4476 >
4477 >        CompletableFuture<Long> godot = new CompletableFuture<>();
4478 >        // f plus godot === f (doesn't wait for godot)
4479 >        Monad.assertFutureEquals(Monad.unit(5L),
4480 >                                 Monad.plus(Monad.unit(5L), godot));
4481 >        // godot plus f === f (doesn't wait for godot)
4482 >        Monad.assertFutureEquals(Monad.unit(5L),
4483 >                                 Monad.plus(godot, Monad.unit(5L)));
4484 >    }
4485 >
4486 >    /** Test long recursive chains of CompletableFutures with cascading completions */
4487 >    @SuppressWarnings("FutureReturnValueIgnored")
4488 >    public void testRecursiveChains() throws Throwable {
4489 >        for (ExecutionMode m : ExecutionMode.values())
4490 >        for (boolean addDeadEnds : new boolean[] { true, false })
4491 >    {
4492 >        final int val = 42;
4493 >        final int n = expensiveTests ? 1_000 : 2;
4494 >        CompletableFuture<Integer> head = new CompletableFuture<>();
4495 >        CompletableFuture<Integer> tail = head;
4496 >        for (int i = 0; i < n; i++) {
4497 >            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4498 >            tail = m.thenApply(tail, v -> v + 1);
4499 >            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4500 >            tail = m.applyToEither(tail, tail, v -> v + 1);
4501 >            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4502 >            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4503 >        }
4504 >        head.complete(val);
4505 >        assertEquals(val + 3 * n, (int) tail.join());
4506 >    }}
4507  
4508      /**
4509 <     * Completion methods throw NullPointerException with null arguments
4509 >     * A single CompletableFuture with many dependents.
4510 >     * A demo of scalability - runtime is O(n).
4511       */
4512 <    public void testNPE() {
4513 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4514 <        CompletableFuture<Integer> g = new CompletableFuture<>();
4515 <        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
4516 <        CompletableFuture<?> h;
4517 <        ThreadExecutor exec = new ThreadExecutor();
4512 >    @SuppressWarnings("FutureReturnValueIgnored")
4513 >    public void testManyDependents() throws Throwable {
4514 >        final int n = expensiveTests ? 1_000_000 : 10;
4515 >        final CompletableFuture<Void> head = new CompletableFuture<>();
4516 >        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4517 >        final AtomicInteger count = new AtomicInteger(0);
4518 >        for (int i = 0; i < n; i++) {
4519 >            head.thenRun(() -> count.getAndIncrement());
4520 >            head.thenAccept(x -> count.getAndIncrement());
4521 >            head.thenApply(x -> count.getAndIncrement());
4522 >
4523 >            head.runAfterBoth(complete, () -> count.getAndIncrement());
4524 >            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4525 >            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4526 >            complete.runAfterBoth(head, () -> count.getAndIncrement());
4527 >            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4528 >            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4529 >
4530 >            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4531 >            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4532 >            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4533 >            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4534 >            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4535 >            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4536 >        }
4537 >        head.complete(null);
4538 >        assertEquals(5 * 3 * n, count.get());
4539 >    }
4540 >
4541 >    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4542 >    @SuppressWarnings("FutureReturnValueIgnored")
4543 >    public void testCoCompletionGarbageRetention() throws Throwable {
4544 >        final int n = expensiveTests ? 1_000_000 : 10;
4545 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4546 >        CompletableFuture<Integer> f;
4547 >        for (int i = 0; i < n; i++) {
4548 >            f = new CompletableFuture<>();
4549 >            f.runAfterEither(incomplete, () -> {});
4550 >            f.complete(null);
4551  
4552 <        Runnable[] throwingActions = {
4553 <            () -> CompletableFuture.supplyAsync(null),
4554 <            () -> CompletableFuture.supplyAsync(null, exec),
3419 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
4552 >            f = new CompletableFuture<>();
4553 >            f.acceptEither(incomplete, x -> {});
4554 >            f.complete(null);
4555  
4556 <            () -> CompletableFuture.runAsync(null),
4557 <            () -> CompletableFuture.runAsync(null, exec),
4558 <            () -> CompletableFuture.runAsync(() -> {}, null),
4556 >            f = new CompletableFuture<>();
4557 >            f.applyToEither(incomplete, x -> x);
4558 >            f.complete(null);
4559  
4560 <            () -> f.completeExceptionally(null),
4560 >            f = new CompletableFuture<>();
4561 >            CompletableFuture.anyOf(f, incomplete);
4562 >            f.complete(null);
4563 >        }
4564  
4565 <            () -> f.thenApply(null),
4566 <            () -> f.thenApplyAsync(null),
4567 <            () -> f.thenApplyAsync((x) -> x, null),
4568 <            () -> f.thenApplyAsync(null, exec),
4565 >        for (int i = 0; i < n; i++) {
4566 >            f = new CompletableFuture<>();
4567 >            incomplete.runAfterEither(f, () -> {});
4568 >            f.complete(null);
4569  
4570 <            () -> f.thenAccept(null),
4571 <            () -> f.thenAcceptAsync(null),
4572 <            () -> f.thenAcceptAsync((x) -> {} , null),
3435 <            () -> f.thenAcceptAsync(null, exec),
4570 >            f = new CompletableFuture<>();
4571 >            incomplete.acceptEither(f, x -> {});
4572 >            f.complete(null);
4573  
4574 <            () -> f.thenRun(null),
4575 <            () -> f.thenRunAsync(null),
4576 <            () -> f.thenRunAsync(() -> {} , null),
3440 <            () -> f.thenRunAsync(null, exec),
4574 >            f = new CompletableFuture<>();
4575 >            incomplete.applyToEither(f, x -> x);
4576 >            f.complete(null);
4577  
4578 <            () -> f.thenCombine(g, null),
4579 <            () -> f.thenCombineAsync(g, null),
4580 <            () -> f.thenCombineAsync(g, null, exec),
4581 <            () -> f.thenCombine(nullFuture, (x, y) -> x),
4582 <            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3447 <            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3448 <            () -> f.thenCombineAsync(g, (x, y) -> x, null),
4578 >            f = new CompletableFuture<>();
4579 >            CompletableFuture.anyOf(incomplete, f);
4580 >            f.complete(null);
4581 >        }
4582 >    }
4583  
4584 <            () -> f.thenAcceptBoth(g, null),
4585 <            () -> f.thenAcceptBothAsync(g, null),
4586 <            () -> f.thenAcceptBothAsync(g, null, exec),
4587 <            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
4588 <            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
4589 <            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
4590 <            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
4584 >    /**
4585 >     * Reproduction recipe for:
4586 >     * 8160402: Garbage retention with CompletableFuture.anyOf
4587 >     * 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
4588 >     */
4589 >    public void testAnyOfGarbageRetention() throws Throwable {
4590 >        for (Integer v : new Integer[] { 1, null })
4591 >    {
4592 >        final int n = expensiveTests ? 100_000 : 10;
4593 >        CompletableFuture<Integer>[] fs
4594 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4595 >        for (int i = 0; i < fs.length; i++)
4596 >            fs[i] = new CompletableFuture<>();
4597 >        fs[fs.length - 1].complete(v);
4598 >        for (int i = 0; i < n; i++)
4599 >            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4600 >    }}
4601  
4602 <            () -> f.runAfterBoth(g, null),
4603 <            () -> f.runAfterBothAsync(g, null),
4604 <            () -> f.runAfterBothAsync(g, null, exec),
4605 <            () -> f.runAfterBoth(nullFuture, () -> {}),
4606 <            () -> f.runAfterBothAsync(nullFuture, () -> {}),
4607 <            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
4608 <            () -> f.runAfterBothAsync(g, () -> {}, null),
4602 >    /**
4603 >     * Checks for garbage retention with allOf.
4604 >     *
4605 >     * As of 2016-07, fails with OOME:
4606 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4607 >     */
4608 >    public void testCancelledAllOfGarbageRetention() throws Throwable {
4609 >        final int n = expensiveTests ? 100_000 : 10;
4610 >        CompletableFuture<Integer>[] fs
4611 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4612 >        for (int i = 0; i < fs.length; i++)
4613 >            fs[i] = new CompletableFuture<>();
4614 >        for (int i = 0; i < n; i++)
4615 >            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4616 >    }
4617 >
4618 >    /**
4619 >     * Checks for garbage retention when a dependent future is
4620 >     * cancelled and garbage-collected.
4621 >     * 8161600: Garbage retention when source CompletableFutures are never completed
4622 >     *
4623 >     * As of 2016-07, fails with OOME:
4624 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4625 >     */
4626 >    public void testCancelledGarbageRetention() throws Throwable {
4627 >        final int n = expensiveTests ? 100_000 : 10;
4628 >        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4629 >        for (int i = 0; i < n; i++)
4630 >            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4631 >    }
4632 >
4633 >    /**
4634 >     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4635 >     * is invoked many times.
4636 >     * 8161600: Garbage retention when source CompletableFutures are never completed
4637 >     *
4638 >     * As of 2016-07, fails with OOME:
4639 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4640 >     */
4641 >    public void testToCompletableFutureGarbageRetention() throws Throwable {
4642 >        final int n = expensiveTests ? 900_000 : 10;
4643 >        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4644 >        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4645 >        for (int i = 0; i < n; i++)
4646 >            assertTrue(minimal.toCompletableFuture().cancel(true));
4647 >    }
4648 >
4649 > //     static <U> U join(CompletionStage<U> stage) {
4650 > //         CompletableFuture<U> f = new CompletableFuture<>();
4651 > //         stage.whenComplete((v, ex) -> {
4652 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4653 > //         });
4654 > //         return f.join();
4655 > //     }
4656 >
4657 > //     static <U> boolean isDone(CompletionStage<U> stage) {
4658 > //         CompletableFuture<U> f = new CompletableFuture<>();
4659 > //         stage.whenComplete((v, ex) -> {
4660 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4661 > //         });
4662 > //         return f.isDone();
4663 > //     }
4664 >
4665 > //     static <U> U join2(CompletionStage<U> stage) {
4666 > //         return stage.toCompletableFuture().copy().join();
4667 > //     }
4668 >
4669 > //     static <U> boolean isDone2(CompletionStage<U> stage) {
4670 > //         return stage.toCompletableFuture().copy().isDone();
4671 > //     }
4672 >
4673 >    // For testing default implementations
4674 >    // Only non-default interface methods defined.
4675 >    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4676 >        final CompletableFuture<T> cf;
4677 >        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4678 >        public CompletableFuture<T> toCompletableFuture() {
4679 >            return cf; }
4680 >        public CompletionStage<Void> thenRun
4681 >            (Runnable action) {
4682 >            return cf.thenRun(action); }
4683 >        public CompletionStage<Void> thenRunAsync
4684 >            (Runnable action) {
4685 >            return cf.thenRunAsync(action); }
4686 >        public CompletionStage<Void> thenRunAsync
4687 >            (Runnable action,
4688 >             Executor executor) {
4689 >            return cf.thenRunAsync(action, executor); }
4690 >        public CompletionStage<Void> thenAccept
4691 >            (Consumer<? super T> action) {
4692 >            return cf.thenAccept(action); }
4693 >        public CompletionStage<Void> thenAcceptAsync
4694 >            (Consumer<? super T> action) {
4695 >            return cf.thenAcceptAsync(action); }
4696 >        public CompletionStage<Void> thenAcceptAsync
4697 >            (Consumer<? super T> action,
4698 >             Executor executor) {
4699 >            return cf.thenAcceptAsync(action, executor); }
4700 >        public <U> CompletionStage<U> thenApply
4701 >            (Function<? super T,? extends U> a) {
4702 >            return cf.thenApply(a); }
4703 >        public <U> CompletionStage<U> thenApplyAsync
4704 >            (Function<? super T,? extends U> fn) {
4705 >            return cf.thenApplyAsync(fn); }
4706 >        public <U> CompletionStage<U> thenApplyAsync
4707 >            (Function<? super T,? extends U> fn,
4708 >             Executor executor) {
4709 >            return cf.thenApplyAsync(fn, executor); }
4710 >        public <U,V> CompletionStage<V> thenCombine
4711 >            (CompletionStage<? extends U> other,
4712 >             BiFunction<? super T,? super U,? extends V> fn) {
4713 >            return cf.thenCombine(other, fn); }
4714 >        public <U,V> CompletionStage<V> thenCombineAsync
4715 >            (CompletionStage<? extends U> other,
4716 >             BiFunction<? super T,? super U,? extends V> fn) {
4717 >            return cf.thenCombineAsync(other, fn); }
4718 >        public <U,V> CompletionStage<V> thenCombineAsync
4719 >            (CompletionStage<? extends U> other,
4720 >             BiFunction<? super T,? super U,? extends V> fn,
4721 >             Executor executor) {
4722 >            return cf.thenCombineAsync(other, fn, executor); }
4723 >        public <U> CompletionStage<Void> thenAcceptBoth
4724 >            (CompletionStage<? extends U> other,
4725 >             BiConsumer<? super T, ? super U> action) {
4726 >            return cf.thenAcceptBoth(other, action); }
4727 >        public <U> CompletionStage<Void> thenAcceptBothAsync
4728 >            (CompletionStage<? extends U> other,
4729 >             BiConsumer<? super T, ? super U> action) {
4730 >            return cf.thenAcceptBothAsync(other, action); }
4731 >        public <U> CompletionStage<Void> thenAcceptBothAsync
4732 >            (CompletionStage<? extends U> other,
4733 >             BiConsumer<? super T, ? super U> action,
4734 >             Executor executor) {
4735 >            return cf.thenAcceptBothAsync(other, action, executor); }
4736 >        public CompletionStage<Void> runAfterBoth
4737 >            (CompletionStage<?> other,
4738 >             Runnable action) {
4739 >            return cf.runAfterBoth(other, action); }
4740 >        public CompletionStage<Void> runAfterBothAsync
4741 >            (CompletionStage<?> other,
4742 >             Runnable action) {
4743 >            return cf.runAfterBothAsync(other, action); }
4744 >        public CompletionStage<Void> runAfterBothAsync
4745 >            (CompletionStage<?> other,
4746 >             Runnable action,
4747 >             Executor executor) {
4748 >            return cf.runAfterBothAsync(other, action, executor); }
4749 >        public <U> CompletionStage<U> applyToEither
4750 >            (CompletionStage<? extends T> other,
4751 >             Function<? super T, U> fn) {
4752 >            return cf.applyToEither(other, fn); }
4753 >        public <U> CompletionStage<U> applyToEitherAsync
4754 >            (CompletionStage<? extends T> other,
4755 >             Function<? super T, U> fn) {
4756 >            return cf.applyToEitherAsync(other, fn); }
4757 >        public <U> CompletionStage<U> applyToEitherAsync
4758 >            (CompletionStage<? extends T> other,
4759 >             Function<? super T, U> fn,
4760 >             Executor executor) {
4761 >            return cf.applyToEitherAsync(other, fn, executor); }
4762 >        public CompletionStage<Void> acceptEither
4763 >            (CompletionStage<? extends T> other,
4764 >             Consumer<? super T> action) {
4765 >            return cf.acceptEither(other, action); }
4766 >        public CompletionStage<Void> acceptEitherAsync
4767 >            (CompletionStage<? extends T> other,
4768 >             Consumer<? super T> action) {
4769 >            return cf.acceptEitherAsync(other, action); }
4770 >        public CompletionStage<Void> acceptEitherAsync
4771 >            (CompletionStage<? extends T> other,
4772 >             Consumer<? super T> action,
4773 >             Executor executor) {
4774 >            return cf.acceptEitherAsync(other, action, executor); }
4775 >        public CompletionStage<Void> runAfterEither
4776 >            (CompletionStage<?> other,
4777 >             Runnable action) {
4778 >            return cf.runAfterEither(other, action); }
4779 >        public CompletionStage<Void> runAfterEitherAsync
4780 >            (CompletionStage<?> other,
4781 >             Runnable action) {
4782 >            return cf.runAfterEitherAsync(other, action); }
4783 >        public CompletionStage<Void> runAfterEitherAsync
4784 >            (CompletionStage<?> other,
4785 >             Runnable action,
4786 >             Executor executor) {
4787 >            return cf.runAfterEitherAsync(other, action, executor); }
4788 >        public <U> CompletionStage<U> thenCompose
4789 >            (Function<? super T, ? extends CompletionStage<U>> fn) {
4790 >            return cf.thenCompose(fn); }
4791 >        public <U> CompletionStage<U> thenComposeAsync
4792 >            (Function<? super T, ? extends CompletionStage<U>> fn) {
4793 >            return cf.thenComposeAsync(fn); }
4794 >        public <U> CompletionStage<U> thenComposeAsync
4795 >            (Function<? super T, ? extends CompletionStage<U>> fn,
4796 >             Executor executor) {
4797 >            return cf.thenComposeAsync(fn, executor); }
4798 >        public <U> CompletionStage<U> handle
4799 >            (BiFunction<? super T, Throwable, ? extends U> fn) {
4800 >            return cf.handle(fn); }
4801 >        public <U> CompletionStage<U> handleAsync
4802 >            (BiFunction<? super T, Throwable, ? extends U> fn) {
4803 >            return cf.handleAsync(fn); }
4804 >        public <U> CompletionStage<U> handleAsync
4805 >            (BiFunction<? super T, Throwable, ? extends U> fn,
4806 >             Executor executor) {
4807 >            return cf.handleAsync(fn, executor); }
4808 >        public CompletionStage<T> whenComplete
4809 >            (BiConsumer<? super T, ? super Throwable> action) {
4810 >            return cf.whenComplete(action); }
4811 >        public CompletionStage<T> whenCompleteAsync
4812 >            (BiConsumer<? super T, ? super Throwable> action) {
4813 >            return cf.whenCompleteAsync(action); }
4814 >        public CompletionStage<T> whenCompleteAsync
4815 >            (BiConsumer<? super T, ? super Throwable> action,
4816 >             Executor executor) {
4817 >            return cf.whenCompleteAsync(action, executor); }
4818 >        public CompletionStage<T> exceptionally
4819 >            (Function<Throwable, ? extends T> fn) {
4820 >            return cf.exceptionally(fn); }
4821 >    }
4822  
4823 <            () -> f.applyToEither(g, null),
4824 <            () -> f.applyToEitherAsync(g, null),
4825 <            () -> f.applyToEitherAsync(g, null, exec),
4826 <            () -> f.applyToEither(nullFuture, (x) -> x),
4827 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
4828 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
4829 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
4823 >    /**
4824 >     * default-implemented exceptionallyAsync action is not invoked when
4825 >     * source completes normally, and source result is propagated
4826 >     */
4827 >    public void testDefaultExceptionallyAsync_normalCompletion() {
4828 >        for (boolean createIncomplete : new boolean[] { true, false })
4829 >        for (Integer v1 : new Integer[] { 1, null })
4830 >    {
4831 >        final AtomicInteger ran = new AtomicInteger(0);
4832 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4833 >        final DelegatedCompletionStage<Integer> d =
4834 >            new DelegatedCompletionStage<Integer>(f);
4835 >        if (!createIncomplete) assertTrue(f.complete(v1));
4836 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4837 >            ((Throwable t) -> {
4838 >                ran.getAndIncrement();
4839 >                throw new AssertionError("should not be called");
4840 >            });
4841 >        if (createIncomplete) assertTrue(f.complete(v1));
4842  
4843 <            () -> f.acceptEither(g, null),
4844 <            () -> f.acceptEitherAsync(g, null),
4845 <            () -> f.acceptEitherAsync(g, null, exec),
4846 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3478 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3479 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3480 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
4843 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4844 >        checkCompletedNormally(f, v1);
4845 >        assertEquals(0, ran.get());
4846 >    }}
4847  
4848 <            () -> f.runAfterEither(g, null),
4849 <            () -> f.runAfterEitherAsync(g, null),
4850 <            () -> f.runAfterEitherAsync(g, null, exec),
4851 <            () -> f.runAfterEither(nullFuture, () -> {}),
4852 <            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
4853 <            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
4854 <            () -> f.runAfterEitherAsync(g, () -> {}, null),
4848 >    /**
4849 >     * default-implemented exceptionallyAsync action completes with
4850 >     * function value on source exception
4851 >     */
4852 >    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4853 >        for (boolean createIncomplete : new boolean[] { true, false })
4854 >        for (Integer v1 : new Integer[] { 1, null })
4855 >    {
4856 >        final AtomicInteger ran = new AtomicInteger(0);
4857 >        final CFException ex = new CFException();
4858 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4859 >        final DelegatedCompletionStage<Integer> d =
4860 >            new DelegatedCompletionStage<Integer>(f);
4861 >        if (!createIncomplete) f.completeExceptionally(ex);
4862 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4863 >            ((Throwable t) -> {
4864 >                assertSame(t, ex);
4865 >                ran.getAndIncrement();
4866 >                return v1;
4867 >            });
4868 >        if (createIncomplete) f.completeExceptionally(ex);
4869  
4870 <            () -> f.thenCompose(null),
4871 <            () -> f.thenComposeAsync(null),
4872 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
4873 <            () -> f.thenComposeAsync(null, exec),
4870 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4871 >        checkCompletedExceptionally(f, ex);
4872 >        assertEquals(1, ran.get());
4873 >    }}
4874  
4875 <            () -> f.exceptionally(null),
4875 >    /**
4876 >     * Under default implementation, if an "exceptionally action"
4877 >     * throws an exception, it completes exceptionally with that
4878 >     * exception
4879 >     */
4880 >    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4881 >        for (boolean createIncomplete : new boolean[] { true, false })
4882 >    {
4883 >        final AtomicInteger ran = new AtomicInteger(0);
4884 >        final CFException ex1 = new CFException();
4885 >        final CFException ex2 = new CFException();
4886 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4887 >        final DelegatedCompletionStage<Integer> d =
4888 >            new DelegatedCompletionStage<Integer>(f);
4889 >        if (!createIncomplete) f.completeExceptionally(ex1);
4890 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4891 >            ((Throwable t) -> {
4892 >                assertSame(t, ex1);
4893 >                ran.getAndIncrement();
4894 >                throw ex2;
4895 >            });
4896 >        if (createIncomplete) f.completeExceptionally(ex1);
4897  
4898 <            () -> f.handle(null),
4898 >        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4899 >        checkCompletedExceptionally(f, ex1);
4900 >        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4901 >        assertEquals(1, ran.get());
4902 >    }}
4903  
4904 <            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
4905 <            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
4906 <            () -> CompletableFuture.allOf(f, null),
4907 <            () -> CompletableFuture.allOf(null, f),
4904 >    /**
4905 >     * default-implemented exceptionallyCompose result completes
4906 >     * normally after normal completion of source
4907 >     */
4908 >    public void testDefaultExceptionallyCompose_normalCompletion() {
4909 >        for (boolean createIncomplete : new boolean[] { true, false })
4910 >        for (Integer v1 : new Integer[] { 1, null })
4911 >    {
4912 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4913 >        final ExceptionalCompletableFutureFunction r =
4914 >            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4915 >        final DelegatedCompletionStage<Integer> d =
4916 >            new DelegatedCompletionStage<Integer>(f);
4917 >        if (!createIncomplete) assertTrue(f.complete(v1));
4918 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4919 >        if (createIncomplete) assertTrue(f.complete(v1));
4920  
4921 <            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
4922 <            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
4923 <            () -> CompletableFuture.anyOf(f, null),
4924 <            () -> CompletableFuture.anyOf(null, f),
4921 >        checkCompletedNormally(f, v1);
4922 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4923 >        r.assertNotInvoked();
4924 >    }}
4925  
4926 <            () -> f.obtrudeException(null),
4927 <        };
4926 >    /**
4927 >     * default-implemented exceptionallyCompose result completes
4928 >     * normally after exceptional completion of source
4929 >     */
4930 >    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4931 >        for (boolean createIncomplete : new boolean[] { true, false })
4932 >    {
4933 >        final CFException ex = new CFException();
4934 >        final ExceptionalCompletableFutureFunction r =
4935 >            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4936 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4937 >        final DelegatedCompletionStage<Integer> d =
4938 >            new DelegatedCompletionStage<Integer>(f);
4939 >        if (!createIncomplete) f.completeExceptionally(ex);
4940 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4941 >        if (createIncomplete) f.completeExceptionally(ex);
4942  
4943 <        assertThrows(NullPointerException.class, throwingActions);
4944 <        assertEquals(0, exec.count.get());
4945 <    }
4943 >        checkCompletedExceptionally(f, ex);
4944 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
4945 >        r.assertInvoked();
4946 >    }}
4947  
4948      /**
4949 <     * toCompletableFuture returns this CompletableFuture.
4949 >     * default-implemented exceptionallyCompose completes
4950 >     * exceptionally on exception if action does
4951       */
4952 <    public void testToCompletableFuture() {
4953 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4954 <        assertSame(f, f.toCompletableFuture());
4955 <    }
4952 >    public void testDefaultExceptionallyCompose_actionFailed() {
4953 >        for (boolean createIncomplete : new boolean[] { true, false })
4954 >    {
4955 >        final CFException ex = new CFException();
4956 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4957 >        final FailingExceptionalCompletableFutureFunction r
4958 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4959 >        final DelegatedCompletionStage<Integer> d =
4960 >            new DelegatedCompletionStage<Integer>(f);
4961 >        if (!createIncomplete) f.completeExceptionally(ex);
4962 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4963 >        if (createIncomplete) f.completeExceptionally(ex);
4964 >
4965 >        checkCompletedExceptionally(f, ex);
4966 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4967 >        r.assertInvoked();
4968 >    }}
4969  
4970      /**
4971 <     * whenComplete action executes on normal completion, propagating
4972 <     * source result.
4971 >     * default-implemented exceptionallyComposeAsync result completes
4972 >     * normally after normal completion of source
4973       */
4974 <    public void testWhenComplete_normalCompletion1() {
3529 <        for (ExecutionMode m : ExecutionMode.values())
4974 >    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4975          for (boolean createIncomplete : new boolean[] { true, false })
4976          for (Integer v1 : new Integer[] { 1, null })
4977      {
3533        final AtomicInteger a = new AtomicInteger(0);
4978          final CompletableFuture<Integer> f = new CompletableFuture<>();
4979 <        if (!createIncomplete) f.complete(v1);
4980 <        final CompletableFuture<Integer> g = m.whenComplete
4981 <            (f,
4982 <             (Integer x, Throwable t) -> {
4983 <                threadAssertSame(x, v1);
4984 <                threadAssertNull(t);
4985 <                a.getAndIncrement();
3542 <            });
3543 <        if (createIncomplete) f.complete(v1);
4979 >        final ExceptionalCompletableFutureFunction r =
4980 >            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4981 >        final DelegatedCompletionStage<Integer> d =
4982 >            new DelegatedCompletionStage<Integer>(f);
4983 >        if (!createIncomplete) assertTrue(f.complete(v1));
4984 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4985 >        if (createIncomplete) assertTrue(f.complete(v1));
4986  
3545        checkCompletedNormally(g, v1);
4987          checkCompletedNormally(f, v1);
4988 <        assertEquals(1, a.get());
4988 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4989 >        r.assertNotInvoked();
4990      }}
4991  
4992      /**
4993 <     * whenComplete action executes on exceptional completion, propagating
4994 <     * source result.
4993 >     * default-implemented exceptionallyComposeAsync result completes
4994 >     * normally after exceptional completion of source
4995       */
4996 <    public void testWhenComplete_exceptionalCompletion() {
3555 <        for (ExecutionMode m : ExecutionMode.values())
4996 >    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
4997          for (boolean createIncomplete : new boolean[] { true, false })
3557        for (Integer v1 : new Integer[] { 1, null })
4998      {
3559        final AtomicInteger a = new AtomicInteger(0);
4999          final CFException ex = new CFException();
5000 +        final ExceptionalCompletableFutureFunction r =
5001 +            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5002          final CompletableFuture<Integer> f = new CompletableFuture<>();
5003 +        final DelegatedCompletionStage<Integer> d =
5004 +            new DelegatedCompletionStage<Integer>(f);
5005          if (!createIncomplete) f.completeExceptionally(ex);
5006 <        final CompletableFuture<Integer> g = m.whenComplete
3564 <            (f,
3565 <             (Integer x, Throwable t) -> {
3566 <                threadAssertNull(x);
3567 <                threadAssertSame(t, ex);
3568 <                a.getAndIncrement();
3569 <            });
5006 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5007          if (createIncomplete) f.completeExceptionally(ex);
5008 <        checkCompletedWithWrappedCFException(f, ex);
5009 <        checkCompletedWithWrappedCFException(g, ex);
5010 <        assertEquals(1, a.get());
5008 >
5009 >        checkCompletedExceptionally(f, ex);
5010 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
5011 >        r.assertInvoked();
5012      }}
5013  
5014      /**
5015 <     * whenComplete action executes on cancelled source, propagating
5016 <     * CancellationException.
5015 >     * default-implemented exceptionallyComposeAsync completes
5016 >     * exceptionally on exception if action does
5017       */
5018 <    public void testWhenComplete_sourceCancelled() {
3581 <        for (ExecutionMode m : ExecutionMode.values())
3582 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
5018 >    public void testDefaultExceptionallyComposeAsync_actionFailed() {
5019          for (boolean createIncomplete : new boolean[] { true, false })
5020      {
5021 <        final AtomicInteger a = new AtomicInteger(0);
5021 >        final CFException ex = new CFException();
5022          final CompletableFuture<Integer> f = new CompletableFuture<>();
5023 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
5024 <        final CompletableFuture<Integer> g = m.whenComplete
5025 <            (f,
5026 <             (Integer x, Throwable t) -> {
5027 <                threadAssertNull(x);
5028 <                threadAssertTrue(t instanceof CancellationException);
5029 <                a.getAndIncrement();
3594 <            });
3595 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
5023 >        final FailingExceptionalCompletableFutureFunction r
5024 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5025 >        final DelegatedCompletionStage<Integer> d =
5026 >            new DelegatedCompletionStage<Integer>(f);
5027 >        if (!createIncomplete) f.completeExceptionally(ex);
5028 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5029 >        if (createIncomplete) f.completeExceptionally(ex);
5030  
5031 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
5032 <        checkCompletedWithWrappedCancellationException(g);
5033 <        checkCancelled(f);
3600 <        assertEquals(1, a.get());
5031 >        checkCompletedExceptionally(f, ex);
5032 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5033 >        r.assertInvoked();
5034      }}
5035  
5036      /**
5037 <     * If a whenComplete action throws an exception when triggered by
5038 <     * a normal completion, it completes exceptionally
5037 >     * default-implemented exceptionallyComposeAsync result completes
5038 >     * normally after normal completion of source
5039       */
5040 <    public void testWhenComplete_actionFailed() {
5040 >    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5041          for (boolean createIncomplete : new boolean[] { true, false })
5042 <        for (ExecutionMode m : ExecutionMode.values())
5043 <        for (Integer v1 : new Integer[] { 1, null }) {
3611 <
3612 <        final AtomicInteger a = new AtomicInteger(0);
3613 <        final CFException ex = new CFException();
5042 >        for (Integer v1 : new Integer[] { 1, null })
5043 >    {
5044          final CompletableFuture<Integer> f = new CompletableFuture<>();
5045 <        if (!createIncomplete) f.complete(v1);
5046 <        final CompletableFuture<Integer> g = m.whenComplete
5047 <            (f,
5048 <             (Integer x, Throwable t) -> {
5049 <                threadAssertSame(x, v1);
5050 <                threadAssertNull(t);
5051 <                a.getAndIncrement();
5052 <                throw ex;
3623 <            });
3624 <        if (createIncomplete) f.complete(v1);
5045 >        final ExceptionalCompletableFutureFunction r =
5046 >            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5047 >        final DelegatedCompletionStage<Integer> d =
5048 >            new DelegatedCompletionStage<Integer>(f);
5049 >        if (!createIncomplete) assertTrue(f.complete(v1));
5050 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5051 >        if (createIncomplete) assertTrue(f.complete(v1));
5052 >
5053          checkCompletedNormally(f, v1);
5054 <        checkCompletedWithWrappedCFException(g, ex);
5055 <        assertEquals(1, a.get());
5056 <        }
3629 <    }
5054 >        checkCompletedNormally(g.toCompletableFuture(), v1);
5055 >        r.assertNotInvoked();
5056 >    }}
5057  
5058      /**
5059 <     * If a whenComplete action throws an exception when triggered by
5060 <     * a source completion that also throws an exception, the source
3634 <     * exception takes precedence.
5059 >     * default-implemented exceptionallyComposeAsync result completes
5060 >     * normally after exceptional completion of source
5061       */
5062 <    public void testWhenComplete_actionFailedSourceFailed() {
5062 >    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5063          for (boolean createIncomplete : new boolean[] { true, false })
5064 <        for (ExecutionMode m : ExecutionMode.values())
5065 <        for (Integer v1 : new Integer[] { 1, null }) {
5066 <
5067 <        final AtomicInteger a = new AtomicInteger(0);
3642 <        final CFException ex1 = new CFException();
3643 <        final CFException ex2 = new CFException();
5064 >    {
5065 >        final CFException ex = new CFException();
5066 >        final ExceptionalCompletableFutureFunction r =
5067 >            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5068          final CompletableFuture<Integer> f = new CompletableFuture<>();
5069 +        final DelegatedCompletionStage<Integer> d =
5070 +            new DelegatedCompletionStage<Integer>(f);
5071 +        if (!createIncomplete) f.completeExceptionally(ex);
5072 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5073 +        if (createIncomplete) f.completeExceptionally(ex);
5074  
5075 <        if (!createIncomplete) f.completeExceptionally(ex1);
5076 <        final CompletableFuture<Integer> g = m.whenComplete
5077 <            (f,
5078 <             (Integer x, Throwable t) -> {
3650 <                threadAssertSame(t, ex1);
3651 <                threadAssertNull(x);
3652 <                a.getAndIncrement();
3653 <                throw ex2;
3654 <            });
3655 <        if (createIncomplete) f.completeExceptionally(ex1);
5075 >        checkCompletedExceptionally(f, ex);
5076 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
5077 >        r.assertInvoked();
5078 >    }}
5079  
5080 <        checkCompletedWithWrappedCFException(f, ex1);
5081 <        checkCompletedWithWrappedCFException(g, ex1);
5082 <        assertEquals(1, a.get());
5083 <        }
5084 <    }
5080 >    /**
5081 >     * default-implemented exceptionallyComposeAsync completes
5082 >     * exceptionally on exception if action does
5083 >     */
5084 >    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5085 >        for (boolean createIncomplete : new boolean[] { true, false })
5086 >    {
5087 >        final CFException ex = new CFException();
5088 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5089 >        final FailingExceptionalCompletableFutureFunction r
5090 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5091 >        final DelegatedCompletionStage<Integer> d =
5092 >            new DelegatedCompletionStage<Integer>(f);
5093 >        if (!createIncomplete) f.completeExceptionally(ex);
5094 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5095 >        if (createIncomplete) f.completeExceptionally(ex);
5096 >
5097 >        checkCompletedExceptionally(f, ex);
5098 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5099 >        r.assertInvoked();
5100 >    }}
5101  
5102   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines