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.214 by jsr166, Mon Sep 24 18:09:30 2018 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import junit.framework.*;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 > import static java.util.concurrent.TimeUnit.SECONDS;
10 > import static java.util.concurrent.CompletableFuture.completedFuture;
11 > import static java.util.concurrent.CompletableFuture.failedFuture;
12 >
13 > import java.lang.reflect.Method;
14 > import java.lang.reflect.Modifier;
15 >
16 > import java.util.stream.Collectors;
17 > import java.util.stream.Stream;
18 >
19 > import java.util.ArrayList;
20 > import java.util.Arrays;
21 > import java.util.List;
22 > import java.util.Objects;
23 > import java.util.Set;
24   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
25   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
26   import java.util.concurrent.CompletableFuture;
27   import java.util.concurrent.CompletionException;
28   import java.util.concurrent.CompletionStage;
29 + import java.util.concurrent.ExecutionException;
30 + import java.util.concurrent.Executor;
31 + import java.util.concurrent.ForkJoinPool;
32 + import java.util.concurrent.ForkJoinTask;
33 + import java.util.concurrent.RejectedExecutionException;
34   import java.util.concurrent.TimeoutException;
35   import java.util.concurrent.atomic.AtomicInteger;
36 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
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      {
699        final AtomicInteger a = new AtomicInteger(0);
929          final CompletableFuture<Integer> f = new CompletableFuture<>();
930 <        if (!createIncomplete) f.complete(v1);
931 <        final CompletableFuture<Integer> g = f.exceptionally
932 <            ((Throwable t) -> {
933 <                // Should not be called
934 <                a.getAndIncrement();
706 <                throw new AssertionError();
930 >        if (!createIncomplete) assertTrue(f.complete(v1));
931 >        final CompletableFuture<Integer> g = m.exceptionally
932 >            (f, (Throwable t) -> {
933 >                threadFail("should not be called");
934 >                return null;            // unreached
935              });
936 <        if (createIncomplete) f.complete(v1);
936 >        if (createIncomplete) assertTrue(f.complete(v1));
937  
938          checkCompletedNormally(g, v1);
939          checkCompletedNormally(f, v1);
712        assertEquals(0, a.get());
940      }}
941  
715
942      /**
943       * exceptionally action completes with function value on source
944       * exception
945       */
946      public void testExceptionally_exceptionalCompletion() {
947 +        for (ExecutionMode m : ExecutionMode.values())
948          for (boolean createIncomplete : new boolean[] { true, false })
949          for (Integer v1 : new Integer[] { 1, null })
950      {
# Line 725 | Line 952 | public class CompletableFutureTest exten
952          final CFException ex = new CFException();
953          final CompletableFuture<Integer> f = new CompletableFuture<>();
954          if (!createIncomplete) f.completeExceptionally(ex);
955 <        final CompletableFuture<Integer> g = f.exceptionally
956 <            ((Throwable t) -> {
955 >        final CompletableFuture<Integer> g = m.exceptionally
956 >            (f, (Throwable t) -> {
957 >                m.checkExecutionMode();
958                  threadAssertSame(t, ex);
959                  a.getAndIncrement();
960                  return v1;
# Line 737 | Line 965 | public class CompletableFutureTest exten
965          assertEquals(1, a.get());
966      }}
967  
968 +    /**
969 +     * If an "exceptionally action" throws an exception, it completes
970 +     * exceptionally with that exception
971 +     */
972      public void testExceptionally_exceptionalCompletionActionFailed() {
973 +        for (ExecutionMode m : ExecutionMode.values())
974 +        for (boolean createIncomplete : new boolean[] { true, false })
975 +    {
976 +        final AtomicInteger a = new AtomicInteger(0);
977 +        final CFException ex1 = new CFException();
978 +        final CFException ex2 = new CFException();
979 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
980 +        if (!createIncomplete) f.completeExceptionally(ex1);
981 +        final CompletableFuture<Integer> g = m.exceptionally
982 +            (f, (Throwable t) -> {
983 +                m.checkExecutionMode();
984 +                threadAssertSame(t, ex1);
985 +                a.getAndIncrement();
986 +                throw ex2;
987 +            });
988 +        if (createIncomplete) f.completeExceptionally(ex1);
989 +
990 +        checkCompletedWithWrappedException(g, ex2);
991 +        checkCompletedExceptionally(f, ex1);
992 +        assertEquals(1, a.get());
993 +    }}
994 +
995 +    /**
996 +     * whenComplete action executes on normal completion, propagating
997 +     * source result.
998 +     */
999 +    public void testWhenComplete_normalCompletion() {
1000 +        for (ExecutionMode m : ExecutionMode.values())
1001          for (boolean createIncomplete : new boolean[] { true, false })
1002          for (Integer v1 : new Integer[] { 1, null })
1003      {
1004          final AtomicInteger a = new AtomicInteger(0);
1005 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 +        if (!createIncomplete) assertTrue(f.complete(v1));
1007 +        final CompletableFuture<Integer> g = m.whenComplete
1008 +            (f,
1009 +             (Integer result, Throwable t) -> {
1010 +                m.checkExecutionMode();
1011 +                threadAssertSame(result, v1);
1012 +                threadAssertNull(t);
1013 +                a.getAndIncrement();
1014 +            });
1015 +        if (createIncomplete) assertTrue(f.complete(v1));
1016 +
1017 +        checkCompletedNormally(g, v1);
1018 +        checkCompletedNormally(f, v1);
1019 +        assertEquals(1, a.get());
1020 +    }}
1021 +
1022 +    /**
1023 +     * whenComplete action executes on exceptional completion, propagating
1024 +     * source result.
1025 +     */
1026 +    public void testWhenComplete_exceptionalCompletion() {
1027 +        for (ExecutionMode m : ExecutionMode.values())
1028 +        for (boolean createIncomplete : new boolean[] { true, false })
1029 +    {
1030 +        final AtomicInteger a = new AtomicInteger(0);
1031 +        final CFException ex = new CFException();
1032 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1033 +        if (!createIncomplete) f.completeExceptionally(ex);
1034 +        final CompletableFuture<Integer> g = m.whenComplete
1035 +            (f,
1036 +             (Integer result, Throwable t) -> {
1037 +                m.checkExecutionMode();
1038 +                threadAssertNull(result);
1039 +                threadAssertSame(t, ex);
1040 +                a.getAndIncrement();
1041 +            });
1042 +        if (createIncomplete) f.completeExceptionally(ex);
1043 +
1044 +        checkCompletedWithWrappedException(g, ex);
1045 +        checkCompletedExceptionally(f, ex);
1046 +        assertEquals(1, a.get());
1047 +    }}
1048 +
1049 +    /**
1050 +     * whenComplete action executes on cancelled source, propagating
1051 +     * CancellationException.
1052 +     */
1053 +    public void testWhenComplete_sourceCancelled() {
1054 +        for (ExecutionMode m : ExecutionMode.values())
1055 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1056 +        for (boolean createIncomplete : new boolean[] { true, false })
1057 +    {
1058 +        final AtomicInteger a = new AtomicInteger(0);
1059 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1060 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1061 +        final CompletableFuture<Integer> g = m.whenComplete
1062 +            (f,
1063 +             (Integer result, Throwable t) -> {
1064 +                m.checkExecutionMode();
1065 +                threadAssertNull(result);
1066 +                threadAssertTrue(t instanceof CancellationException);
1067 +                a.getAndIncrement();
1068 +            });
1069 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1070 +
1071 +        checkCompletedWithWrappedCancellationException(g);
1072 +        checkCancelled(f);
1073 +        assertEquals(1, a.get());
1074 +    }}
1075 +
1076 +    /**
1077 +     * If a whenComplete action throws an exception when triggered by
1078 +     * a normal completion, it completes exceptionally
1079 +     */
1080 +    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1081 +        for (boolean createIncomplete : new boolean[] { true, false })
1082 +        for (ExecutionMode m : ExecutionMode.values())
1083 +        for (Integer v1 : new Integer[] { 1, null })
1084 +    {
1085 +        final AtomicInteger a = new AtomicInteger(0);
1086 +        final CFException ex = new CFException();
1087 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1088 +        if (!createIncomplete) assertTrue(f.complete(v1));
1089 +        final CompletableFuture<Integer> g = m.whenComplete
1090 +            (f,
1091 +             (Integer result, Throwable t) -> {
1092 +                m.checkExecutionMode();
1093 +                threadAssertSame(result, v1);
1094 +                threadAssertNull(t);
1095 +                a.getAndIncrement();
1096 +                throw ex;
1097 +            });
1098 +        if (createIncomplete) assertTrue(f.complete(v1));
1099 +
1100 +        checkCompletedWithWrappedException(g, ex);
1101 +        checkCompletedNormally(f, v1);
1102 +        assertEquals(1, a.get());
1103 +    }}
1104 +
1105 +    /**
1106 +     * If a whenComplete action throws an exception when triggered by
1107 +     * a source completion that also throws an exception, the source
1108 +     * exception takes precedence (unlike handle)
1109 +     */
1110 +    public void testWhenComplete_sourceFailedActionFailed() {
1111 +        for (boolean createIncomplete : new boolean[] { true, false })
1112 +        for (ExecutionMode m : ExecutionMode.values())
1113 +    {
1114 +        final AtomicInteger a = new AtomicInteger(0);
1115          final CFException ex1 = new CFException();
1116          final CFException ex2 = new CFException();
1117          final CompletableFuture<Integer> f = new CompletableFuture<>();
1118 +
1119          if (!createIncomplete) f.completeExceptionally(ex1);
1120 <        final CompletableFuture<Integer> g = f.exceptionally
1121 <            ((Throwable t) -> {
1120 >        final CompletableFuture<Integer> g = m.whenComplete
1121 >            (f,
1122 >             (Integer result, Throwable t) -> {
1123 >                m.checkExecutionMode();
1124                  threadAssertSame(t, ex1);
1125 +                threadAssertNull(result);
1126                  a.getAndIncrement();
1127                  throw ex2;
1128              });
1129          if (createIncomplete) f.completeExceptionally(ex1);
1130  
1131 <        checkCompletedWithWrappedCFException(g, ex2);
1131 >        checkCompletedWithWrappedException(g, ex1);
1132 >        checkCompletedExceptionally(f, ex1);
1133 >        if (testImplementationDetails) {
1134 >            assertEquals(1, ex1.getSuppressed().length);
1135 >            assertSame(ex2, ex1.getSuppressed()[0]);
1136 >        }
1137          assertEquals(1, a.get());
1138      }}
1139  
# Line 769 | Line 1148 | public class CompletableFutureTest exten
1148      {
1149          final CompletableFuture<Integer> f = new CompletableFuture<>();
1150          final AtomicInteger a = new AtomicInteger(0);
1151 <        if (!createIncomplete) f.complete(v1);
1151 >        if (!createIncomplete) assertTrue(f.complete(v1));
1152          final CompletableFuture<Integer> g = m.handle
1153              (f,
1154 <             (Integer x, Throwable t) -> {
1155 <                threadAssertSame(x, v1);
1154 >             (Integer result, Throwable t) -> {
1155 >                m.checkExecutionMode();
1156 >                threadAssertSame(result, v1);
1157                  threadAssertNull(t);
1158                  a.getAndIncrement();
1159                  return inc(v1);
1160              });
1161 <        if (createIncomplete) f.complete(v1);
1161 >        if (createIncomplete) assertTrue(f.complete(v1));
1162  
1163          checkCompletedNormally(g, inc(v1));
1164          checkCompletedNormally(f, v1);
# Line 800 | Line 1180 | public class CompletableFutureTest exten
1180          if (!createIncomplete) f.completeExceptionally(ex);
1181          final CompletableFuture<Integer> g = m.handle
1182              (f,
1183 <             (Integer x, Throwable t) -> {
1184 <                threadAssertNull(x);
1183 >             (Integer result, Throwable t) -> {
1184 >                m.checkExecutionMode();
1185 >                threadAssertNull(result);
1186                  threadAssertSame(t, ex);
1187                  a.getAndIncrement();
1188                  return v1;
# Line 809 | Line 1190 | public class CompletableFutureTest exten
1190          if (createIncomplete) f.completeExceptionally(ex);
1191  
1192          checkCompletedNormally(g, v1);
1193 <        checkCompletedWithWrappedCFException(f, ex);
1193 >        checkCompletedExceptionally(f, ex);
1194          assertEquals(1, a.get());
1195      }}
1196  
# Line 828 | Line 1209 | public class CompletableFutureTest exten
1209          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1210          final CompletableFuture<Integer> g = m.handle
1211              (f,
1212 <             (Integer x, Throwable t) -> {
1213 <                threadAssertNull(x);
1212 >             (Integer result, Throwable t) -> {
1213 >                m.checkExecutionMode();
1214 >                threadAssertNull(result);
1215                  threadAssertTrue(t instanceof CancellationException);
1216                  a.getAndIncrement();
1217                  return v1;
# Line 842 | Line 1224 | public class CompletableFutureTest exten
1224      }}
1225  
1226      /**
1227 <     * handle result completes exceptionally if action does
1227 >     * If a "handle action" throws an exception when triggered by
1228 >     * a normal completion, it completes exceptionally
1229       */
1230 <    public void testHandle_sourceFailedActionFailed() {
1230 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1231          for (ExecutionMode m : ExecutionMode.values())
1232          for (boolean createIncomplete : new boolean[] { true, false })
1233 +        for (Integer v1 : new Integer[] { 1, null })
1234      {
1235          final CompletableFuture<Integer> f = new CompletableFuture<>();
1236          final AtomicInteger a = new AtomicInteger(0);
1237 <        final CFException ex1 = new CFException();
1238 <        final CFException ex2 = new CFException();
855 <        if (!createIncomplete) f.completeExceptionally(ex1);
1237 >        final CFException ex = new CFException();
1238 >        if (!createIncomplete) assertTrue(f.complete(v1));
1239          final CompletableFuture<Integer> g = m.handle
1240              (f,
1241 <             (Integer x, Throwable t) -> {
1242 <                threadAssertNull(x);
1243 <                threadAssertSame(ex1, t);
1241 >             (Integer result, Throwable t) -> {
1242 >                m.checkExecutionMode();
1243 >                threadAssertSame(result, v1);
1244 >                threadAssertNull(t);
1245                  a.getAndIncrement();
1246 <                throw ex2;
1246 >                throw ex;
1247              });
1248 <        if (createIncomplete) f.completeExceptionally(ex1);
1248 >        if (createIncomplete) assertTrue(f.complete(v1));
1249  
1250 <        checkCompletedWithWrappedCFException(g, ex2);
1251 <        checkCompletedWithWrappedCFException(f, ex1);
1250 >        checkCompletedWithWrappedException(g, ex);
1251 >        checkCompletedNormally(f, v1);
1252          assertEquals(1, a.get());
1253      }}
1254  
1255 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1256 <        for (ExecutionMode m : ExecutionMode.values())
1255 >    /**
1256 >     * If a "handle action" throws an exception when triggered by
1257 >     * a source completion that also throws an exception, the action
1258 >     * exception takes precedence (unlike whenComplete)
1259 >     */
1260 >    public void testHandle_sourceFailedActionFailed() {
1261          for (boolean createIncomplete : new boolean[] { true, false })
1262 <        for (Integer v1 : new Integer[] { 1, null })
1262 >        for (ExecutionMode m : ExecutionMode.values())
1263      {
876        final CompletableFuture<Integer> f = new CompletableFuture<>();
1264          final AtomicInteger a = new AtomicInteger(0);
1265 <        final CFException ex = new CFException();
1266 <        if (!createIncomplete) f.complete(v1);
1265 >        final CFException ex1 = new CFException();
1266 >        final CFException ex2 = new CFException();
1267 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1268 >
1269 >        if (!createIncomplete) f.completeExceptionally(ex1);
1270          final CompletableFuture<Integer> g = m.handle
1271              (f,
1272 <             (Integer x, Throwable t) -> {
1273 <                threadAssertSame(x, v1);
1274 <                threadAssertNull(t);
1272 >             (Integer result, Throwable t) -> {
1273 >                m.checkExecutionMode();
1274 >                threadAssertNull(result);
1275 >                threadAssertSame(ex1, t);
1276                  a.getAndIncrement();
1277 <                throw ex;
1277 >                throw ex2;
1278              });
1279 <        if (createIncomplete) f.complete(v1);
1279 >        if (createIncomplete) f.completeExceptionally(ex1);
1280  
1281 <        checkCompletedWithWrappedCFException(g, ex);
1282 <        checkCompletedNormally(f, v1);
1281 >        checkCompletedWithWrappedException(g, ex2);
1282 >        checkCompletedExceptionally(f, ex1);
1283          assertEquals(1, a.get());
1284      }}
1285  
1286      /**
1287       * runAsync completes after running Runnable
1288       */
1289 <    public void testRunAsync() {
1290 <        Noop r = new Noop();
1291 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1292 <        assertNull(f.join());
1293 <        assertEquals(1, r.invocationCount);
1294 <        checkCompletedNormally(f, null);
1295 <    }
1296 <
1297 <    /**
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);
1289 >    public void testRunAsync_normalCompletion() {
1290 >        ExecutionMode[] executionModes = {
1291 >            ExecutionMode.ASYNC,
1292 >            ExecutionMode.EXECUTOR,
1293 >        };
1294 >        for (ExecutionMode m : executionModes)
1295 >    {
1296 >        final Noop r = new Noop(m);
1297 >        final CompletableFuture<Void> f = m.runAsync(r);
1298          assertNull(f.join());
914        assertEquals(1, r.invocationCount);
1299          checkCompletedNormally(f, null);
1300 <        assertEquals(1, exec.count.get());
1301 <    }
1300 >        r.assertInvoked();
1301 >    }}
1302  
1303      /**
1304       * failing runAsync completes exceptionally after running Runnable
1305       */
1306 <    public void testRunAsync3() {
1307 <        FailingNoop r = new FailingNoop();
1308 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1309 <        checkCompletedWithWrappedCFException(f);
1310 <        assertEquals(1, r.invocationCount);
1311 <    }
1306 >    public void testRunAsync_exceptionalCompletion() {
1307 >        ExecutionMode[] executionModes = {
1308 >            ExecutionMode.ASYNC,
1309 >            ExecutionMode.EXECUTOR,
1310 >        };
1311 >        for (ExecutionMode m : executionModes)
1312 >    {
1313 >        final FailingRunnable r = new FailingRunnable(m);
1314 >        final CompletableFuture<Void> f = m.runAsync(r);
1315 >        checkCompletedWithWrappedException(f, r.ex);
1316 >        r.assertInvoked();
1317 >    }}
1318  
1319 <    /**
1320 <     * supplyAsync completes with result of supplier
1321 <     */
1322 <    public void testSupplyAsync() {
1323 <        CompletableFuture<Integer> f;
1324 <        f = CompletableFuture.supplyAsync(supplyOne);
1325 <        assertEquals(f.join(), one);
1326 <        checkCompletedNormally(f, one);
1319 >    @SuppressWarnings("FutureReturnValueIgnored")
1320 >    public void testRunAsync_rejectingExecutor() {
1321 >        CountingRejectingExecutor e = new CountingRejectingExecutor();
1322 >        try {
1323 >            CompletableFuture.runAsync(() -> {}, e);
1324 >            shouldThrow();
1325 >        } catch (Throwable t) {
1326 >            assertSame(e.ex, t);
1327 >        }
1328 >
1329 >        assertEquals(1, e.count.get());
1330      }
1331  
1332      /**
1333 <     * supplyAsync with executor completes with result of supplier
1333 >     * supplyAsync completes with result of supplier
1334       */
1335 <    public void testSupplyAsync2() {
1336 <        CompletableFuture<Integer> f;
1337 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1338 <        assertEquals(f.join(), one);
1339 <        checkCompletedNormally(f, one);
1340 <    }
1335 >    public void testSupplyAsync_normalCompletion() {
1336 >        ExecutionMode[] executionModes = {
1337 >            ExecutionMode.ASYNC,
1338 >            ExecutionMode.EXECUTOR,
1339 >        };
1340 >        for (ExecutionMode m : executionModes)
1341 >        for (Integer v1 : new Integer[] { 1, null })
1342 >    {
1343 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1344 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1345 >        assertSame(v1, f.join());
1346 >        checkCompletedNormally(f, v1);
1347 >        r.assertInvoked();
1348 >    }}
1349  
1350      /**
1351       * Failing supplyAsync completes exceptionally
1352       */
1353 <    public void testSupplyAsync3() {
1354 <        FailingSupplier r = new FailingSupplier();
1355 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1356 <        checkCompletedWithWrappedCFException(f);
1357 <        assertEquals(1, r.invocationCount);
1353 >    public void testSupplyAsync_exceptionalCompletion() {
1354 >        ExecutionMode[] executionModes = {
1355 >            ExecutionMode.ASYNC,
1356 >            ExecutionMode.EXECUTOR,
1357 >        };
1358 >        for (ExecutionMode m : executionModes)
1359 >    {
1360 >        FailingSupplier r = new FailingSupplier(m);
1361 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1362 >        checkCompletedWithWrappedException(f, r.ex);
1363 >        r.assertInvoked();
1364 >    }}
1365 >
1366 >    @SuppressWarnings("FutureReturnValueIgnored")
1367 >    public void testSupplyAsync_rejectingExecutor() {
1368 >        CountingRejectingExecutor e = new CountingRejectingExecutor();
1369 >        try {
1370 >            CompletableFuture.supplyAsync(() -> null, e);
1371 >            shouldThrow();
1372 >        } catch (Throwable t) {
1373 >            assertSame(e.ex, t);
1374 >        }
1375 >
1376 >        assertEquals(1, e.count.get());
1377      }
1378  
1379      // seq completion methods
# Line 961 | Line 1381 | public class CompletableFutureTest exten
1381      /**
1382       * thenRun result completes normally after normal completion of source
1383       */
1384 <    public void testThenRun() {
1385 <        CompletableFuture<Integer> f;
1386 <        CompletableFuture<Void> g;
1387 <        Noop r;
1388 <
1389 <        f = new CompletableFuture<>();
1390 <        g = f.thenRun(r = new Noop());
971 <        f.complete(null);
972 <        checkCompletedNormally(g, null);
973 <        assertEquals(1, r.invocationCount);
1384 >    public void testThenRun_normalCompletion() {
1385 >        for (ExecutionMode m : ExecutionMode.values())
1386 >        for (Integer v1 : new Integer[] { 1, null })
1387 >    {
1388 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1389 >        final Noop[] rs = new Noop[6];
1390 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1391  
1392 <        f = new CompletableFuture<>();
1393 <        f.complete(null);
1394 <        g = f.thenRun(r = new Noop());
1395 <        checkCompletedNormally(g, null);
1396 <        assertEquals(1, r.invocationCount);
1397 <    }
1392 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1393 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1394 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1395 >        checkIncomplete(h0);
1396 >        checkIncomplete(h1);
1397 >        checkIncomplete(h2);
1398 >        assertTrue(f.complete(v1));
1399 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1400 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1401 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1402 >
1403 >        checkCompletedNormally(h0, null);
1404 >        checkCompletedNormally(h1, null);
1405 >        checkCompletedNormally(h2, null);
1406 >        checkCompletedNormally(h3, null);
1407 >        checkCompletedNormally(h4, null);
1408 >        checkCompletedNormally(h5, null);
1409 >        checkCompletedNormally(f, v1);
1410 >        for (Noop r : rs) r.assertInvoked();
1411 >    }}
1412  
1413      /**
1414       * thenRun result completes exceptionally after exceptional
1415       * completion of source
1416       */
1417 <    public void testThenRun2() {
1418 <        CompletableFuture<Integer> f;
1419 <        CompletableFuture<Void> g;
1420 <        Noop r;
1421 <
1422 <        f = new CompletableFuture<>();
1423 <        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);
1417 >    public void testThenRun_exceptionalCompletion() {
1418 >        for (ExecutionMode m : ExecutionMode.values())
1419 >    {
1420 >        final CFException ex = new CFException();
1421 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1422 >        final Noop[] rs = new Noop[6];
1423 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1424  
1425 <        f = new CompletableFuture<>();
1426 <        f.complete(null);
1427 <        g = f.thenRun(r = new FailingNoop());
1428 <        checkCompletedWithWrappedCFException(g);
1429 <    }
1425 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1426 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1427 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1428 >        checkIncomplete(h0);
1429 >        checkIncomplete(h1);
1430 >        checkIncomplete(h2);
1431 >        assertTrue(f.completeExceptionally(ex));
1432 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1433 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1434 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1435 >
1436 >        checkCompletedWithWrappedException(h0, ex);
1437 >        checkCompletedWithWrappedException(h1, ex);
1438 >        checkCompletedWithWrappedException(h2, ex);
1439 >        checkCompletedWithWrappedException(h3, ex);
1440 >        checkCompletedWithWrappedException(h4, ex);
1441 >        checkCompletedWithWrappedException(h5, ex);
1442 >        checkCompletedExceptionally(f, ex);
1443 >        for (Noop r : rs) r.assertNotInvoked();
1444 >    }}
1445  
1446      /**
1447       * thenRun result completes exceptionally if source cancelled
1448       */
1449 <    public void testThenRun4() {
1450 <        CompletableFuture<Integer> f;
1451 <        CompletableFuture<Void> g;
1452 <        Noop r;
1453 <
1454 <        f = new CompletableFuture<>();
1455 <        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 <    }
1449 >    public void testThenRun_sourceCancelled() {
1450 >        for (ExecutionMode m : ExecutionMode.values())
1451 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1452 >    {
1453 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1454 >        final Noop[] rs = new Noop[6];
1455 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1456  
1457 <    /**
1458 <     * thenAccept result completes exceptionally after exceptional
1459 <     * completion of source
1460 <     */
1461 <    public void testThenAccept2() {
1462 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1463 <        IncAction r = new IncAction();
1464 <        CompletableFuture<Void> g = f.thenAccept(r);
1465 <        f.completeExceptionally(new CFException());
1466 <        checkCompletedWithWrappedCFException(g);
1467 <    }
1457 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1458 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1459 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1460 >        checkIncomplete(h0);
1461 >        checkIncomplete(h1);
1462 >        checkIncomplete(h2);
1463 >        assertTrue(f.cancel(mayInterruptIfRunning));
1464 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1465 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1466 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1467 >
1468 >        checkCompletedWithWrappedCancellationException(h0);
1469 >        checkCompletedWithWrappedCancellationException(h1);
1470 >        checkCompletedWithWrappedCancellationException(h2);
1471 >        checkCompletedWithWrappedCancellationException(h3);
1472 >        checkCompletedWithWrappedCancellationException(h4);
1473 >        checkCompletedWithWrappedCancellationException(h5);
1474 >        checkCancelled(f);
1475 >        for (Noop r : rs) r.assertNotInvoked();
1476 >    }}
1477  
1478      /**
1479 <     * thenAccept result completes exceptionally if action does
1479 >     * thenRun result completes exceptionally if action does
1480       */
1481 <    public void testThenAccept3() {
1482 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1483 <        FailingConsumer r = new FailingConsumer();
1484 <        CompletableFuture<Void> g = f.thenAccept(r);
1485 <        f.complete(one);
1486 <        checkCompletedWithWrappedCFException(g);
1487 <        assertEquals(1, r.invocationCount);
1117 <    }
1481 >    public void testThenRun_actionFailed() {
1482 >        for (ExecutionMode m : ExecutionMode.values())
1483 >        for (Integer v1 : new Integer[] { 1, null })
1484 >    {
1485 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1486 >        final FailingRunnable[] rs = new FailingRunnable[6];
1487 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1488  
1489 <    /**
1490 <     * thenAccept result completes exceptionally if source cancelled
1491 <     */
1492 <    public void testThenAccept4() {
1493 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1494 <        IncAction r = new IncAction();
1495 <        CompletableFuture<Void> g = f.thenAccept(r);
1496 <        assertTrue(f.cancel(true));
1497 <        checkCompletedWithWrappedCancellationException(g);
1498 <    }
1489 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1490 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1491 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1492 >        assertTrue(f.complete(v1));
1493 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1494 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1495 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1496 >
1497 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1498 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1499 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1500 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1501 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1502 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1503 >        checkCompletedNormally(f, v1);
1504 >    }}
1505  
1506      /**
1507 <     * thenCombine result completes normally after normal completion
1132 <     * of sources
1507 >     * thenApply result completes normally after normal completion of source
1508       */
1509 <    public void testThenCombine_normalCompletion1() {
1135 <        for (boolean createIncomplete : new boolean[] { true, false })
1136 <        for (boolean fFirst : new boolean[] { true, false })
1509 >    public void testThenApply_normalCompletion() {
1510          for (ExecutionMode m : ExecutionMode.values())
1511          for (Integer v1 : new Integer[] { 1, null })
1512 <        for (Integer v2 : new Integer[] { 2, null }) {
1140 <
1512 >    {
1513          final CompletableFuture<Integer> f = new CompletableFuture<>();
1514 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1515 <        final SubtractFunction r = new SubtractFunction();
1144 <        CompletableFuture<Integer> h = null;
1145 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1514 >        final IncFunction[] rs = new IncFunction[4];
1515 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1516  
1517 <        if (fFirst)
1518 <            f.complete(v1);
1519 <        else
1520 <            g.complete(v2);
1521 <        if (createIncomplete) checkIncomplete(h);
1522 <        assertEquals(0, r.invocationCount);
1523 <        if (!fFirst)
1524 <            f.complete(v1);
1525 <        else
1526 <            g.complete(v2);
1527 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1528 <
1159 <        checkCompletedNormally(h, subtract(v1, v2));
1517 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1518 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1519 >        checkIncomplete(h0);
1520 >        checkIncomplete(h1);
1521 >        assertTrue(f.complete(v1));
1522 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1523 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1524 >
1525 >        checkCompletedNormally(h0, inc(v1));
1526 >        checkCompletedNormally(h1, inc(v1));
1527 >        checkCompletedNormally(h2, inc(v1));
1528 >        checkCompletedNormally(h3, inc(v1));
1529          checkCompletedNormally(f, v1);
1530 <        checkCompletedNormally(g, v2);
1531 <        assertEquals(1, r.invocationCount);
1163 <        }
1164 <    }
1530 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1531 >    }}
1532  
1533      /**
1534 <     * thenCombine result completes exceptionally after exceptional
1535 <     * completion of either source
1534 >     * thenApply result completes exceptionally after exceptional
1535 >     * completion of source
1536       */
1537 <    public void testThenCombine_exceptionalCompletion1() {
1537 >    public void testThenApply_exceptionalCompletion() {
1538          for (ExecutionMode m : ExecutionMode.values())
1539 <        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);
1539 >    {
1540          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
1541          final CompletableFuture<Integer> f = new CompletableFuture<>();
1542 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1543 <        final SubtractFunction r = new SubtractFunction();
1198 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1199 <        final CFException ex = new CFException();
1542 >        final IncFunction[] rs = new IncFunction[4];
1543 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1544  
1545 <        g.completeExceptionally(ex);
1546 <        checkIncomplete(h);
1547 <        f.complete(v1);
1548 <
1549 <        checkCompletedWithWrappedCFException(h, ex);
1550 <        checkCompletedWithWrappedCFException(g, ex);
1551 <        assertEquals(0, r.invocationCount);
1552 <        checkCompletedNormally(f, v1);
1553 <        }
1554 <    }
1545 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1546 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1547 >        assertTrue(f.completeExceptionally(ex));
1548 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1549 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1550 >
1551 >        checkCompletedWithWrappedException(h0, ex);
1552 >        checkCompletedWithWrappedException(h1, ex);
1553 >        checkCompletedWithWrappedException(h2, ex);
1554 >        checkCompletedWithWrappedException(h3, ex);
1555 >        checkCompletedExceptionally(f, ex);
1556 >        for (IncFunction r : rs) r.assertNotInvoked();
1557 >    }}
1558  
1559 <    public void testThenCombine_exceptionalCompletion3() {
1559 >    /**
1560 >     * thenApply result completes exceptionally if source cancelled
1561 >     */
1562 >    public void testThenApply_sourceCancelled() {
1563          for (ExecutionMode m : ExecutionMode.values())
1564 <        for (Integer v1 : new Integer[] { 1, null }) {
1565 <
1564 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1565 >    {
1566          final CompletableFuture<Integer> f = new CompletableFuture<>();
1567 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1568 <        final SubtractFunction r = new SubtractFunction();
1219 <        final CFException ex = new CFException();
1567 >        final IncFunction[] rs = new IncFunction[4];
1568 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1569  
1570 <        g.completeExceptionally(ex);
1571 <        f.complete(v1);
1572 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1570 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1571 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1572 >        assertTrue(f.cancel(mayInterruptIfRunning));
1573 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1574 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1575  
1576 <        checkCompletedWithWrappedCFException(h, ex);
1577 <        checkCompletedWithWrappedCFException(g, ex);
1578 <        assertEquals(0, r.invocationCount);
1579 <        checkCompletedNormally(f, v1);
1580 <        }
1581 <    }
1576 >        checkCompletedWithWrappedCancellationException(h0);
1577 >        checkCompletedWithWrappedCancellationException(h1);
1578 >        checkCompletedWithWrappedCancellationException(h2);
1579 >        checkCompletedWithWrappedCancellationException(h3);
1580 >        checkCancelled(f);
1581 >        for (IncFunction r : rs) r.assertNotInvoked();
1582 >    }}
1583  
1584 <    public void testThenCombine_exceptionalCompletion4() {
1584 >    /**
1585 >     * thenApply result completes exceptionally if action does
1586 >     */
1587 >    public void testThenApply_actionFailed() {
1588          for (ExecutionMode m : ExecutionMode.values())
1589 <        for (Integer v1 : new Integer[] { 1, null }) {
1590 <
1589 >        for (Integer v1 : new Integer[] { 1, null })
1590 >    {
1591          final CompletableFuture<Integer> f = new CompletableFuture<>();
1592 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1593 <        final SubtractFunction r = new SubtractFunction();
1239 <        final CFException ex = new CFException();
1592 >        final FailingFunction[] rs = new FailingFunction[4];
1593 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1594  
1595 <        f.completeExceptionally(ex);
1596 <        g.complete(v1);
1597 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1598 <
1599 <        checkCompletedWithWrappedCFException(h, ex);
1600 <        checkCompletedWithWrappedCFException(f, ex);
1601 <        assertEquals(0, r.invocationCount);
1602 <        checkCompletedNormally(g, v1);
1603 <        }
1604 <    }
1595 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1596 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1597 >        assertTrue(f.complete(v1));
1598 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1599 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1600 >
1601 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1602 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1603 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1604 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1605 >        checkCompletedNormally(f, v1);
1606 >    }}
1607  
1608      /**
1609 <     * thenCombine result completes exceptionally if action does
1609 >     * thenAccept result completes normally after normal completion of source
1610       */
1611 <    public void testThenCombine_actionFailed1() {
1611 >    public void testThenAccept_normalCompletion() {
1612          for (ExecutionMode m : ExecutionMode.values())
1613          for (Integer v1 : new Integer[] { 1, null })
1614 <        for (Integer v2 : new Integer[] { 2, null }) {
1259 <
1614 >    {
1615          final CompletableFuture<Integer> f = new CompletableFuture<>();
1616 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1617 <        final FailingBiFunction r = new FailingBiFunction();
1263 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1616 >        final NoopConsumer[] rs = new NoopConsumer[4];
1617 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1618  
1619 <        f.complete(v1);
1620 <        checkIncomplete(h);
1621 <        g.complete(v2);
1622 <
1623 <        checkCompletedWithWrappedCFException(h);
1619 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1620 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1621 >        checkIncomplete(h0);
1622 >        checkIncomplete(h1);
1623 >        assertTrue(f.complete(v1));
1624 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1625 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1626 >
1627 >        checkCompletedNormally(h0, null);
1628 >        checkCompletedNormally(h1, null);
1629 >        checkCompletedNormally(h2, null);
1630 >        checkCompletedNormally(h3, null);
1631          checkCompletedNormally(f, v1);
1632 <        checkCompletedNormally(g, v2);
1633 <        }
1273 <    }
1632 >        for (NoopConsumer r : rs) r.assertValue(v1);
1633 >    }}
1634  
1635 <    public void testThenCombine_actionFailed2() {
1635 >    /**
1636 >     * thenAccept result completes exceptionally after exceptional
1637 >     * completion of source
1638 >     */
1639 >    public void testThenAccept_exceptionalCompletion() {
1640          for (ExecutionMode m : ExecutionMode.values())
1641 <        for (Integer v1 : new Integer[] { 1, null })
1642 <        for (Integer v2 : new Integer[] { 2, null }) {
1279 <
1641 >    {
1642 >        final CFException ex = new CFException();
1643          final CompletableFuture<Integer> f = new CompletableFuture<>();
1644 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1645 <        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);
1644 >        final NoopConsumer[] rs = new NoopConsumer[4];
1645 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1646  
1647 <        checkCompletedWithWrappedCFException(h);
1648 <        checkCompletedNormally(f, v1);
1649 <        checkCompletedNormally(g, v2);
1650 <        }
1651 <    }
1647 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1648 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1649 >        assertTrue(f.completeExceptionally(ex));
1650 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1651 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1652 >
1653 >        checkCompletedWithWrappedException(h0, ex);
1654 >        checkCompletedWithWrappedException(h1, ex);
1655 >        checkCompletedWithWrappedException(h2, ex);
1656 >        checkCompletedWithWrappedException(h3, ex);
1657 >        checkCompletedExceptionally(f, ex);
1658 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1659 >    }}
1660  
1661      /**
1662 <     * thenCombine result completes exceptionally if either source cancelled
1662 >     * thenAccept result completes exceptionally if source cancelled
1663       */
1664 <    public void testThenCombine_sourceCancelled1() {
1664 >    public void testThenAccept_sourceCancelled() {
1665          for (ExecutionMode m : ExecutionMode.values())
1666          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1667 <        for (Integer v1 : new Integer[] { 1, null }) {
1302 <
1667 >    {
1668          final CompletableFuture<Integer> f = new CompletableFuture<>();
1669 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1670 <        final SubtractFunction r = new SubtractFunction();
1306 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1669 >        final NoopConsumer[] rs = new NoopConsumer[4];
1670 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1671  
1672 +        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1673 +        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1674          assertTrue(f.cancel(mayInterruptIfRunning));
1675 <        checkIncomplete(h);
1676 <        g.complete(v1);
1675 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1676 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1677  
1678 <        checkCompletedWithWrappedCancellationException(h);
1678 >        checkCompletedWithWrappedCancellationException(h0);
1679 >        checkCompletedWithWrappedCancellationException(h1);
1680 >        checkCompletedWithWrappedCancellationException(h2);
1681 >        checkCompletedWithWrappedCancellationException(h3);
1682          checkCancelled(f);
1683 <        assertEquals(0, r.invocationCount);
1684 <        checkCompletedNormally(g, v1);
1316 <        }
1317 <    }
1683 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1684 >    }}
1685  
1686 <    public void testThenCombine_sourceCancelled2() {
1686 >    /**
1687 >     * thenAccept result completes exceptionally if action does
1688 >     */
1689 >    public void testThenAccept_actionFailed() {
1690          for (ExecutionMode m : ExecutionMode.values())
1691 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1692 <        for (Integer v1 : new Integer[] { 1, null }) {
1323 <
1691 >        for (Integer v1 : new Integer[] { 1, null })
1692 >    {
1693          final CompletableFuture<Integer> f = new CompletableFuture<>();
1694 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1695 <        final SubtractFunction r = new SubtractFunction();
1327 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1694 >        final FailingConsumer[] rs = new FailingConsumer[4];
1695 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1696  
1697 <        assertTrue(g.cancel(mayInterruptIfRunning));
1698 <        checkIncomplete(h);
1699 <        f.complete(v1);
1700 <
1701 <        checkCompletedWithWrappedCancellationException(h);
1702 <        checkCancelled(g);
1703 <        assertEquals(0, r.invocationCount);
1697 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1698 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1699 >        assertTrue(f.complete(v1));
1700 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1701 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1702 >
1703 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1704 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1705 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1706 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1707          checkCompletedNormally(f, v1);
1708 <        }
1338 <    }
1708 >    }}
1709  
1710 <    public void testThenCombine_sourceCancelled3() {
1710 >    /**
1711 >     * thenCombine result completes normally after normal completion
1712 >     * of sources
1713 >     */
1714 >    public void testThenCombine_normalCompletion() {
1715          for (ExecutionMode m : ExecutionMode.values())
1716 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1717 <        for (Integer v1 : new Integer[] { 1, null }) {
1718 <
1716 >        for (boolean fFirst : new boolean[] { true, false })
1717 >        for (Integer v1 : new Integer[] { 1, null })
1718 >        for (Integer v2 : new Integer[] { 2, null })
1719 >    {
1720          final CompletableFuture<Integer> f = new CompletableFuture<>();
1721          final CompletableFuture<Integer> g = new CompletableFuture<>();
1722 <        final SubtractFunction r = new SubtractFunction();
1722 >        final SubtractFunction[] rs = new SubtractFunction[6];
1723 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1724  
1725 <        assertTrue(g.cancel(mayInterruptIfRunning));
1726 <        f.complete(v1);
1727 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1725 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1726 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1727 >        final Integer w1 =  fFirst ? v1 : v2;
1728 >        final Integer w2 = !fFirst ? v1 : v2;
1729 >
1730 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1731 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1732 >        assertTrue(fst.complete(w1));
1733 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1734 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1735 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1736 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1737 >        checkCompletedNormally(h1, subtract(w1, w1));
1738 >        checkCompletedNormally(h3, subtract(w1, w1));
1739 >        rs[1].assertValue(subtract(w1, w1));
1740 >        rs[3].assertValue(subtract(w1, w1));
1741 >        assertTrue(snd.complete(w2));
1742 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1743 >
1744 >        checkCompletedNormally(h0, subtract(v1, v2));
1745 >        checkCompletedNormally(h2, subtract(v1, v2));
1746 >        checkCompletedNormally(h4, subtract(v1, v2));
1747 >        rs[0].assertValue(subtract(v1, v2));
1748 >        rs[2].assertValue(subtract(v1, v2));
1749 >        rs[4].assertValue(subtract(v1, v2));
1750  
1353        checkCompletedWithWrappedCancellationException(h);
1354        checkCancelled(g);
1355        assertEquals(0, r.invocationCount);
1751          checkCompletedNormally(f, v1);
1752 <        }
1753 <    }
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 <    }
1752 >        checkCompletedNormally(g, v2);
1753 >    }}
1754  
1755      /**
1756 <     * thenAcceptBoth result completes normally after normal
1757 <     * completion of sources
1756 >     * thenCombine result completes exceptionally after exceptional
1757 >     * completion of either source
1758       */
1759 <    public void testThenAcceptBoth_normalCompletion1() {
1759 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1760          for (ExecutionMode m : ExecutionMode.values())
1761 +        for (boolean fFirst : new boolean[] { true, false })
1762 +        for (boolean failFirst : new boolean[] { true, false })
1763          for (Integer v1 : new Integer[] { 1, null })
1764 <        for (Integer v2 : new Integer[] { 2, null }) {
1388 <
1764 >    {
1765          final CompletableFuture<Integer> f = new CompletableFuture<>();
1766          final CompletableFuture<Integer> g = new CompletableFuture<>();
1767 <        final SubtractAction r = new SubtractAction();
1768 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1769 <
1770 <        f.complete(v1);
1771 <        checkIncomplete(h);
1772 <        assertEquals(0, r.invocationCount);
1773 <        g.complete(v2);
1774 <
1775 <        checkCompletedNormally(h, null);
1776 <        assertEquals(subtract(v1, v2), r.value);
1777 <        checkCompletedNormally(f, v1);
1778 <        checkCompletedNormally(g, v2);
1779 <        }
1780 <    }
1767 >        final CFException ex = new CFException();
1768 >        final SubtractFunction r1 = new SubtractFunction(m);
1769 >        final SubtractFunction r2 = new SubtractFunction(m);
1770 >        final SubtractFunction r3 = new SubtractFunction(m);
1771 >
1772 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1773 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1774 >        final Callable<Boolean> complete1 = failFirst ?
1775 >            () -> fst.completeExceptionally(ex) :
1776 >            () -> fst.complete(v1);
1777 >        final Callable<Boolean> complete2 = failFirst ?
1778 >            () -> snd.complete(v1) :
1779 >            () -> snd.completeExceptionally(ex);
1780 >
1781 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1782 >        assertTrue(complete1.call());
1783 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1784 >        checkIncomplete(h1);
1785 >        checkIncomplete(h2);
1786 >        assertTrue(complete2.call());
1787 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1788 >
1789 >        checkCompletedWithWrappedException(h1, ex);
1790 >        checkCompletedWithWrappedException(h2, ex);
1791 >        checkCompletedWithWrappedException(h3, ex);
1792 >        r1.assertNotInvoked();
1793 >        r2.assertNotInvoked();
1794 >        r3.assertNotInvoked();
1795 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1796 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1797 >    }}
1798  
1799 <    public void testThenAcceptBoth_normalCompletion2() {
1799 >    /**
1800 >     * thenCombine result completes exceptionally if either source cancelled
1801 >     */
1802 >    public void testThenCombine_sourceCancelled() throws Throwable {
1803          for (ExecutionMode m : ExecutionMode.values())
1804 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1805 +        for (boolean fFirst : new boolean[] { true, false })
1806 +        for (boolean failFirst : new boolean[] { true, false })
1807          for (Integer v1 : new Integer[] { 1, null })
1808 <        for (Integer v2 : new Integer[] { 2, null }) {
1410 <
1808 >    {
1809          final CompletableFuture<Integer> f = new CompletableFuture<>();
1810          final CompletableFuture<Integer> g = new CompletableFuture<>();
1811 <        final SubtractAction r = new SubtractAction();
1812 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1813 <
1814 <        g.complete(v2);
1815 <        checkIncomplete(h);
1816 <        assertEquals(0, r.invocationCount);
1817 <        f.complete(v1);
1818 <
1819 <        checkCompletedNormally(h, null);
1820 <        assertEquals(subtract(v1, v2), r.value);
1821 <        checkCompletedNormally(f, v1);
1822 <        checkCompletedNormally(g, v2);
1823 <        }
1824 <    }
1811 >        final SubtractFunction r1 = new SubtractFunction(m);
1812 >        final SubtractFunction r2 = new SubtractFunction(m);
1813 >        final SubtractFunction r3 = new SubtractFunction(m);
1814 >
1815 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1816 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1817 >        final Callable<Boolean> complete1 = failFirst ?
1818 >            () -> fst.cancel(mayInterruptIfRunning) :
1819 >            () -> fst.complete(v1);
1820 >        final Callable<Boolean> complete2 = failFirst ?
1821 >            () -> snd.complete(v1) :
1822 >            () -> snd.cancel(mayInterruptIfRunning);
1823 >
1824 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1825 >        assertTrue(complete1.call());
1826 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1827 >        checkIncomplete(h1);
1828 >        checkIncomplete(h2);
1829 >        assertTrue(complete2.call());
1830 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1831 >
1832 >        checkCompletedWithWrappedCancellationException(h1);
1833 >        checkCompletedWithWrappedCancellationException(h2);
1834 >        checkCompletedWithWrappedCancellationException(h3);
1835 >        r1.assertNotInvoked();
1836 >        r2.assertNotInvoked();
1837 >        r3.assertNotInvoked();
1838 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1839 >        checkCancelled(failFirst ? fst : snd);
1840 >    }}
1841  
1842 <    public void testThenAcceptBoth_normalCompletion3() {
1842 >    /**
1843 >     * thenCombine result completes exceptionally if action does
1844 >     */
1845 >    public void testThenCombine_actionFailed() {
1846          for (ExecutionMode m : ExecutionMode.values())
1847 +        for (boolean fFirst : new boolean[] { true, false })
1848          for (Integer v1 : new Integer[] { 1, null })
1849 <        for (Integer v2 : new Integer[] { 2, null }) {
1850 <
1849 >        for (Integer v2 : new Integer[] { 2, null })
1850 >    {
1851          final CompletableFuture<Integer> f = new CompletableFuture<>();
1852          final CompletableFuture<Integer> g = new CompletableFuture<>();
1853 <        final SubtractAction r = new SubtractAction();
1854 <
1855 <        g.complete(v2);
1856 <        f.complete(v1);
1857 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1858 <
1859 <        checkCompletedNormally(h, null);
1860 <        assertEquals(subtract(v1, v2), r.value);
1853 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1854 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1855 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1856 >
1857 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1858 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1859 >        final Integer w1 =  fFirst ? v1 : v2;
1860 >        final Integer w2 = !fFirst ? v1 : v2;
1861 >
1862 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1863 >        assertTrue(fst.complete(w1));
1864 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1865 >        assertTrue(snd.complete(w2));
1866 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1867 >
1868 >        checkCompletedWithWrappedException(h1, r1.ex);
1869 >        checkCompletedWithWrappedException(h2, r2.ex);
1870 >        checkCompletedWithWrappedException(h3, r3.ex);
1871 >        r1.assertInvoked();
1872 >        r2.assertInvoked();
1873 >        r3.assertInvoked();
1874          checkCompletedNormally(f, v1);
1875          checkCompletedNormally(g, v2);
1876 <        }
1446 <    }
1876 >    }}
1877  
1878 <    public void testThenAcceptBoth_normalCompletion4() {
1878 >    /**
1879 >     * thenAcceptBoth result completes normally after normal
1880 >     * completion of sources
1881 >     */
1882 >    public void testThenAcceptBoth_normalCompletion() {
1883          for (ExecutionMode m : ExecutionMode.values())
1884 +        for (boolean fFirst : new boolean[] { true, false })
1885          for (Integer v1 : new Integer[] { 1, null })
1886 <        for (Integer v2 : new Integer[] { 2, null }) {
1887 <
1886 >        for (Integer v2 : new Integer[] { 2, null })
1887 >    {
1888          final CompletableFuture<Integer> f = new CompletableFuture<>();
1889          final CompletableFuture<Integer> g = new CompletableFuture<>();
1890 <        final SubtractAction r = new SubtractAction();
1891 <
1892 <        f.complete(v1);
1893 <        g.complete(v2);
1894 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1895 <
1896 <        checkCompletedNormally(h, null);
1897 <        assertEquals(subtract(v1, v2), r.value);
1890 >        final SubtractAction r1 = new SubtractAction(m);
1891 >        final SubtractAction r2 = new SubtractAction(m);
1892 >        final SubtractAction r3 = new SubtractAction(m);
1893 >
1894 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1895 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1896 >        final Integer w1 =  fFirst ? v1 : v2;
1897 >        final Integer w2 = !fFirst ? v1 : v2;
1898 >
1899 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1900 >        assertTrue(fst.complete(w1));
1901 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1902 >        checkIncomplete(h1);
1903 >        checkIncomplete(h2);
1904 >        r1.assertNotInvoked();
1905 >        r2.assertNotInvoked();
1906 >        assertTrue(snd.complete(w2));
1907 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1908 >
1909 >        checkCompletedNormally(h1, null);
1910 >        checkCompletedNormally(h2, null);
1911 >        checkCompletedNormally(h3, null);
1912 >        r1.assertValue(subtract(v1, v2));
1913 >        r2.assertValue(subtract(v1, v2));
1914 >        r3.assertValue(subtract(v1, v2));
1915          checkCompletedNormally(f, v1);
1916          checkCompletedNormally(g, v2);
1917 <        }
1466 <    }
1917 >    }}
1918  
1919      /**
1920       * thenAcceptBoth result completes exceptionally after exceptional
1921       * completion of either source
1922       */
1923 <    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() {
1923 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1924          for (ExecutionMode m : ExecutionMode.values())
1925 <        for (Integer v1 : new Integer[] { 1, null }) {
1926 <
1925 >        for (boolean fFirst : new boolean[] { true, false })
1926 >        for (boolean failFirst : new boolean[] { true, false })
1927 >        for (Integer v1 : new Integer[] { 1, null })
1928 >    {
1929          final CompletableFuture<Integer> f = new CompletableFuture<>();
1930          final CompletableFuture<Integer> g = new CompletableFuture<>();
1520        final SubtractAction r = new SubtractAction();
1931          final CFException ex = new CFException();
1932 +        final SubtractAction r1 = new SubtractAction(m);
1933 +        final SubtractAction r2 = new SubtractAction(m);
1934 +        final SubtractAction r3 = new SubtractAction(m);
1935 +
1936 +        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1937 +        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1938 +        final Callable<Boolean> complete1 = failFirst ?
1939 +            () -> fst.completeExceptionally(ex) :
1940 +            () -> fst.complete(v1);
1941 +        final Callable<Boolean> complete2 = failFirst ?
1942 +            () -> snd.complete(v1) :
1943 +            () -> snd.completeExceptionally(ex);
1944 +
1945 +        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1946 +        assertTrue(complete1.call());
1947 +        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1948 +        checkIncomplete(h1);
1949 +        checkIncomplete(h2);
1950 +        assertTrue(complete2.call());
1951 +        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1952 +
1953 +        checkCompletedWithWrappedException(h1, ex);
1954 +        checkCompletedWithWrappedException(h2, ex);
1955 +        checkCompletedWithWrappedException(h3, ex);
1956 +        r1.assertNotInvoked();
1957 +        r2.assertNotInvoked();
1958 +        r3.assertNotInvoked();
1959 +        checkCompletedNormally(failFirst ? snd : fst, v1);
1960 +        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1961 +    }}
1962  
1963 <        g.completeExceptionally(ex);
1964 <        f.complete(v1);
1965 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1966 <
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() {
1963 >    /**
1964 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1965 >     */
1966 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1967          for (ExecutionMode m : ExecutionMode.values())
1968 <        for (Integer v1 : new Integer[] { 1, null }) {
1969 <
1968 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1969 >        for (boolean fFirst : new boolean[] { true, false })
1970 >        for (boolean failFirst : new boolean[] { true, false })
1971 >        for (Integer v1 : new Integer[] { 1, null })
1972 >    {
1973          final CompletableFuture<Integer> f = new CompletableFuture<>();
1974          final CompletableFuture<Integer> g = new CompletableFuture<>();
1975 <        final SubtractAction r = new SubtractAction();
1976 <        final CFException ex = new CFException();
1977 <
1978 <        f.completeExceptionally(ex);
1979 <        g.complete(v1);
1980 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1981 <
1982 <        checkCompletedWithWrappedCFException(h, ex);
1983 <        checkCompletedWithWrappedCFException(f, ex);
1984 <        assertEquals(0, r.invocationCount);
1985 <        checkCompletedNormally(g, v1);
1986 <        }
1987 <    }
1975 >        final SubtractAction r1 = new SubtractAction(m);
1976 >        final SubtractAction r2 = new SubtractAction(m);
1977 >        final SubtractAction r3 = new SubtractAction(m);
1978 >
1979 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1980 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1981 >        final Callable<Boolean> complete1 = failFirst ?
1982 >            () -> fst.cancel(mayInterruptIfRunning) :
1983 >            () -> fst.complete(v1);
1984 >        final Callable<Boolean> complete2 = failFirst ?
1985 >            () -> snd.complete(v1) :
1986 >            () -> snd.cancel(mayInterruptIfRunning);
1987 >
1988 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1989 >        assertTrue(complete1.call());
1990 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1991 >        checkIncomplete(h1);
1992 >        checkIncomplete(h2);
1993 >        assertTrue(complete2.call());
1994 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1995 >
1996 >        checkCompletedWithWrappedCancellationException(h1);
1997 >        checkCompletedWithWrappedCancellationException(h2);
1998 >        checkCompletedWithWrappedCancellationException(h3);
1999 >        r1.assertNotInvoked();
2000 >        r2.assertNotInvoked();
2001 >        r3.assertNotInvoked();
2002 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2003 >        checkCancelled(failFirst ? fst : snd);
2004 >    }}
2005  
2006      /**
2007       * thenAcceptBoth result completes exceptionally if action does
2008       */
2009 <    public void testThenAcceptBoth_actionFailed1() {
2009 >    public void testThenAcceptBoth_actionFailed() {
2010          for (ExecutionMode m : ExecutionMode.values())
2011 +        for (boolean fFirst : new boolean[] { true, false })
2012          for (Integer v1 : new Integer[] { 1, null })
2013 <        for (Integer v2 : new Integer[] { 2, null }) {
2014 <
2013 >        for (Integer v2 : new Integer[] { 2, null })
2014 >    {
2015          final CompletableFuture<Integer> f = new CompletableFuture<>();
2016          final CompletableFuture<Integer> g = new CompletableFuture<>();
2017 <        final FailingBiConsumer r = new FailingBiConsumer();
2018 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2019 <
2020 <        f.complete(v1);
2021 <        checkIncomplete(h);
2022 <        g.complete(v2);
2023 <
2024 <        checkCompletedWithWrappedCFException(h);
2017 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
2018 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
2019 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
2020 >
2021 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2022 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2023 >        final Integer w1 =  fFirst ? v1 : v2;
2024 >        final Integer w2 = !fFirst ? v1 : v2;
2025 >
2026 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
2027 >        assertTrue(fst.complete(w1));
2028 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
2029 >        assertTrue(snd.complete(w2));
2030 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
2031 >
2032 >        checkCompletedWithWrappedException(h1, r1.ex);
2033 >        checkCompletedWithWrappedException(h2, r2.ex);
2034 >        checkCompletedWithWrappedException(h3, r3.ex);
2035 >        r1.assertInvoked();
2036 >        r2.assertInvoked();
2037 >        r3.assertInvoked();
2038          checkCompletedNormally(f, v1);
2039          checkCompletedNormally(g, v2);
2040 <        }
1575 <    }
2040 >    }}
2041  
2042 <    public void testThenAcceptBoth_actionFailed2() {
2042 >    /**
2043 >     * runAfterBoth result completes normally after normal
2044 >     * completion of sources
2045 >     */
2046 >    public void testRunAfterBoth_normalCompletion() {
2047          for (ExecutionMode m : ExecutionMode.values())
2048 +        for (boolean fFirst : new boolean[] { true, false })
2049          for (Integer v1 : new Integer[] { 1, null })
2050 <        for (Integer v2 : new Integer[] { 2, null }) {
2051 <
2050 >        for (Integer v2 : new Integer[] { 2, null })
2051 >    {
2052          final CompletableFuture<Integer> f = new CompletableFuture<>();
2053          final CompletableFuture<Integer> g = new CompletableFuture<>();
2054 <        final FailingBiConsumer r = new FailingBiConsumer();
2055 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2056 <
2057 <        g.complete(v2);
2058 <        checkIncomplete(h);
2059 <        f.complete(v1);
2060 <
2061 <        checkCompletedWithWrappedCFException(h);
2054 >        final Noop r1 = new Noop(m);
2055 >        final Noop r2 = new Noop(m);
2056 >        final Noop r3 = new Noop(m);
2057 >
2058 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2059 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2060 >        final Integer w1 =  fFirst ? v1 : v2;
2061 >        final Integer w2 = !fFirst ? v1 : v2;
2062 >
2063 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2064 >        assertTrue(fst.complete(w1));
2065 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2066 >        checkIncomplete(h1);
2067 >        checkIncomplete(h2);
2068 >        r1.assertNotInvoked();
2069 >        r2.assertNotInvoked();
2070 >        assertTrue(snd.complete(w2));
2071 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2072 >
2073 >        checkCompletedNormally(h1, null);
2074 >        checkCompletedNormally(h2, null);
2075 >        checkCompletedNormally(h3, null);
2076 >        r1.assertInvoked();
2077 >        r2.assertInvoked();
2078 >        r3.assertInvoked();
2079          checkCompletedNormally(f, v1);
2080          checkCompletedNormally(g, v2);
2081 <        }
1595 <    }
2081 >    }}
2082  
2083      /**
2084 <     * thenAcceptBoth result completes exceptionally if either source cancelled
2084 >     * runAfterBoth result completes exceptionally after exceptional
2085 >     * completion of either source
2086       */
2087 <    public void testThenAcceptBoth_sourceCancelled1() {
1601 <        for (ExecutionMode m : ExecutionMode.values())
1602 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1603 <        for (Integer v1 : new Integer[] { 1, null }) {
1604 <
1605 <        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() {
2087 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2088          for (ExecutionMode m : ExecutionMode.values())
2089 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2090 <        for (Integer v1 : new Integer[] { 1, null }) {
2091 <
2089 >        for (boolean fFirst : new boolean[] { true, false })
2090 >        for (boolean failFirst : new boolean[] { true, false })
2091 >        for (Integer v1 : new Integer[] { 1, null })
2092 >    {
2093          final CompletableFuture<Integer> f = new CompletableFuture<>();
2094          final CompletableFuture<Integer> g = new CompletableFuture<>();
2095 <        final SubtractAction r = new SubtractAction();
2096 <
2097 <        assertTrue(g.cancel(mayInterruptIfRunning));
2098 <        f.complete(v1);
2099 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2100 <
2101 <        checkCompletedWithWrappedCancellationException(h);
2102 <        checkCancelled(g);
2103 <        assertEquals(0, r.invocationCount);
2104 <        checkCompletedNormally(f, v1);
2105 <        }
2106 <    }
2095 >        final CFException ex = new CFException();
2096 >        final Noop r1 = new Noop(m);
2097 >        final Noop r2 = new Noop(m);
2098 >        final Noop r3 = new Noop(m);
2099 >
2100 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2101 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2102 >        final Callable<Boolean> complete1 = failFirst ?
2103 >            () -> fst.completeExceptionally(ex) :
2104 >            () -> fst.complete(v1);
2105 >        final Callable<Boolean> complete2 = failFirst ?
2106 >            () -> snd.complete(v1) :
2107 >            () -> snd.completeExceptionally(ex);
2108 >
2109 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2110 >        assertTrue(complete1.call());
2111 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2112 >        checkIncomplete(h1);
2113 >        checkIncomplete(h2);
2114 >        assertTrue(complete2.call());
2115 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2116 >
2117 >        checkCompletedWithWrappedException(h1, ex);
2118 >        checkCompletedWithWrappedException(h2, ex);
2119 >        checkCompletedWithWrappedException(h3, ex);
2120 >        r1.assertNotInvoked();
2121 >        r2.assertNotInvoked();
2122 >        r3.assertNotInvoked();
2123 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2124 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2125 >    }}
2126  
2127 <    public void testThenAcceptBoth_sourceCancelled4() {
2127 >    /**
2128 >     * runAfterBoth result completes exceptionally if either source cancelled
2129 >     */
2130 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2131          for (ExecutionMode m : ExecutionMode.values())
2132          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2133 <        for (Integer v1 : new Integer[] { 1, null }) {
2134 <
2133 >        for (boolean fFirst : new boolean[] { true, false })
2134 >        for (boolean failFirst : new boolean[] { true, false })
2135 >        for (Integer v1 : new Integer[] { 1, null })
2136 >    {
2137          final CompletableFuture<Integer> f = new CompletableFuture<>();
2138          final CompletableFuture<Integer> g = new CompletableFuture<>();
2139 <        final SubtractAction r = new SubtractAction();
2140 <
2141 <        assertTrue(f.cancel(mayInterruptIfRunning));
2142 <        g.complete(v1);
2143 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2144 <
2145 <        checkCompletedWithWrappedCancellationException(h);
2146 <        checkCancelled(f);
2147 <        assertEquals(0, r.invocationCount);
2148 <        checkCompletedNormally(g, v1);
2149 <        }
2150 <    }
2139 >        final Noop r1 = new Noop(m);
2140 >        final Noop r2 = new Noop(m);
2141 >        final Noop r3 = new Noop(m);
2142 >
2143 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2144 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2145 >        final Callable<Boolean> complete1 = failFirst ?
2146 >            () -> fst.cancel(mayInterruptIfRunning) :
2147 >            () -> fst.complete(v1);
2148 >        final Callable<Boolean> complete2 = failFirst ?
2149 >            () -> snd.complete(v1) :
2150 >            () -> snd.cancel(mayInterruptIfRunning);
2151 >
2152 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2153 >        assertTrue(complete1.call());
2154 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2155 >        checkIncomplete(h1);
2156 >        checkIncomplete(h2);
2157 >        assertTrue(complete2.call());
2158 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2159 >
2160 >        checkCompletedWithWrappedCancellationException(h1);
2161 >        checkCompletedWithWrappedCancellationException(h2);
2162 >        checkCompletedWithWrappedCancellationException(h3);
2163 >        r1.assertNotInvoked();
2164 >        r2.assertNotInvoked();
2165 >        r3.assertNotInvoked();
2166 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2167 >        checkCancelled(failFirst ? fst : snd);
2168 >    }}
2169  
2170      /**
2171 <     * runAfterBoth result completes normally after normal
1684 <     * completion of sources
2171 >     * runAfterBoth result completes exceptionally if action does
2172       */
2173 <    public void testRunAfterBoth_normalCompletion1() {
2173 >    public void testRunAfterBoth_actionFailed() {
2174          for (ExecutionMode m : ExecutionMode.values())
2175 +        for (boolean fFirst : new boolean[] { true, false })
2176          for (Integer v1 : new Integer[] { 1, null })
2177 <        for (Integer v2 : new Integer[] { 2, null }) {
2178 <
2177 >        for (Integer v2 : new Integer[] { 2, null })
2178 >    {
2179          final CompletableFuture<Integer> f = new CompletableFuture<>();
2180          final CompletableFuture<Integer> g = new CompletableFuture<>();
2181 <        final Noop r = new Noop();
2182 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2183 <
2184 <        f.complete(v1);
2185 <        checkIncomplete(h);
2186 <        assertEquals(0, r.invocationCount);
2187 <        g.complete(v2);
2188 <
2189 <        checkCompletedNormally(h, null);
2190 <        assertEquals(1, r.invocationCount);
2181 >        final FailingRunnable r1 = new FailingRunnable(m);
2182 >        final FailingRunnable r2 = new FailingRunnable(m);
2183 >        final FailingRunnable r3 = new FailingRunnable(m);
2184 >
2185 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2186 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2187 >        final Integer w1 =  fFirst ? v1 : v2;
2188 >        final Integer w2 = !fFirst ? v1 : v2;
2189 >
2190 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2191 >        assertTrue(fst.complete(w1));
2192 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2193 >        assertTrue(snd.complete(w2));
2194 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2195 >
2196 >        checkCompletedWithWrappedException(h1, r1.ex);
2197 >        checkCompletedWithWrappedException(h2, r2.ex);
2198 >        checkCompletedWithWrappedException(h3, r3.ex);
2199 >        r1.assertInvoked();
2200 >        r2.assertInvoked();
2201 >        r3.assertInvoked();
2202          checkCompletedNormally(f, v1);
2203          checkCompletedNormally(g, v2);
2204 <        }
1706 <    }
2204 >    }}
2205  
2206 <    public void testRunAfterBoth_normalCompletion2() {
2206 >    /**
2207 >     * applyToEither result completes normally after normal completion
2208 >     * of either source
2209 >     */
2210 >    public void testApplyToEither_normalCompletion() {
2211          for (ExecutionMode m : ExecutionMode.values())
2212          for (Integer v1 : new Integer[] { 1, null })
2213 <        for (Integer v2 : new Integer[] { 2, null }) {
2214 <
2213 >        for (Integer v2 : new Integer[] { 2, null })
2214 >    {
2215          final CompletableFuture<Integer> f = new CompletableFuture<>();
2216          final CompletableFuture<Integer> g = new CompletableFuture<>();
2217 <        final Noop r = new Noop();
2218 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2217 >        final IncFunction[] rs = new IncFunction[6];
2218 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2219  
2220 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2221 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2222 +        checkIncomplete(h0);
2223 +        checkIncomplete(h1);
2224 +        rs[0].assertNotInvoked();
2225 +        rs[1].assertNotInvoked();
2226 +        f.complete(v1);
2227 +        checkCompletedNormally(h0, inc(v1));
2228 +        checkCompletedNormally(h1, inc(v1));
2229 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2230 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2231 +        checkCompletedNormally(h2, inc(v1));
2232 +        checkCompletedNormally(h3, inc(v1));
2233          g.complete(v2);
1719        checkIncomplete(h);
1720        assertEquals(0, r.invocationCount);
1721        f.complete(v1);
1722
1723        checkCompletedNormally(h, null);
1724        assertEquals(1, r.invocationCount);
1725        checkCompletedNormally(f, v1);
1726        checkCompletedNormally(g, v2);
1727        }
1728    }
1729
1730    public void testRunAfterBoth_normalCompletion3() {
1731        for (ExecutionMode m : ExecutionMode.values())
1732        for (Integer v1 : new Integer[] { 1, null })
1733        for (Integer v2 : new Integer[] { 2, null }) {
2234  
2235 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2236 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2237 <        final Noop r = new Noop();
2235 >        // unspecified behavior - both source completions available
2236 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2237 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2238 >        rs[4].assertValue(h4.join());
2239 >        rs[5].assertValue(h5.join());
2240 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2241 >                   Objects.equals(inc(v2), h4.join()));
2242 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2243 >                   Objects.equals(inc(v2), h5.join()));
2244  
1739        g.complete(v2);
1740        f.complete(v1);
1741        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1742
1743        checkCompletedNormally(h, null);
1744        assertEquals(1, r.invocationCount);
2245          checkCompletedNormally(f, v1);
2246          checkCompletedNormally(g, v2);
2247 <        }
2248 <    }
2249 <
2250 <    public void testRunAfterBoth_normalCompletion4() {
2251 <        for (ExecutionMode m : ExecutionMode.values())
2252 <        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);
1765 <        checkCompletedNormally(f, v1);
1766 <        checkCompletedNormally(g, v2);
1767 <        }
1768 <    }
2247 >        checkCompletedNormally(h0, inc(v1));
2248 >        checkCompletedNormally(h1, inc(v1));
2249 >        checkCompletedNormally(h2, inc(v1));
2250 >        checkCompletedNormally(h3, inc(v1));
2251 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2252 >    }}
2253  
2254      /**
2255 <     * runAfterBoth result completes exceptionally after exceptional
2255 >     * applyToEither result completes exceptionally after exceptional
2256       * completion of either source
2257       */
2258 <    public void testRunAfterBoth_exceptionalCompletion1() {
2258 >    public void testApplyToEither_exceptionalCompletion() {
2259          for (ExecutionMode m : ExecutionMode.values())
2260 <        for (Integer v1 : new Integer[] { 1, null }) {
2261 <
2260 >        for (Integer v1 : new Integer[] { 1, null })
2261 >    {
2262          final CompletableFuture<Integer> f = new CompletableFuture<>();
2263          final CompletableFuture<Integer> g = new CompletableFuture<>();
1780        final Noop r = new Noop();
1781        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2264          final CFException ex = new CFException();
2265 +        final IncFunction[] rs = new IncFunction[6];
2266 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2267  
2268 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2269 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2270 +        checkIncomplete(h0);
2271 +        checkIncomplete(h1);
2272 +        rs[0].assertNotInvoked();
2273 +        rs[1].assertNotInvoked();
2274          f.completeExceptionally(ex);
2275 <        checkIncomplete(h);
2275 >        checkCompletedWithWrappedException(h0, ex);
2276 >        checkCompletedWithWrappedException(h1, ex);
2277 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2278 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2279 >        checkCompletedWithWrappedException(h2, ex);
2280 >        checkCompletedWithWrappedException(h3, ex);
2281          g.complete(v1);
2282  
2283 <        checkCompletedWithWrappedCFException(h, ex);
2284 <        checkCompletedWithWrappedCFException(f, ex);
2285 <        assertEquals(0, r.invocationCount);
2286 <        checkCompletedNormally(g, v1);
2287 <        }
2288 <    }
2289 <
2290 <    public void testRunAfterBoth_exceptionalCompletion2() {
2291 <        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);
2283 >        // unspecified behavior - both source completions available
2284 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2285 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2286 >        try {
2287 >            assertEquals(inc(v1), h4.join());
2288 >            rs[4].assertValue(inc(v1));
2289 >        } catch (CompletionException ok) {
2290 >            checkCompletedWithWrappedException(h4, ex);
2291 >            rs[4].assertNotInvoked();
2292          }
2293 <    }
2294 <
2295 <    public void testRunAfterBoth_exceptionalCompletion3() {
2296 <        for (ExecutionMode m : ExecutionMode.values())
2297 <        for (Integer v1 : new Integer[] { 1, null }) {
2298 <
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);
2293 >        try {
2294 >            assertEquals(inc(v1), h5.join());
2295 >            rs[5].assertValue(inc(v1));
2296 >        } catch (CompletionException ok) {
2297 >            checkCompletedWithWrappedException(h5, ex);
2298 >            rs[5].assertNotInvoked();
2299          }
1834    }
1835
1836    public void testRunAfterBoth_exceptionalCompletion4() {
1837        for (ExecutionMode m : ExecutionMode.values())
1838        for (Integer v1 : new Integer[] { 1, null }) {
1839
1840        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();
2300  
2301 <        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);
2301 >        checkCompletedExceptionally(f, ex);
2302          checkCompletedNormally(g, v1);
2303 <        }
2304 <    }
2303 >        checkCompletedWithWrappedException(h0, ex);
2304 >        checkCompletedWithWrappedException(h1, ex);
2305 >        checkCompletedWithWrappedException(h2, ex);
2306 >        checkCompletedWithWrappedException(h3, ex);
2307 >        checkCompletedWithWrappedException(h4, ex);
2308 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2309 >    }}
2310  
2311 <    /**
1857 <     * runAfterBoth result completes exceptionally if action does
1858 <     */
1859 <    public void testRunAfterBoth_actionFailed1() {
2311 >    public void testApplyToEither_exceptionalCompletion2() {
2312          for (ExecutionMode m : ExecutionMode.values())
2313 +        for (boolean fFirst : new boolean[] { true, false })
2314          for (Integer v1 : new Integer[] { 1, null })
2315 <        for (Integer v2 : new Integer[] { 2, null }) {
1863 <
2315 >    {
2316          final CompletableFuture<Integer> f = new CompletableFuture<>();
2317          final CompletableFuture<Integer> g = new CompletableFuture<>();
2318 <        final FailingNoop r = new FailingNoop();
2319 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2318 >        final CFException ex = new CFException();
2319 >        final IncFunction[] rs = new IncFunction[6];
2320 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2321  
2322 <        f.complete(v1);
2323 <        checkIncomplete(h);
2324 <        g.complete(v2);
2322 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2323 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2324 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2325 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2326 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2327 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2328  
2329 <        checkCompletedWithWrappedCFException(h);
2330 <        checkCompletedNormally(f, v1);
2331 <        checkCompletedNormally(g, v2);
2329 >        // unspecified behavior - both source completions available
2330 >        try {
2331 >            assertEquals(inc(v1), h0.join());
2332 >            rs[0].assertValue(inc(v1));
2333 >        } catch (CompletionException ok) {
2334 >            checkCompletedWithWrappedException(h0, ex);
2335 >            rs[0].assertNotInvoked();
2336 >        }
2337 >        try {
2338 >            assertEquals(inc(v1), h1.join());
2339 >            rs[1].assertValue(inc(v1));
2340 >        } catch (CompletionException ok) {
2341 >            checkCompletedWithWrappedException(h1, ex);
2342 >            rs[1].assertNotInvoked();
2343 >        }
2344 >        try {
2345 >            assertEquals(inc(v1), h2.join());
2346 >            rs[2].assertValue(inc(v1));
2347 >        } catch (CompletionException ok) {
2348 >            checkCompletedWithWrappedException(h2, ex);
2349 >            rs[2].assertNotInvoked();
2350 >        }
2351 >        try {
2352 >            assertEquals(inc(v1), h3.join());
2353 >            rs[3].assertValue(inc(v1));
2354 >        } catch (CompletionException ok) {
2355 >            checkCompletedWithWrappedException(h3, ex);
2356 >            rs[3].assertNotInvoked();
2357          }
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);
2358  
1893        checkCompletedWithWrappedCFException(h);
2359          checkCompletedNormally(f, v1);
2360 <        checkCompletedNormally(g, v2);
2361 <        }
1897 <    }
2360 >        checkCompletedExceptionally(g, ex);
2361 >    }}
2362  
2363      /**
2364 <     * runAfterBoth result completes exceptionally if either source cancelled
2364 >     * applyToEither result completes exceptionally if either source cancelled
2365       */
2366 <    public void testRunAfterBoth_sourceCancelled1() {
2366 >    public void testApplyToEither_sourceCancelled() {
2367          for (ExecutionMode m : ExecutionMode.values())
2368          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2369 <        for (Integer v1 : new Integer[] { 1, null }) {
2370 <
2369 >        for (Integer v1 : new Integer[] { 1, null })
2370 >    {
2371          final CompletableFuture<Integer> f = new CompletableFuture<>();
2372          final CompletableFuture<Integer> g = new CompletableFuture<>();
2373 <        final Noop r = new Noop();
2374 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2373 >        final IncFunction[] rs = new IncFunction[6];
2374 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2375  
2376 <        assertTrue(f.cancel(mayInterruptIfRunning));
2377 <        checkIncomplete(h);
2376 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2377 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2378 >        checkIncomplete(h0);
2379 >        checkIncomplete(h1);
2380 >        rs[0].assertNotInvoked();
2381 >        rs[1].assertNotInvoked();
2382 >        f.cancel(mayInterruptIfRunning);
2383 >        checkCompletedWithWrappedCancellationException(h0);
2384 >        checkCompletedWithWrappedCancellationException(h1);
2385 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2386 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2387 >        checkCompletedWithWrappedCancellationException(h2);
2388 >        checkCompletedWithWrappedCancellationException(h3);
2389          g.complete(v1);
2390  
2391 <        checkCompletedWithWrappedCancellationException(h);
2391 >        // unspecified behavior - both source completions available
2392 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2393 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2394 >        try {
2395 >            assertEquals(inc(v1), h4.join());
2396 >            rs[4].assertValue(inc(v1));
2397 >        } catch (CompletionException ok) {
2398 >            checkCompletedWithWrappedCancellationException(h4);
2399 >            rs[4].assertNotInvoked();
2400 >        }
2401 >        try {
2402 >            assertEquals(inc(v1), h5.join());
2403 >            rs[5].assertValue(inc(v1));
2404 >        } catch (CompletionException ok) {
2405 >            checkCompletedWithWrappedCancellationException(h5);
2406 >            rs[5].assertNotInvoked();
2407 >        }
2408 >
2409          checkCancelled(f);
1918        assertEquals(0, r.invocationCount);
2410          checkCompletedNormally(g, v1);
2411 <        }
2412 <    }
2411 >        checkCompletedWithWrappedCancellationException(h0);
2412 >        checkCompletedWithWrappedCancellationException(h1);
2413 >        checkCompletedWithWrappedCancellationException(h2);
2414 >        checkCompletedWithWrappedCancellationException(h3);
2415 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2416 >    }}
2417  
2418 <    public void testRunAfterBoth_sourceCancelled2() {
2418 >    public void testApplyToEither_sourceCancelled2() {
2419          for (ExecutionMode m : ExecutionMode.values())
2420          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2421 <        for (Integer v1 : new Integer[] { 1, null }) {
2422 <
2421 >        for (boolean fFirst : new boolean[] { true, false })
2422 >        for (Integer v1 : new Integer[] { 1, null })
2423 >    {
2424          final CompletableFuture<Integer> f = new CompletableFuture<>();
2425          final CompletableFuture<Integer> g = new CompletableFuture<>();
2426 <        final Noop r = new Noop();
2427 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2426 >        final IncFunction[] rs = new IncFunction[6];
2427 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2428  
2429 <        assertTrue(g.cancel(mayInterruptIfRunning));
2430 <        checkIncomplete(h);
2431 <        f.complete(v1);
2429 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2430 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2431 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2432 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2433 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2434 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2435  
2436 <        checkCompletedWithWrappedCancellationException(h);
2437 <        checkCancelled(g);
2438 <        assertEquals(0, r.invocationCount);
2439 <        checkCompletedNormally(f, v1);
2436 >        // unspecified behavior - both source completions available
2437 >        try {
2438 >            assertEquals(inc(v1), h0.join());
2439 >            rs[0].assertValue(inc(v1));
2440 >        } catch (CompletionException ok) {
2441 >            checkCompletedWithWrappedCancellationException(h0);
2442 >            rs[0].assertNotInvoked();
2443          }
2444 <    }
2445 <
2446 <    public void testRunAfterBoth_sourceCancelled3() {
2447 <        for (ExecutionMode m : ExecutionMode.values())
2448 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2449 <        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);
2444 >        try {
2445 >            assertEquals(inc(v1), h1.join());
2446 >            rs[1].assertValue(inc(v1));
2447 >        } catch (CompletionException ok) {
2448 >            checkCompletedWithWrappedCancellationException(h1);
2449 >            rs[1].assertNotInvoked();
2450          }
2451 <    }
2452 <
2453 <    public void testRunAfterBoth_sourceCancelled4() {
2454 <        for (ExecutionMode m : ExecutionMode.values())
2455 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2456 <        for (Integer v1 : new Integer[] { 1, null }) {
2457 <
2458 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2459 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2460 <        final Noop r = new Noop();
2461 <
2462 <        assertTrue(f.cancel(mayInterruptIfRunning));
2463 <        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);
2451 >        try {
2452 >            assertEquals(inc(v1), h2.join());
2453 >            rs[2].assertValue(inc(v1));
2454 >        } catch (CompletionException ok) {
2455 >            checkCompletedWithWrappedCancellationException(h2);
2456 >            rs[2].assertNotInvoked();
2457 >        }
2458 >        try {
2459 >            assertEquals(inc(v1), h3.join());
2460 >            rs[3].assertValue(inc(v1));
2461 >        } catch (CompletionException ok) {
2462 >            checkCompletedWithWrappedCancellationException(h3);
2463 >            rs[3].assertNotInvoked();
2464          }
2465 <    }
2465 >
2466 >        checkCompletedNormally(f, v1);
2467 >        checkCancelled(g);
2468 >    }}
2469  
2470      /**
2471 <     * applyToEither result completes normally after normal completion
1986 <     * of either source
2471 >     * applyToEither result completes exceptionally if action does
2472       */
2473 <    public void testApplyToEither_normalCompletion1() {
2473 >    public void testApplyToEither_actionFailed() {
2474          for (ExecutionMode m : ExecutionMode.values())
2475          for (Integer v1 : new Integer[] { 1, null })
2476 <        for (Integer v2 : new Integer[] { 2, null }) {
2477 <
2476 >        for (Integer v2 : new Integer[] { 2, null })
2477 >    {
2478          final CompletableFuture<Integer> f = new CompletableFuture<>();
2479          final CompletableFuture<Integer> g = new CompletableFuture<>();
2480 <        final IncFunction r = new IncFunction();
2481 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2480 >        final FailingFunction[] rs = new FailingFunction[6];
2481 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2482  
2483 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2484 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2485          f.complete(v1);
2486 <        checkCompletedNormally(h, inc(v1));
2486 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2487 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2488 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2489 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2490 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2491 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2492 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2493 >
2494          g.complete(v2);
2495  
2496 +        // unspecified behavior - both source completions available
2497 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2498 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2499 +
2500 +        checkCompletedWithWrappedException(h4, rs[4].ex);
2501 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2502 +                   Objects.equals(v2, rs[4].value));
2503 +        checkCompletedWithWrappedException(h5, rs[5].ex);
2504 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2505 +                   Objects.equals(v2, rs[5].value));
2506 +
2507          checkCompletedNormally(f, v1);
2508          checkCompletedNormally(g, v2);
2509 <        checkCompletedNormally(h, inc(v1));
2005 <        }
2006 <    }
2509 >    }}
2510  
2511 <    public void testApplyToEither_normalCompletion2() {
2511 >    /**
2512 >     * acceptEither result completes normally after normal completion
2513 >     * of either source
2514 >     */
2515 >    public void testAcceptEither_normalCompletion() {
2516          for (ExecutionMode m : ExecutionMode.values())
2517          for (Integer v1 : new Integer[] { 1, null })
2518 <        for (Integer v2 : new Integer[] { 2, null }) {
2519 <
2518 >        for (Integer v2 : new Integer[] { 2, null })
2519 >    {
2520          final CompletableFuture<Integer> f = new CompletableFuture<>();
2521          final CompletableFuture<Integer> g = new CompletableFuture<>();
2522 <        final IncFunction r = new IncFunction();
2523 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2522 >        final NoopConsumer[] rs = new NoopConsumer[6];
2523 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2524  
2525 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2526 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2527 +        checkIncomplete(h0);
2528 +        checkIncomplete(h1);
2529 +        rs[0].assertNotInvoked();
2530 +        rs[1].assertNotInvoked();
2531 +        f.complete(v1);
2532 +        checkCompletedNormally(h0, null);
2533 +        checkCompletedNormally(h1, null);
2534 +        rs[0].assertValue(v1);
2535 +        rs[1].assertValue(v1);
2536 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2537 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2538 +        checkCompletedNormally(h2, null);
2539 +        checkCompletedNormally(h3, null);
2540 +        rs[2].assertValue(v1);
2541 +        rs[3].assertValue(v1);
2542          g.complete(v2);
2019        checkCompletedNormally(h, inc(v2));
2020        f.complete(v1);
2543  
2544 <        checkCompletedNormally(f, v1);
2545 <        checkCompletedNormally(g, v2);
2546 <        checkCompletedNormally(h, inc(v2));
2547 <        }
2548 <    }
2549 <    public void testApplyToEither_normalCompletion3() {
2550 <        for (ExecutionMode m : ExecutionMode.values())
2551 <        for (Integer v1 : new Integer[] { 1, null })
2552 <        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);
2544 >        // unspecified behavior - both source completions available
2545 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2546 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2547 >        checkCompletedNormally(h4, null);
2548 >        checkCompletedNormally(h5, null);
2549 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2550 >                   Objects.equals(v2, rs[4].value));
2551 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2552 >                   Objects.equals(v2, rs[5].value));
2553  
2554          checkCompletedNormally(f, v1);
2555          checkCompletedNormally(g, v2);
2556 <
2557 <        // unspecified behavior
2558 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2559 <                   Objects.equals(h.join(), inc(v2)));
2560 <        assertEquals(1, r.invocationCount);
2561 <        }
2048 <    }
2556 >        checkCompletedNormally(h0, null);
2557 >        checkCompletedNormally(h1, null);
2558 >        checkCompletedNormally(h2, null);
2559 >        checkCompletedNormally(h3, null);
2560 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2561 >    }}
2562  
2563      /**
2564 <     * applyToEither result completes exceptionally after exceptional
2564 >     * acceptEither result completes exceptionally after exceptional
2565       * completion of either source
2566       */
2567 <    public void testApplyToEither_exceptionalCompletion1() {
2567 >    public void testAcceptEither_exceptionalCompletion() {
2568          for (ExecutionMode m : ExecutionMode.values())
2569 <        for (Integer v1 : new Integer[] { 1, null }) {
2570 <
2569 >        for (Integer v1 : new Integer[] { 1, null })
2570 >    {
2571          final CompletableFuture<Integer> f = new CompletableFuture<>();
2572          final CompletableFuture<Integer> g = new CompletableFuture<>();
2060        final IncFunction r = new IncFunction();
2061        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2573          final CFException ex = new CFException();
2574 +        final NoopConsumer[] rs = new NoopConsumer[6];
2575 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2576  
2577 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2578 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2579 +        checkIncomplete(h0);
2580 +        checkIncomplete(h1);
2581 +        rs[0].assertNotInvoked();
2582 +        rs[1].assertNotInvoked();
2583          f.completeExceptionally(ex);
2584 <        checkCompletedWithWrappedCFException(h, ex);
2584 >        checkCompletedWithWrappedException(h0, ex);
2585 >        checkCompletedWithWrappedException(h1, ex);
2586 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2587 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2588 >        checkCompletedWithWrappedException(h2, ex);
2589 >        checkCompletedWithWrappedException(h3, ex);
2590 >
2591          g.complete(v1);
2592  
2593 <        assertEquals(0, r.invocationCount);
2594 <        checkCompletedNormally(g, v1);
2595 <        checkCompletedWithWrappedCFException(f, ex);
2596 <        checkCompletedWithWrappedCFException(h, ex);
2593 >        // unspecified behavior - both source completions available
2594 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2595 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2596 >        try {
2597 >            assertNull(h4.join());
2598 >            rs[4].assertValue(v1);
2599 >        } catch (CompletionException ok) {
2600 >            checkCompletedWithWrappedException(h4, ex);
2601 >            rs[4].assertNotInvoked();
2602          }
2603 <    }
2604 <
2605 <    public void testApplyToEither_exceptionalCompletion2() {
2606 <        for (ExecutionMode m : ExecutionMode.values())
2607 <        for (Integer v1 : new Integer[] { 1, null }) {
2608 <
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);
2603 >        try {
2604 >            assertNull(h5.join());
2605 >            rs[5].assertValue(v1);
2606 >        } catch (CompletionException ok) {
2607 >            checkCompletedWithWrappedException(h5, ex);
2608 >            rs[5].assertNotInvoked();
2609          }
2094    }
2610  
2611 <    public void testApplyToEither_exceptionalCompletion3() {
2612 <        for (ExecutionMode m : ExecutionMode.values())
2613 <        for (Integer v1 : new Integer[] { 1, null }) {
2611 >        checkCompletedExceptionally(f, ex);
2612 >        checkCompletedNormally(g, v1);
2613 >        checkCompletedWithWrappedException(h0, ex);
2614 >        checkCompletedWithWrappedException(h1, ex);
2615 >        checkCompletedWithWrappedException(h2, ex);
2616 >        checkCompletedWithWrappedException(h3, ex);
2617 >        checkCompletedWithWrappedException(h4, ex);
2618 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2619 >    }}
2620  
2621 +    public void testAcceptEither_exceptionalCompletion2() {
2622 +        for (ExecutionMode m : ExecutionMode.values())
2623 +        for (boolean fFirst : new boolean[] { true, false })
2624 +        for (Integer v1 : new Integer[] { 1, null })
2625 +    {
2626          final CompletableFuture<Integer> f = new CompletableFuture<>();
2627          final CompletableFuture<Integer> g = new CompletableFuture<>();
2102        final IncFunction r = new IncFunction();
2628          final CFException ex = new CFException();
2629 +        final NoopConsumer[] rs = new NoopConsumer[6];
2630 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2631  
2632 <        g.completeExceptionally(ex);
2633 <        f.complete(v1);
2634 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2632 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2633 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2634 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2635 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2636 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2637 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2638  
2639 <        // unspecified behavior
2110 <        Integer v;
2639 >        // unspecified behavior - both source completions available
2640          try {
2641 <            assertEquals(inc(v1), h.join());
2642 <            assertEquals(1, r.invocationCount);
2641 >            assertNull(h0.join());
2642 >            rs[0].assertValue(v1);
2643          } catch (CompletionException ok) {
2644 <            checkCompletedWithWrappedCFException(h, ex);
2645 <            assertEquals(0, r.invocationCount);
2644 >            checkCompletedWithWrappedException(h0, ex);
2645 >            rs[0].assertNotInvoked();
2646 >        }
2647 >        try {
2648 >            assertNull(h1.join());
2649 >            rs[1].assertValue(v1);
2650 >        } catch (CompletionException ok) {
2651 >            checkCompletedWithWrappedException(h1, ex);
2652 >            rs[1].assertNotInvoked();
2653 >        }
2654 >        try {
2655 >            assertNull(h2.join());
2656 >            rs[2].assertValue(v1);
2657 >        } catch (CompletionException ok) {
2658 >            checkCompletedWithWrappedException(h2, ex);
2659 >            rs[2].assertNotInvoked();
2660 >        }
2661 >        try {
2662 >            assertNull(h3.join());
2663 >            rs[3].assertValue(v1);
2664 >        } catch (CompletionException ok) {
2665 >            checkCompletedWithWrappedException(h3, ex);
2666 >            rs[3].assertNotInvoked();
2667          }
2668  
2119        checkCompletedWithWrappedCFException(g, ex);
2669          checkCompletedNormally(f, v1);
2670 <        }
2671 <    }
2670 >        checkCompletedExceptionally(g, ex);
2671 >    }}
2672  
2673 <    public void testApplyToEither_exceptionalCompletion4() {
2673 >    /**
2674 >     * acceptEither result completes exceptionally if either source cancelled
2675 >     */
2676 >    public void testAcceptEither_sourceCancelled() {
2677          for (ExecutionMode m : ExecutionMode.values())
2678 <        for (Integer v1 : new Integer[] { 1, null }) {
2679 <
2678 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2679 >        for (Integer v1 : new Integer[] { 1, null })
2680 >    {
2681          final CompletableFuture<Integer> f = new CompletableFuture<>();
2682          final CompletableFuture<Integer> g = new CompletableFuture<>();
2683 <        final IncFunction r = new IncFunction();
2684 <        final CFException ex = new CFException();
2683 >        final NoopConsumer[] rs = new NoopConsumer[6];
2684 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2685 >
2686 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2687 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2688 >        checkIncomplete(h0);
2689 >        checkIncomplete(h1);
2690 >        rs[0].assertNotInvoked();
2691 >        rs[1].assertNotInvoked();
2692 >        f.cancel(mayInterruptIfRunning);
2693 >        checkCompletedWithWrappedCancellationException(h0);
2694 >        checkCompletedWithWrappedCancellationException(h1);
2695 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2696 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2697 >        checkCompletedWithWrappedCancellationException(h2);
2698 >        checkCompletedWithWrappedCancellationException(h3);
2699  
2133        f.completeExceptionally(ex);
2700          g.complete(v1);
2135        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2701  
2702 <        // unspecified behavior
2703 <        Integer v;
2702 >        // unspecified behavior - both source completions available
2703 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2704 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2705          try {
2706 <            assertEquals(inc(v1), h.join());
2707 <            assertEquals(1, r.invocationCount);
2706 >            assertNull(h4.join());
2707 >            rs[4].assertValue(v1);
2708          } catch (CompletionException ok) {
2709 <            checkCompletedWithWrappedCFException(h, ex);
2710 <            assertEquals(0, r.invocationCount);
2709 >            checkCompletedWithWrappedCancellationException(h4);
2710 >            rs[4].assertNotInvoked();
2711 >        }
2712 >        try {
2713 >            assertNull(h5.join());
2714 >            rs[5].assertValue(v1);
2715 >        } catch (CompletionException ok) {
2716 >            checkCompletedWithWrappedCancellationException(h5);
2717 >            rs[5].assertNotInvoked();
2718          }
2719  
2720 <        checkCompletedWithWrappedCFException(f, ex);
2720 >        checkCancelled(f);
2721          checkCompletedNormally(g, v1);
2722 <        }
2723 <    }
2722 >        checkCompletedWithWrappedCancellationException(h0);
2723 >        checkCompletedWithWrappedCancellationException(h1);
2724 >        checkCompletedWithWrappedCancellationException(h2);
2725 >        checkCompletedWithWrappedCancellationException(h3);
2726 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2727 >    }}
2728  
2729      /**
2730 <     * applyToEither result completes exceptionally if action does
2730 >     * acceptEither result completes exceptionally if action does
2731       */
2732 <    public void testApplyToEither_actionFailed1() {
2732 >    public void testAcceptEither_actionFailed() {
2733          for (ExecutionMode m : ExecutionMode.values())
2734          for (Integer v1 : new Integer[] { 1, null })
2735 <        for (Integer v2 : new Integer[] { 2, null }) {
2736 <
2735 >        for (Integer v2 : new Integer[] { 2, null })
2736 >    {
2737          final CompletableFuture<Integer> f = new CompletableFuture<>();
2738          final CompletableFuture<Integer> g = new CompletableFuture<>();
2739 <        final FailingFunction r = new FailingFunction();
2740 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2739 >        final FailingConsumer[] rs = new FailingConsumer[6];
2740 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2741  
2742 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2743 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2744          f.complete(v1);
2745 <        checkCompletedWithWrappedCFException(h);
2745 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2746 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2747 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2748 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2749 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2750 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2751 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2752 >
2753          g.complete(v2);
2754 +
2755 +        // unspecified behavior - both source completions available
2756 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2757 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2758 +
2759 +        checkCompletedWithWrappedException(h4, rs[4].ex);
2760 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2761 +                   Objects.equals(v2, rs[4].value));
2762 +        checkCompletedWithWrappedException(h5, rs[5].ex);
2763 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2764 +                   Objects.equals(v2, rs[5].value));
2765 +
2766          checkCompletedNormally(f, v1);
2767          checkCompletedNormally(g, v2);
2768 <        }
2171 <    }
2768 >    }}
2769  
2770 <    public void testApplyToEither_actionFailed2() {
2770 >    /**
2771 >     * runAfterEither result completes normally after normal completion
2772 >     * of either source
2773 >     */
2774 >    public void testRunAfterEither_normalCompletion() {
2775          for (ExecutionMode m : ExecutionMode.values())
2776          for (Integer v1 : new Integer[] { 1, null })
2777 <        for (Integer v2 : new Integer[] { 2, null }) {
2778 <
2777 >        for (Integer v2 : new Integer[] { 2, null })
2778 >        for (boolean pushNop : new boolean[] { true, false })
2779 >    {
2780          final CompletableFuture<Integer> f = new CompletableFuture<>();
2781          final CompletableFuture<Integer> g = new CompletableFuture<>();
2782 <        final FailingFunction r = new FailingFunction();
2783 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2782 >        final Noop[] rs = new Noop[6];
2783 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2784 >
2785 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2786 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2787 >        checkIncomplete(h0);
2788 >        checkIncomplete(h1);
2789 >        rs[0].assertNotInvoked();
2790 >        rs[1].assertNotInvoked();
2791 >        if (pushNop) {          // ad hoc test of intra-completion interference
2792 >            m.thenRun(f, () -> {});
2793 >            m.thenRun(g, () -> {});
2794 >        }
2795 >        f.complete(v1);
2796 >        checkCompletedNormally(h0, null);
2797 >        checkCompletedNormally(h1, null);
2798 >        rs[0].assertInvoked();
2799 >        rs[1].assertInvoked();
2800 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2801 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2802 >        checkCompletedNormally(h2, null);
2803 >        checkCompletedNormally(h3, null);
2804 >        rs[2].assertInvoked();
2805 >        rs[3].assertInvoked();
2806  
2807          g.complete(v2);
2808 <        checkCompletedWithWrappedCFException(h);
2809 <        f.complete(v1);
2808 >
2809 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2810 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2811 >
2812          checkCompletedNormally(f, v1);
2813          checkCompletedNormally(g, v2);
2814 <        }
2815 <    }
2814 >        checkCompletedNormally(h0, null);
2815 >        checkCompletedNormally(h1, null);
2816 >        checkCompletedNormally(h2, null);
2817 >        checkCompletedNormally(h3, null);
2818 >        checkCompletedNormally(h4, null);
2819 >        checkCompletedNormally(h5, null);
2820 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2821 >    }}
2822  
2823      /**
2824 <     * applyToEither result completes exceptionally if either source cancelled
2824 >     * runAfterEither result completes exceptionally after exceptional
2825 >     * completion of either source
2826       */
2827 <    public void testApplyToEither_sourceCancelled1() {
2827 >    public void testRunAfterEither_exceptionalCompletion() {
2828          for (ExecutionMode m : ExecutionMode.values())
2829 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2830 <        for (Integer v1 : new Integer[] { 1, null }) {
2198 <
2829 >        for (Integer v1 : new Integer[] { 1, null })
2830 >    {
2831          final CompletableFuture<Integer> f = new CompletableFuture<>();
2832          final CompletableFuture<Integer> g = new CompletableFuture<>();
2833 <        final IncFunction r = new IncFunction();
2834 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2833 >        final CFException ex = new CFException();
2834 >        final Noop[] rs = new Noop[6];
2835 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2836  
2837 <        assertTrue(f.cancel(mayInterruptIfRunning));
2838 <        checkCompletedWithWrappedCancellationException(h);
2839 <        g.complete(v1);
2837 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2838 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2839 >        checkIncomplete(h0);
2840 >        checkIncomplete(h1);
2841 >        rs[0].assertNotInvoked();
2842 >        rs[1].assertNotInvoked();
2843 >        assertTrue(f.completeExceptionally(ex));
2844 >        checkCompletedWithWrappedException(h0, ex);
2845 >        checkCompletedWithWrappedException(h1, ex);
2846 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2847 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2848 >        checkCompletedWithWrappedException(h2, ex);
2849 >        checkCompletedWithWrappedException(h3, ex);
2850 >
2851 >        assertTrue(g.complete(v1));
2852 >
2853 >        // unspecified behavior - both source completions available
2854 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2855 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2856 >        try {
2857 >            assertNull(h4.join());
2858 >            rs[4].assertInvoked();
2859 >        } catch (CompletionException ok) {
2860 >            checkCompletedWithWrappedException(h4, ex);
2861 >            rs[4].assertNotInvoked();
2862 >        }
2863 >        try {
2864 >            assertNull(h5.join());
2865 >            rs[5].assertInvoked();
2866 >        } catch (CompletionException ok) {
2867 >            checkCompletedWithWrappedException(h5, ex);
2868 >            rs[5].assertNotInvoked();
2869 >        }
2870  
2871 <        checkCancelled(f);
2209 <        assertEquals(0, r.invocationCount);
2871 >        checkCompletedExceptionally(f, ex);
2872          checkCompletedNormally(g, v1);
2873 <        checkCompletedWithWrappedCancellationException(h);
2874 <        }
2875 <    }
2873 >        checkCompletedWithWrappedException(h0, ex);
2874 >        checkCompletedWithWrappedException(h1, ex);
2875 >        checkCompletedWithWrappedException(h2, ex);
2876 >        checkCompletedWithWrappedException(h3, ex);
2877 >        checkCompletedWithWrappedException(h4, ex);
2878 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2879 >    }}
2880  
2881 <    public void testApplyToEither_sourceCancelled2() {
2881 >    public void testRunAfterEither_exceptionalCompletion2() {
2882          for (ExecutionMode m : ExecutionMode.values())
2883 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2884 <        for (Integer v1 : new Integer[] { 1, null }) {
2885 <
2883 >        for (boolean fFirst : new boolean[] { true, false })
2884 >        for (Integer v1 : new Integer[] { 1, null })
2885 >    {
2886          final CompletableFuture<Integer> f = new CompletableFuture<>();
2887          final CompletableFuture<Integer> g = new CompletableFuture<>();
2888 <        final IncFunction r = new IncFunction();
2889 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2888 >        final CFException ex = new CFException();
2889 >        final Noop[] rs = new Noop[6];
2890 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2891  
2892 <        assertTrue(g.cancel(mayInterruptIfRunning));
2893 <        checkCompletedWithWrappedCancellationException(h);
2894 <        f.complete(v1);
2892 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2893 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2894 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2895 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2896 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2897 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2898  
2899 <        checkCancelled(g);
2900 <        assertEquals(0, r.invocationCount);
2901 <        checkCompletedNormally(f, v1);
2902 <        checkCompletedWithWrappedCancellationException(h);
2899 >        // unspecified behavior - both source completions available
2900 >        try {
2901 >            assertNull(h0.join());
2902 >            rs[0].assertInvoked();
2903 >        } catch (CompletionException ok) {
2904 >            checkCompletedWithWrappedException(h0, ex);
2905 >            rs[0].assertNotInvoked();
2906 >        }
2907 >        try {
2908 >            assertNull(h1.join());
2909 >            rs[1].assertInvoked();
2910 >        } catch (CompletionException ok) {
2911 >            checkCompletedWithWrappedException(h1, ex);
2912 >            rs[1].assertNotInvoked();
2913          }
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;
2914          try {
2915 <            assertEquals(inc(v1), h.join());
2916 <            assertEquals(1, r.invocationCount);
2915 >            assertNull(h2.join());
2916 >            rs[2].assertInvoked();
2917          } catch (CompletionException ok) {
2918 <            checkCompletedWithWrappedCancellationException(h);
2919 <            assertEquals(0, r.invocationCount);
2918 >            checkCompletedWithWrappedException(h2, ex);
2919 >            rs[2].assertNotInvoked();
2920 >        }
2921 >        try {
2922 >            assertNull(h3.join());
2923 >            rs[3].assertInvoked();
2924 >        } catch (CompletionException ok) {
2925 >            checkCompletedWithWrappedException(h3, ex);
2926 >            rs[3].assertNotInvoked();
2927          }
2928  
2259        checkCancelled(g);
2929          checkCompletedNormally(f, v1);
2930 <        }
2931 <    }
2930 >        checkCompletedExceptionally(g, ex);
2931 >    }}
2932  
2933 <    public void testApplyToEither_sourceCancelled4() {
2933 >    /**
2934 >     * runAfterEither result completes exceptionally if either source cancelled
2935 >     */
2936 >    public void testRunAfterEither_sourceCancelled() {
2937          for (ExecutionMode m : ExecutionMode.values())
2938          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2939 <        for (Integer v1 : new Integer[] { 1, null }) {
2940 <
2939 >        for (Integer v1 : new Integer[] { 1, null })
2940 >    {
2941          final CompletableFuture<Integer> f = new CompletableFuture<>();
2942          final CompletableFuture<Integer> g = new CompletableFuture<>();
2943 <        final IncFunction r = new IncFunction();
2943 >        final Noop[] rs = new Noop[6];
2944 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2945  
2946 <        assertTrue(f.cancel(mayInterruptIfRunning));
2947 <        g.complete(v1);
2948 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2949 <
2950 <        // unspecified behavior
2951 <        Integer v;
2946 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2947 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2948 >        checkIncomplete(h0);
2949 >        checkIncomplete(h1);
2950 >        rs[0].assertNotInvoked();
2951 >        rs[1].assertNotInvoked();
2952 >        f.cancel(mayInterruptIfRunning);
2953 >        checkCompletedWithWrappedCancellationException(h0);
2954 >        checkCompletedWithWrappedCancellationException(h1);
2955 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2956 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2957 >        checkCompletedWithWrappedCancellationException(h2);
2958 >        checkCompletedWithWrappedCancellationException(h3);
2959 >
2960 >        assertTrue(g.complete(v1));
2961 >
2962 >        // unspecified behavior - both source completions available
2963 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2964 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2965          try {
2966 <            assertEquals(inc(v1), h.join());
2967 <            assertEquals(1, r.invocationCount);
2966 >            assertNull(h4.join());
2967 >            rs[4].assertInvoked();
2968          } catch (CompletionException ok) {
2969 <            checkCompletedWithWrappedCancellationException(h);
2970 <            assertEquals(0, r.invocationCount);
2969 >            checkCompletedWithWrappedCancellationException(h4);
2970 >            rs[4].assertNotInvoked();
2971 >        }
2972 >        try {
2973 >            assertNull(h5.join());
2974 >            rs[5].assertInvoked();
2975 >        } catch (CompletionException ok) {
2976 >            checkCompletedWithWrappedCancellationException(h5);
2977 >            rs[5].assertNotInvoked();
2978          }
2979  
2980          checkCancelled(f);
2981          checkCompletedNormally(g, v1);
2982 <        }
2983 <    }
2982 >        checkCompletedWithWrappedCancellationException(h0);
2983 >        checkCompletedWithWrappedCancellationException(h1);
2984 >        checkCompletedWithWrappedCancellationException(h2);
2985 >        checkCompletedWithWrappedCancellationException(h3);
2986 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2987 >    }}
2988  
2989      /**
2990 <     * acceptEither result completes normally after normal completion
2294 <     * of either source
2990 >     * runAfterEither result completes exceptionally if action does
2991       */
2992 <    public void testAcceptEither_normalCompletion1() {
2992 >    public void testRunAfterEither_actionFailed() {
2993          for (ExecutionMode m : ExecutionMode.values())
2994          for (Integer v1 : new Integer[] { 1, null })
2995 <        for (Integer v2 : new Integer[] { 2, null }) {
2996 <
2995 >        for (Integer v2 : new Integer[] { 2, null })
2996 >    {
2997          final CompletableFuture<Integer> f = new CompletableFuture<>();
2998          final CompletableFuture<Integer> g = new CompletableFuture<>();
2999 <        final IncAction r = new IncAction();
3000 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2999 >        final FailingRunnable[] rs = new FailingRunnable[6];
3000 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
3001  
3002 <        f.complete(v1);
3003 <        checkCompletedNormally(h, null);
3004 <        assertEquals(inc(v1), r.value);
3005 <        g.complete(v2);
3002 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3003 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3004 >        assertTrue(f.complete(v1));
3005 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
3006 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
3007 >        checkCompletedWithWrappedException(h0, rs[0].ex);
3008 >        checkCompletedWithWrappedException(h1, rs[1].ex);
3009 >        checkCompletedWithWrappedException(h2, rs[2].ex);
3010 >        checkCompletedWithWrappedException(h3, rs[3].ex);
3011 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
3012 >        assertTrue(g.complete(v2));
3013 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
3014 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
3015 >        checkCompletedWithWrappedException(h4, rs[4].ex);
3016 >        checkCompletedWithWrappedException(h5, rs[5].ex);
3017  
3018          checkCompletedNormally(f, v1);
3019          checkCompletedNormally(g, v2);
3020 <        checkCompletedNormally(h, null);
3021 <        }
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);
3020 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
3021 >    }}
3022  
3023 <        checkCompletedNormally(f, v1);
3024 <        checkCompletedNormally(g, v2);
3025 <        checkCompletedNormally(h, null);
3026 <        }
2336 <    }
2337 <    public void testAcceptEither_normalCompletion3() {
3023 >    /**
3024 >     * thenCompose result completes normally after normal completion of source
3025 >     */
3026 >    public void testThenCompose_normalCompletion() {
3027          for (ExecutionMode m : ExecutionMode.values())
3028 +        for (boolean createIncomplete : new boolean[] { true, false })
3029          for (Integer v1 : new Integer[] { 1, null })
3030 <        for (Integer v2 : new Integer[] { 2, null }) {
2341 <
3030 >    {
3031          final CompletableFuture<Integer> f = new CompletableFuture<>();
3032 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3033 <        final IncAction r = new IncAction();
3034 <
3035 <        f.complete(v1);
2347 <        g.complete(v2);
2348 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
3032 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3033 >        if (!createIncomplete) assertTrue(f.complete(v1));
3034 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3035 >        if (createIncomplete) assertTrue(f.complete(v1));
3036  
3037 <        checkCompletedNormally(h, null);
3037 >        checkCompletedNormally(g, inc(v1));
3038          checkCompletedNormally(f, v1);
3039 <        checkCompletedNormally(g, v2);
3040 <
2354 <        // unspecified behavior
2355 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2356 <                   Objects.equals(r.value, inc(v2)));
2357 <        }
2358 <    }
3039 >        r.assertValue(v1);
3040 >    }}
3041  
3042      /**
3043 <     * acceptEither result completes exceptionally after exceptional
3044 <     * completion of either source
3043 >     * thenCompose result completes exceptionally after exceptional
3044 >     * completion of source
3045       */
3046 <    public void testAcceptEither_exceptionalCompletion1() {
3046 >    public void testThenCompose_exceptionalCompletion() {
3047          for (ExecutionMode m : ExecutionMode.values())
3048 <        for (Integer v1 : new Integer[] { 1, null }) {
3049 <
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);
3048 >        for (boolean createIncomplete : new boolean[] { true, false })
3049 >    {
3050          final CFException ex = new CFException();
3051 <
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 <
3051 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3052          final CompletableFuture<Integer> f = new CompletableFuture<>();
3053 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3054 <        final IncAction r = new IncAction();
3055 <        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);
3053 >        if (!createIncomplete) f.completeExceptionally(ex);
3054 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3055 >        if (createIncomplete) f.completeExceptionally(ex);
3056  
3057 <        assertEquals(0, r.invocationCount);
3058 <        checkCompletedNormally(f, v1);
3059 <        checkCompletedWithWrappedCFException(g, ex);
3060 <        checkCompletedWithWrappedCFException(h, ex);
2403 <        }
2404 <    }
3057 >        checkCompletedWithWrappedException(g, ex);
3058 >        checkCompletedExceptionally(f, ex);
3059 >        r.assertNotInvoked();
3060 >    }}
3061  
3062 <    public void testAcceptEither_exceptionalCompletion3() {
3062 >    /**
3063 >     * thenCompose result completes exceptionally if action does
3064 >     */
3065 >    public void testThenCompose_actionFailed() {
3066          for (ExecutionMode m : ExecutionMode.values())
3067 <        for (Integer v1 : new Integer[] { 1, null }) {
3068 <
3067 >        for (boolean createIncomplete : new boolean[] { true, false })
3068 >        for (Integer v1 : new Integer[] { 1, null })
3069 >    {
3070          final CompletableFuture<Integer> f = new CompletableFuture<>();
3071 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3072 <        final IncAction r = new IncAction();
3073 <        final CFException ex = new CFException();
3074 <
3075 <        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 <        }
3071 >        final FailingCompletableFutureFunction r
3072 >            = new FailingCompletableFutureFunction(m);
3073 >        if (!createIncomplete) assertTrue(f.complete(v1));
3074 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3075 >        if (createIncomplete) assertTrue(f.complete(v1));
3076  
3077 <        checkCompletedWithWrappedCFException(g, ex);
3077 >        checkCompletedWithWrappedException(g, r.ex);
3078          checkCompletedNormally(f, v1);
3079 <        }
2433 <    }
3079 >    }}
3080  
3081 <    public void testAcceptEither_exceptionalCompletion4() {
3081 >    /**
3082 >     * thenCompose result completes exceptionally if source cancelled
3083 >     */
3084 >    public void testThenCompose_sourceCancelled() {
3085          for (ExecutionMode m : ExecutionMode.values())
3086 <        for (Integer v1 : new Integer[] { 1, null }) {
3087 <
3086 >        for (boolean createIncomplete : new boolean[] { true, false })
3087 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3088 >    {
3089          final CompletableFuture<Integer> f = new CompletableFuture<>();
3090 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3091 <        final IncAction r = new IncAction();
3092 <        final CFException ex = new CFException();
3093 <
3094 <        f.completeExceptionally(ex);
3095 <        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);
3090 >        final CompletableFutureInc r = new CompletableFutureInc(m);
3091 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3092 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3093 >        if (createIncomplete) {
3094 >            checkIncomplete(g);
3095 >            assertTrue(f.cancel(mayInterruptIfRunning));
3096          }
3097  
3098 <        checkCompletedWithWrappedCFException(f, ex);
3099 <        checkCompletedNormally(g, v1);
3100 <        }
2462 <    }
3098 >        checkCompletedWithWrappedCancellationException(g);
3099 >        checkCancelled(f);
3100 >    }}
3101  
3102      /**
3103 <     * acceptEither result completes exceptionally if action does
3103 >     * thenCompose result completes exceptionally if the result of the action does
3104       */
3105 <    public void testAcceptEither_actionFailed1() {
3105 >    public void testThenCompose_actionReturnsFailingFuture() {
3106          for (ExecutionMode m : ExecutionMode.values())
3107 +        for (int order = 0; order < 6; order++)
3108          for (Integer v1 : new Integer[] { 1, null })
3109 <        for (Integer v2 : new Integer[] { 2, null }) {
3110 <
3109 >    {
3110 >        final CFException ex = new CFException();
3111          final CompletableFuture<Integer> f = new CompletableFuture<>();
3112          final CompletableFuture<Integer> g = new CompletableFuture<>();
3113 <        final FailingConsumer r = new FailingConsumer();
3114 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
3113 >        final CompletableFuture<Integer> h;
3114 >        // Test all permutations of orders
3115 >        switch (order) {
3116 >        case 0:
3117 >            assertTrue(f.complete(v1));
3118 >            assertTrue(g.completeExceptionally(ex));
3119 >            h = m.thenCompose(f, (x -> g));
3120 >            break;
3121 >        case 1:
3122 >            assertTrue(f.complete(v1));
3123 >            h = m.thenCompose(f, (x -> g));
3124 >            assertTrue(g.completeExceptionally(ex));
3125 >            break;
3126 >        case 2:
3127 >            assertTrue(g.completeExceptionally(ex));
3128 >            assertTrue(f.complete(v1));
3129 >            h = m.thenCompose(f, (x -> g));
3130 >            break;
3131 >        case 3:
3132 >            assertTrue(g.completeExceptionally(ex));
3133 >            h = m.thenCompose(f, (x -> g));
3134 >            assertTrue(f.complete(v1));
3135 >            break;
3136 >        case 4:
3137 >            h = m.thenCompose(f, (x -> g));
3138 >            assertTrue(f.complete(v1));
3139 >            assertTrue(g.completeExceptionally(ex));
3140 >            break;
3141 >        case 5:
3142 >            h = m.thenCompose(f, (x -> g));
3143 >            assertTrue(f.complete(v1));
3144 >            assertTrue(g.completeExceptionally(ex));
3145 >            break;
3146 >        default: throw new AssertionError();
3147 >        }
3148  
3149 <        f.complete(v1);
3150 <        checkCompletedWithWrappedCFException(h);
2479 <        g.complete(v2);
3149 >        checkCompletedExceptionally(g, ex);
3150 >        checkCompletedWithWrappedException(h, ex);
3151          checkCompletedNormally(f, v1);
3152 <        checkCompletedNormally(g, v2);
2482 <        }
2483 <    }
3152 >    }}
3153  
3154 <    public void testAcceptEither_actionFailed2() {
3154 >    /**
3155 >     * exceptionallyCompose result completes normally after normal
3156 >     * completion of source
3157 >     */
3158 >    public void testExceptionallyCompose_normalCompletion() {
3159          for (ExecutionMode m : ExecutionMode.values())
3160 +        for (boolean createIncomplete : new boolean[] { true, false })
3161          for (Integer v1 : new Integer[] { 1, null })
3162 <        for (Integer v2 : new Integer[] { 2, null }) {
2489 <
3162 >    {
3163          final CompletableFuture<Integer> f = new CompletableFuture<>();
3164 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3165 <        final FailingConsumer r = new FailingConsumer();
3166 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
3164 >        final ExceptionalCompletableFutureFunction r =
3165 >            new ExceptionalCompletableFutureFunction(m);
3166 >        if (!createIncomplete) assertTrue(f.complete(v1));
3167 >        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3168 >        if (createIncomplete) assertTrue(f.complete(v1));
3169  
2495        g.complete(v2);
2496        checkCompletedWithWrappedCFException(h);
2497        f.complete(v1);
3170          checkCompletedNormally(f, v1);
3171 <        checkCompletedNormally(g, v2);
3172 <        }
3173 <    }
3171 >        checkCompletedNormally(g, v1);
3172 >        r.assertNotInvoked();
3173 >    }}
3174  
3175      /**
3176 <     * acceptEither result completes exceptionally if either source cancelled
3176 >     * exceptionallyCompose result completes normally after exceptional
3177 >     * completion of source
3178       */
3179 <    public void testAcceptEither_sourceCancelled1() {
3179 >    public void testExceptionallyCompose_exceptionalCompletion() {
3180          for (ExecutionMode m : ExecutionMode.values())
3181 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3182 <        for (Integer v1 : new Integer[] { 1, null }) {
3183 <
3181 >        for (boolean createIncomplete : new boolean[] { true, false })
3182 >    {
3183 >        final CFException ex = new CFException();
3184 >        final ExceptionalCompletableFutureFunction r =
3185 >            new ExceptionalCompletableFutureFunction(m);
3186          final CompletableFuture<Integer> f = new CompletableFuture<>();
3187 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3188 <        final IncAction r = new IncAction();
3189 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2515 <
2516 <        assertTrue(f.cancel(mayInterruptIfRunning));
2517 <        checkCompletedWithWrappedCancellationException(h);
2518 <        g.complete(v1);
3187 >        if (!createIncomplete) f.completeExceptionally(ex);
3188 >        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3189 >        if (createIncomplete) f.completeExceptionally(ex);
3190  
3191 <        checkCancelled(f);
3192 <        assertEquals(0, r.invocationCount);
3193 <        checkCompletedNormally(g, v1);
3194 <        checkCompletedWithWrappedCancellationException(h);
2524 <        }
2525 <    }
3191 >        checkCompletedExceptionally(f, ex);
3192 >        checkCompletedNormally(g, r.value);
3193 >        r.assertInvoked();
3194 >    }}
3195  
3196 <    public void testAcceptEither_sourceCancelled2() {
3196 >    /**
3197 >     * exceptionallyCompose completes exceptionally on exception if action does
3198 >     */
3199 >    public void testExceptionallyCompose_actionFailed() {
3200          for (ExecutionMode m : ExecutionMode.values())
3201 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3202 <        for (Integer v1 : new Integer[] { 1, null }) {
3203 <
3201 >        for (boolean createIncomplete : new boolean[] { true, false })
3202 >    {
3203 >        final CFException ex = new CFException();
3204          final CompletableFuture<Integer> f = new CompletableFuture<>();
3205 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3206 <        final IncAction r = new IncAction();
3207 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
3208 <
3209 <        assertTrue(g.cancel(mayInterruptIfRunning));
2538 <        checkCompletedWithWrappedCancellationException(h);
2539 <        f.complete(v1);
3205 >        final FailingExceptionalCompletableFutureFunction r
3206 >            = new FailingExceptionalCompletableFutureFunction(m);
3207 >        if (!createIncomplete) f.completeExceptionally(ex);
3208 >        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3209 >        if (createIncomplete) f.completeExceptionally(ex);
3210  
3211 <        checkCancelled(g);
3212 <        assertEquals(0, r.invocationCount);
3213 <        checkCompletedNormally(f, v1);
3214 <        checkCompletedWithWrappedCancellationException(h);
2545 <        }
2546 <    }
3211 >        checkCompletedExceptionally(f, ex);
3212 >        checkCompletedWithWrappedException(g, r.ex);
3213 >        r.assertInvoked();
3214 >    }}
3215  
3216 <    public void testAcceptEither_sourceCancelled3() {
3216 >    /**
3217 >     * exceptionallyCompose result completes exceptionally if the
3218 >     * result of the action does
3219 >     */
3220 >    public void testExceptionallyCompose_actionReturnsFailingFuture() {
3221          for (ExecutionMode m : ExecutionMode.values())
3222 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3223 <        for (Integer v1 : new Integer[] { 1, null }) {
3224 <
3222 >        for (int order = 0; order < 6; order++)
3223 >    {
3224 >        final CFException ex0 = new CFException();
3225 >        final CFException ex = new CFException();
3226          final CompletableFuture<Integer> f = new CompletableFuture<>();
3227          final CompletableFuture<Integer> g = new CompletableFuture<>();
3228 <        final IncAction r = new IncAction();
3228 >        final CompletableFuture<Integer> h;
3229 >        // Test all permutations of orders
3230 >        switch (order) {
3231 >        case 0:
3232 >            assertTrue(f.completeExceptionally(ex0));
3233 >            assertTrue(g.completeExceptionally(ex));
3234 >            h = m.exceptionallyCompose(f, (x -> g));
3235 >            break;
3236 >        case 1:
3237 >            assertTrue(f.completeExceptionally(ex0));
3238 >            h = m.exceptionallyCompose(f, (x -> g));
3239 >            assertTrue(g.completeExceptionally(ex));
3240 >            break;
3241 >        case 2:
3242 >            assertTrue(g.completeExceptionally(ex));
3243 >            assertTrue(f.completeExceptionally(ex0));
3244 >            h = m.exceptionallyCompose(f, (x -> g));
3245 >            break;
3246 >        case 3:
3247 >            assertTrue(g.completeExceptionally(ex));
3248 >            h = m.exceptionallyCompose(f, (x -> g));
3249 >            assertTrue(f.completeExceptionally(ex0));
3250 >            break;
3251 >        case 4:
3252 >            h = m.exceptionallyCompose(f, (x -> g));
3253 >            assertTrue(f.completeExceptionally(ex0));
3254 >            assertTrue(g.completeExceptionally(ex));
3255 >            break;
3256 >        case 5:
3257 >            h = m.exceptionallyCompose(f, (x -> g));
3258 >            assertTrue(f.completeExceptionally(ex0));
3259 >            assertTrue(g.completeExceptionally(ex));
3260 >            break;
3261 >        default: throw new AssertionError();
3262 >        }
3263 >
3264 >        checkCompletedExceptionally(g, ex);
3265 >        checkCompletedWithWrappedException(h, ex);
3266 >        checkCompletedExceptionally(f, ex0);
3267 >    }}
3268  
3269 <        assertTrue(g.cancel(mayInterruptIfRunning));
2558 <        f.complete(v1);
2559 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
3269 >    // other static methods
3270  
3271 <        // unspecified behavior
3272 <        Integer v;
3273 <        try {
3274 <            assertNull(h.join());
3275 <            assertEquals(1, r.invocationCount);
3276 <            assertEquals(inc(v1), r.value);
3277 <        } catch (CompletionException ok) {
3278 <            checkCompletedWithWrappedCancellationException(h);
2569 <            assertEquals(0, r.invocationCount);
2570 <        }
3271 >    /**
3272 >     * allOf(no component futures) returns a future completed normally
3273 >     * with the value null
3274 >     */
3275 >    public void testAllOf_empty() throws Exception {
3276 >        CompletableFuture<Void> f = CompletableFuture.allOf();
3277 >        checkCompletedNormally(f, null);
3278 >    }
3279  
3280 <        checkCancelled(g);
3281 <        checkCompletedNormally(f, v1);
3280 >    /**
3281 >     * allOf returns a future completed normally with the value null
3282 >     * when all components complete normally
3283 >     */
3284 >    public void testAllOf_normal() throws Exception {
3285 >        for (int k = 1; k < 10; k++) {
3286 >            CompletableFuture<Integer>[] fs
3287 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3288 >            for (int i = 0; i < k; i++)
3289 >                fs[i] = new CompletableFuture<>();
3290 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3291 >            for (int i = 0; i < k; i++) {
3292 >                checkIncomplete(f);
3293 >                checkIncomplete(CompletableFuture.allOf(fs));
3294 >                fs[i].complete(one);
3295 >            }
3296 >            checkCompletedNormally(f, null);
3297 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3298          }
3299      }
3300  
3301 <    public void testAcceptEither_sourceCancelled4() {
3302 <        for (ExecutionMode m : ExecutionMode.values())
3303 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3304 <        for (Integer v1 : new Integer[] { 1, null }) {
3305 <
3306 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3307 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3308 <        final IncAction r = new IncAction();
3309 <
3310 <        assertTrue(f.cancel(mayInterruptIfRunning));
3311 <        g.complete(v1);
3312 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
3313 <
3314 <        // 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);
3301 >    public void testAllOf_normal_backwards() throws Exception {
3302 >        for (int k = 1; k < 10; k++) {
3303 >            CompletableFuture<Integer>[] fs
3304 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3305 >            for (int i = 0; i < k; i++)
3306 >                fs[i] = new CompletableFuture<>();
3307 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3308 >            for (int i = k - 1; i >= 0; i--) {
3309 >                checkIncomplete(f);
3310 >                checkIncomplete(CompletableFuture.allOf(fs));
3311 >                fs[i].complete(one);
3312 >            }
3313 >            checkCompletedNormally(f, null);
3314 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3315          }
3316 +    }
3317  
3318 <        checkCancelled(f);
3319 <        checkCompletedNormally(g, v1);
3318 >    public void testAllOf_exceptional() throws Exception {
3319 >        for (int k = 1; k < 10; k++) {
3320 >            CompletableFuture<Integer>[] fs
3321 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3322 >            CFException ex = new CFException();
3323 >            for (int i = 0; i < k; i++)
3324 >                fs[i] = new CompletableFuture<>();
3325 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3326 >            for (int i = 0; i < k; i++) {
3327 >                checkIncomplete(f);
3328 >                checkIncomplete(CompletableFuture.allOf(fs));
3329 >                if (i != k / 2) {
3330 >                    fs[i].complete(i);
3331 >                    checkCompletedNormally(fs[i], i);
3332 >                } else {
3333 >                    fs[i].completeExceptionally(ex);
3334 >                    checkCompletedExceptionally(fs[i], ex);
3335 >                }
3336 >            }
3337 >            checkCompletedWithWrappedException(f, ex);
3338 >            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3339          }
3340      }
3341  
3342      /**
3343 <     * runAfterEither result completes normally after normal completion
2608 <     * of either source
3343 >     * anyOf(no component futures) returns an incomplete future
3344       */
3345 <    public void testRunAfterEither_normalCompletion1() {
2611 <        for (ExecutionMode m : ExecutionMode.values())
3345 >    public void testAnyOf_empty() throws Exception {
3346          for (Integer v1 : new Integer[] { 1, null })
3347 <        for (Integer v2 : new Integer[] { 2, null }) {
3348 <
3349 <        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);
3347 >    {
3348 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
3349 >        checkIncomplete(f);
3350  
3351          f.complete(v1);
2621        checkCompletedNormally(h, null);
2622        assertEquals(1, r.invocationCount);
2623        g.complete(v2);
2624
3352          checkCompletedNormally(f, v1);
3353 <        checkCompletedNormally(g, v2);
3354 <        checkCompletedNormally(h, null);
3355 <        assertEquals(1, r.invocationCount);
3353 >    }}
3354 >
3355 >    /**
3356 >     * anyOf returns a future completed normally with a value when
3357 >     * a component future does
3358 >     */
3359 >    public void testAnyOf_normal() throws Exception {
3360 >        for (int k = 0; k < 10; k++) {
3361 >            CompletableFuture[] fs = new CompletableFuture[k];
3362 >            for (int i = 0; i < k; i++)
3363 >                fs[i] = new CompletableFuture<>();
3364 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3365 >            checkIncomplete(f);
3366 >            for (int i = 0; i < k; i++) {
3367 >                fs[i].complete(i);
3368 >                checkCompletedNormally(f, 0);
3369 >                int x = (int) CompletableFuture.anyOf(fs).join();
3370 >                assertTrue(0 <= x && x <= i);
3371 >            }
3372          }
3373      }
3374 <
3375 <    public void testRunAfterEither_normalCompletion2() {
3376 <        for (ExecutionMode m : ExecutionMode.values())
3377 <        for (Integer v1 : new Integer[] { 1, null })
3378 <        for (Integer v2 : new Integer[] { 2, null }) {
3379 <
3380 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3381 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3382 <        final Noop r = new Noop();
3383 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3384 <
3385 <        g.complete(v2);
3386 <        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);
3374 >    public void testAnyOf_normal_backwards() throws Exception {
3375 >        for (int k = 0; k < 10; k++) {
3376 >            CompletableFuture[] fs = new CompletableFuture[k];
3377 >            for (int i = 0; i < k; i++)
3378 >                fs[i] = new CompletableFuture<>();
3379 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3380 >            checkIncomplete(f);
3381 >            for (int i = k - 1; i >= 0; i--) {
3382 >                fs[i].complete(i);
3383 >                checkCompletedNormally(f, k - 1);
3384 >                int x = (int) CompletableFuture.anyOf(fs).join();
3385 >                assertTrue(i <= x && x <= k - 1);
3386 >            }
3387          }
3388      }
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 }) {
2657
2658        final CompletableFuture<Integer> f = new CompletableFuture<>();
2659        final CompletableFuture<Integer> g = new CompletableFuture<>();
2660        final Noop r = new Noop();
3389  
3390 <        f.complete(v1);
3391 <        g.complete(v2);
3392 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3390 >    /**
3391 >     * anyOf result completes exceptionally when any component does.
3392 >     */
3393 >    public void testAnyOf_exceptional() throws Exception {
3394 >        for (int k = 0; k < 10; k++) {
3395 >            CompletableFuture[] fs = new CompletableFuture[k];
3396 >            CFException[] exs = new CFException[k];
3397 >            for (int i = 0; i < k; i++) {
3398 >                fs[i] = new CompletableFuture<>();
3399 >                exs[i] = new CFException();
3400 >            }
3401 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3402 >            checkIncomplete(f);
3403 >            for (int i = 0; i < k; i++) {
3404 >                fs[i].completeExceptionally(exs[i]);
3405 >                checkCompletedWithWrappedException(f, exs[0]);
3406 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3407 >            }
3408 >        }
3409 >    }
3410  
3411 <        checkCompletedNormally(h, null);
3412 <        checkCompletedNormally(f, v1);
3413 <        checkCompletedNormally(g, v2);
3414 <        assertEquals(1, r.invocationCount);
3411 >    public void testAnyOf_exceptional_backwards() throws Exception {
3412 >        for (int k = 0; k < 10; k++) {
3413 >            CompletableFuture[] fs = new CompletableFuture[k];
3414 >            CFException[] exs = new CFException[k];
3415 >            for (int i = 0; i < k; i++) {
3416 >                fs[i] = new CompletableFuture<>();
3417 >                exs[i] = new CFException();
3418 >            }
3419 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3420 >            checkIncomplete(f);
3421 >            for (int i = k - 1; i >= 0; i--) {
3422 >                fs[i].completeExceptionally(exs[i]);
3423 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3424 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3425 >            }
3426          }
3427      }
3428  
3429      /**
3430 <     * runAfterEither result completes exceptionally after exceptional
2675 <     * completion of either source
3430 >     * Completion methods throw NullPointerException with null arguments
3431       */
3432 <    public void testRunAfterEither_exceptionalCompletion1() {
3433 <        for (ExecutionMode m : ExecutionMode.values())
3434 <        for (Integer v1 : new Integer[] { 1, null }) {
3435 <
3436 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3437 <        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();
3432 >    @SuppressWarnings("FutureReturnValueIgnored")
3433 >    public void testNPE() {
3434 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3435 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3436 >        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3437 >        ThreadExecutor exec = new ThreadExecutor();
3438  
3439 <        f.completeExceptionally(ex);
3440 <        checkCompletedWithWrappedCFException(h, ex);
3441 <        g.complete(v1);
3439 >        Runnable[] throwingActions = {
3440 >            () -> CompletableFuture.supplyAsync(null),
3441 >            () -> CompletableFuture.supplyAsync(null, exec),
3442 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3443  
3444 <        assertEquals(0, r.invocationCount);
3445 <        checkCompletedNormally(g, v1);
3446 <        checkCompletedWithWrappedCFException(f, ex);
2694 <        checkCompletedWithWrappedCFException(h, ex);
2695 <        }
2696 <    }
3444 >            () -> CompletableFuture.runAsync(null),
3445 >            () -> CompletableFuture.runAsync(null, exec),
3446 >            () -> CompletableFuture.runAsync(() -> {}, null),
3447  
3448 <    public void testRunAfterEither_exceptionalCompletion2() {
2699 <        for (ExecutionMode m : ExecutionMode.values())
2700 <        for (Integer v1 : new Integer[] { 1, null }) {
3448 >            () -> f.completeExceptionally(null),
3449  
3450 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3451 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3452 <        final Noop r = new Noop();
3453 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2706 <        final CFException ex = new CFException();
3450 >            () -> f.thenApply(null),
3451 >            () -> f.thenApplyAsync(null),
3452 >            () -> f.thenApplyAsync(x -> x, null),
3453 >            () -> f.thenApplyAsync(null, exec),
3454  
3455 <        g.completeExceptionally(ex);
3456 <        checkCompletedWithWrappedCFException(h, ex);
3457 <        f.complete(v1);
3455 >            () -> f.thenAccept(null),
3456 >            () -> f.thenAcceptAsync(null),
3457 >            () -> f.thenAcceptAsync(x -> {} , null),
3458 >            () -> f.thenAcceptAsync(null, exec),
3459  
3460 <        assertEquals(0, r.invocationCount);
3461 <        checkCompletedNormally(f, v1);
3462 <        checkCompletedWithWrappedCFException(g, ex);
3463 <        checkCompletedWithWrappedCFException(h, ex);
2716 <        }
2717 <    }
3460 >            () -> f.thenRun(null),
3461 >            () -> f.thenRunAsync(null),
3462 >            () -> f.thenRunAsync(() -> {} , null),
3463 >            () -> f.thenRunAsync(null, exec),
3464  
3465 <    public void testRunAfterEither_exceptionalCompletion3() {
3466 <        for (ExecutionMode m : ExecutionMode.values())
3467 <        for (Integer v1 : new Integer[] { 1, null }) {
3465 >            () -> f.thenCombine(g, null),
3466 >            () -> f.thenCombineAsync(g, null),
3467 >            () -> f.thenCombineAsync(g, null, exec),
3468 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3469 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3470 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3471 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3472  
3473 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3474 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3475 <        final Noop r = new Noop();
3476 <        final CFException ex = new CFException();
3473 >            () -> f.thenAcceptBoth(g, null),
3474 >            () -> f.thenAcceptBothAsync(g, null),
3475 >            () -> f.thenAcceptBothAsync(g, null, exec),
3476 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3477 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3478 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3479 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3480  
3481 <        g.completeExceptionally(ex);
3482 <        f.complete(v1);
3483 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3481 >            () -> f.runAfterBoth(g, null),
3482 >            () -> f.runAfterBothAsync(g, null),
3483 >            () -> f.runAfterBothAsync(g, null, exec),
3484 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3485 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3486 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3487 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3488  
3489 <        // unspecified behavior
3490 <        Integer v;
3491 <        try {
3492 <            assertNull(h.join());
3493 <            assertEquals(1, r.invocationCount);
3494 <        } catch (CompletionException ok) {
3495 <            checkCompletedWithWrappedCFException(h, ex);
2739 <            assertEquals(0, r.invocationCount);
2740 <        }
3489 >            () -> f.applyToEither(g, null),
3490 >            () -> f.applyToEitherAsync(g, null),
3491 >            () -> f.applyToEitherAsync(g, null, exec),
3492 >            () -> f.applyToEither(nullFuture, x -> x),
3493 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3494 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3495 >            () -> f.applyToEitherAsync(g, x -> x, null),
3496  
3497 <        checkCompletedWithWrappedCFException(g, ex);
3498 <        checkCompletedNormally(f, v1);
3499 <        }
3500 <    }
3497 >            () -> f.acceptEither(g, null),
3498 >            () -> f.acceptEitherAsync(g, null),
3499 >            () -> f.acceptEitherAsync(g, null, exec),
3500 >            () -> f.acceptEither(nullFuture, x -> {}),
3501 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3502 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3503 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3504  
3505 <    public void testRunAfterEither_exceptionalCompletion4() {
3506 <        for (ExecutionMode m : ExecutionMode.values())
3507 <        for (Integer v1 : new Integer[] { 1, null }) {
3505 >            () -> f.runAfterEither(g, null),
3506 >            () -> f.runAfterEitherAsync(g, null),
3507 >            () -> f.runAfterEitherAsync(g, null, exec),
3508 >            () -> f.runAfterEither(nullFuture, () -> {}),
3509 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3510 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3511 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3512  
3513 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3514 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3515 <        final Noop r = new Noop();
3516 <        final CFException ex = new CFException();
3513 >            () -> f.thenCompose(null),
3514 >            () -> f.thenComposeAsync(null),
3515 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3516 >            () -> f.thenComposeAsync(null, exec),
3517  
3518 <        f.completeExceptionally(ex);
2757 <        g.complete(v1);
2758 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3518 >            () -> f.exceptionally(null),
3519  
3520 <        // 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 <        }
3520 >            () -> f.handle(null),
3521  
3522 <        checkCompletedWithWrappedCFException(f, ex);
3523 <        checkCompletedNormally(g, v1);
3524 <        }
3525 <    }
3522 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3523 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3524 >            () -> CompletableFuture.allOf(f, null),
3525 >            () -> CompletableFuture.allOf(null, f),
3526  
3527 <    /**
3528 <     * runAfterEither result completes exceptionally if action does
3529 <     */
3530 <    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 }) {
3527 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3528 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3529 >            () -> CompletableFuture.anyOf(f, null),
3530 >            () -> CompletableFuture.anyOf(null, f),
3531  
3532 <        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);
3532 >            () -> f.obtrudeException(null),
3533  
3534 <        f.complete(v1);
3535 <        checkCompletedWithWrappedCFException(h);
3536 <        g.complete(v2);
2791 <        checkCompletedNormally(f, v1);
2792 <        checkCompletedNormally(g, v2);
2793 <        }
2794 <    }
3534 >            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3535 >            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3536 >            () -> CompletableFuture.delayedExecutor(1L, null),
3537  
3538 <    public void testRunAfterEither_actionFailed2() {
3539 <        for (ExecutionMode m : ExecutionMode.values())
2798 <        for (Integer v1 : new Integer[] { 1, null })
2799 <        for (Integer v2 : new Integer[] { 2, null }) {
3538 >            () -> f.orTimeout(1L, null),
3539 >            () -> f.completeOnTimeout(42, 1L, null),
3540  
3541 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3542 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3543 <        final FailingNoop r = new FailingNoop();
2804 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3541 >            () -> CompletableFuture.failedFuture(null),
3542 >            () -> CompletableFuture.failedStage(null),
3543 >        };
3544  
3545 <        g.complete(v2);
3546 <        checkCompletedWithWrappedCFException(h);
2808 <        f.complete(v1);
2809 <        checkCompletedNormally(f, v1);
2810 <        checkCompletedNormally(g, v2);
2811 <        }
3545 >        assertThrows(NullPointerException.class, throwingActions);
3546 >        assertEquals(0, exec.count.get());
3547      }
3548  
3549      /**
3550 <     * runAfterEither result completes exceptionally if either source cancelled
3550 >     * Test submissions to an executor that rejects all tasks.
3551       */
3552 <    public void testRunAfterEither_sourceCancelled1() {
3553 <        for (ExecutionMode m : ExecutionMode.values())
3554 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3555 <        for (Integer v1 : new Integer[] { 1, null }) {
3552 >    public void testRejectingExecutor() {
3553 >        for (Integer v : new Integer[] { 1, null })
3554 >    {
3555 >        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3556  
3557 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3558 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2824 <        final Noop r = new Noop();
2825 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3557 >        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3558 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3559  
3560 <        assertTrue(f.cancel(mayInterruptIfRunning));
2828 <        checkCompletedWithWrappedCancellationException(h);
2829 <        g.complete(v1);
3560 >        List<CompletableFuture<?>> futures = new ArrayList<>();
3561  
3562 <        checkCancelled(f);
3563 <        assertEquals(0, r.invocationCount);
3564 <        checkCompletedNormally(g, v1);
3565 <        checkCompletedWithWrappedCancellationException(h);
3562 >        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3563 >        srcs.add(complete);
3564 >        srcs.add(incomplete);
3565 >
3566 >        for (CompletableFuture<Integer> src : srcs) {
3567 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3568 >            fs.add(src.thenRunAsync(() -> {}, e));
3569 >            fs.add(src.thenAcceptAsync(z -> {}, e));
3570 >            fs.add(src.thenApplyAsync(z -> z, e));
3571 >
3572 >            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3573 >            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3574 >            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3575 >
3576 >            fs.add(src.applyToEitherAsync(src, z -> z, e));
3577 >            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3578 >            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3579 >
3580 >            fs.add(src.thenComposeAsync(z -> null, e));
3581 >            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3582 >            fs.add(src.handleAsync((z, t) -> null, e));
3583 >
3584 >            for (CompletableFuture<?> future : fs) {
3585 >                if (src.isDone())
3586 >                    checkCompletedWithWrappedException(future, e.ex);
3587 >                else
3588 >                    checkIncomplete(future);
3589 >            }
3590 >            futures.addAll(fs);
3591          }
2836    }
3592  
3593 <    public void testRunAfterEither_sourceCancelled2() {
3594 <        for (ExecutionMode m : ExecutionMode.values())
2840 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2841 <        for (Integer v1 : new Integer[] { 1, null }) {
3593 >        {
3594 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3595  
3596 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3597 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2845 <        final Noop r = new Noop();
2846 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3596 >            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3597 >            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3598  
3599 <        assertTrue(g.cancel(mayInterruptIfRunning));
3600 <        checkCompletedWithWrappedCancellationException(h);
2850 <        f.complete(v1);
3599 >            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3600 >            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3601  
3602 <        checkCancelled(g);
3603 <        assertEquals(0, r.invocationCount);
3604 <        checkCompletedNormally(f, v1);
3605 <        checkCompletedWithWrappedCancellationException(h);
3602 >            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3603 >            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3604 >
3605 >            for (CompletableFuture<?> future : fs)
3606 >                checkIncomplete(future);
3607 >            futures.addAll(fs);
3608          }
2857    }
3609  
3610 <    public void testRunAfterEither_sourceCancelled3() {
3611 <        for (ExecutionMode m : ExecutionMode.values())
2861 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2862 <        for (Integer v1 : new Integer[] { 1, null }) {
3610 >        {
3611 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3612  
3613 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3614 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2866 <        final Noop r = new Noop();
3613 >            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3614 >            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3615  
3616 <        assertTrue(g.cancel(mayInterruptIfRunning));
3617 <        f.complete(v1);
2870 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3616 >            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3617 >            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3618  
3619 <        // unspecified behavior
3620 <        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 <        }
3619 >            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3620 >            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3621  
3622 <        checkCancelled(g);
3623 <        checkCompletedNormally(f, v1);
3622 >            for (CompletableFuture<?> future : fs)
3623 >                checkCompletedWithWrappedException(future, e.ex);
3624 >            futures.addAll(fs);
3625          }
2885    }
3626  
3627 <    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 }) {
2891 <
2892 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2893 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2894 <        final Noop r = new Noop();
2895 <
2896 <        assertTrue(f.cancel(mayInterruptIfRunning));
2897 <        g.complete(v1);
2898 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3627 >        incomplete.complete(v);
3628  
3629 <        // unspecified behavior
3630 <        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 <        }
3629 >        for (CompletableFuture<?> future : futures)
3630 >            checkCompletedWithWrappedException(future, e.ex);
3631  
3632 <        checkCancelled(f);
3633 <        checkCompletedNormally(g, v1);
2912 <        }
2913 <    }
3632 >        assertEquals(futures.size(), e.count.get());
3633 >    }}
3634  
3635      /**
3636 <     * thenCompose result completes normally after normal completion of source
3636 >     * Test submissions to an executor that rejects all tasks, but
3637 >     * should never be invoked because the dependent future is
3638 >     * explicitly completed.
3639       */
3640 <    public void testThenCompose_normalCompletion1() {
3641 <        for (ExecutionMode m : ExecutionMode.values())
3642 <        for (Integer v1 : new Integer[] { 1, null }) {
3640 >    public void testRejectingExecutorNeverInvoked() {
3641 >        for (Integer v : new Integer[] { 1, null })
3642 >    {
3643 >        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3644  
3645 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3646 <        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 <    }
3645 >        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3646 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3647  
3648 <    public void testThenCompose_normalCompletion2() {
2933 <        for (ExecutionMode m : ExecutionMode.values())
2934 <        for (Integer v1 : new Integer[] { 1, null }) {
3648 >        List<CompletableFuture<?>> futures = new ArrayList<>();
3649  
3650 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3651 <        final CompletableFutureInc r = new CompletableFutureInc();
3652 <        f.complete(v1);
2939 <        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<Integer>> srcs = new ArrayList<>();
3651 >        srcs.add(complete);
3652 >        srcs.add(incomplete);
3653  
3654 <    /**
3655 <     * thenCompose result completes exceptionally after exceptional
3656 <     * completion of source
3657 <     */
2950 <    public void testThenCompose_exceptionalCompletion1() {
2951 <        for (ExecutionMode m : ExecutionMode.values()) {
3654 >        List<CompletableFuture<?>> fs = new ArrayList<>();
3655 >        fs.add(incomplete.thenRunAsync(() -> {}, e));
3656 >        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3657 >        fs.add(incomplete.thenApplyAsync(z -> z, 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.thenCombineAsync(incomplete, (x, y) -> x, e));
3660 >        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3661 >        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3662  
3663 <    public void testThenCompose_exceptionalCompletion2() {
3664 <        for (ExecutionMode m : ExecutionMode.values()) {
3663 >        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3664 >        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3665 >        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3666  
3667 <        final CFException ex = new CFException();
3668 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3669 <        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(incomplete.thenComposeAsync(z -> null, e));
3668 >        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3669 >        fs.add(incomplete.handleAsync((z, t) -> null, e));
3670  
3671 <    /**
3672 <     * 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 }) {
3671 >        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3672 >        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3673  
3674 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3675 <        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 <    }
3674 >        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3675 >        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3676  
3677 <    public void testThenCompose_actionFailed2() {
3678 <        for (ExecutionMode m : ExecutionMode.values())
2995 <        for (Integer v1 : new Integer[] { 1, null }) {
3677 >        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3678 >        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3679  
3680 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3681 <        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 <    }
3680 >        for (CompletableFuture<?> future : fs)
3681 >            checkIncomplete(future);
3682  
3683 <    /**
3684 <     * 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 }) {
3683 >        for (CompletableFuture<?> future : fs)
3684 >            future.complete(null);
3685  
3686 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3015 <        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 <    }
3686 >        incomplete.complete(v);
3687  
3688 <    public void testThenCompose_sourceCancelled2() {
3689 <        for (ExecutionMode m : ExecutionMode.values())
3025 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
3688 >        for (CompletableFuture<?> future : fs)
3689 >            checkCompletedNormally(future, null);
3690  
3691 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3692 <        assertTrue(f.cancel(mayInterruptIfRunning));
3029 <        final CompletableFutureInc r = new CompletableFutureInc();
3030 <        final CompletableFuture<Integer> g = f.thenCompose(r);
3031 <        checkCompletedWithWrappedCancellationException(g);
3032 <        checkCancelled(f);
3033 <        }
3034 <    }
3035 <
3036 <    // asyncs
3691 >        assertEquals(0, e.count.get());
3692 >    }}
3693  
3694      /**
3695 <     * thenRunAsync result completes normally after normal completion of source
3695 >     * toCompletableFuture returns this CompletableFuture.
3696       */
3697 <    public void testThenRunAsync() {
3697 >    public void testToCompletableFuture() {
3698          CompletableFuture<Integer> f = new CompletableFuture<>();
3699 <        Noop r = new Noop();
3044 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3045 <        f.complete(null);
3046 <        checkCompletedNormally(g, null);
3047 <
3048 <        // reordered version
3049 <        f = new CompletableFuture<>();
3050 <        f.complete(null);
3051 <        r = new Noop();
3052 <        g = f.thenRunAsync(r);
3053 <        checkCompletedNormally(g, null);
3699 >        assertSame(f, f.toCompletableFuture());
3700      }
3701  
3702 +    // jdk9
3703 +
3704      /**
3705 <     * thenRunAsync result completes exceptionally after exceptional
3058 <     * completion of source
3705 >     * newIncompleteFuture returns an incomplete CompletableFuture
3706       */
3707 <    public void testThenRunAsync2() {
3707 >    public void testNewIncompleteFuture() {
3708 >        for (Integer v1 : new Integer[] { 1, null })
3709 >    {
3710          CompletableFuture<Integer> f = new CompletableFuture<>();
3711 <        Noop r = new Noop();
3712 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3713 <        f.completeExceptionally(new CFException());
3714 <        try {
3715 <            g.join();
3716 <            shouldThrow();
3717 <        } catch (CompletionException success) {}
3718 <        checkCompletedWithWrappedCFException(g);
3719 <    }
3711 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3712 >        checkIncomplete(f);
3713 >        checkIncomplete(g);
3714 >        f.complete(v1);
3715 >        checkCompletedNormally(f, v1);
3716 >        checkIncomplete(g);
3717 >        g.complete(v1);
3718 >        checkCompletedNormally(g, v1);
3719 >        assertSame(g.getClass(), CompletableFuture.class);
3720 >    }}
3721  
3722      /**
3723 <     * thenRunAsync result completes exceptionally if action does
3723 >     * completedStage returns a completed CompletionStage
3724       */
3725 <    public void testThenRunAsync3() {
3726 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3727 <        FailingNoop r = new FailingNoop();
3728 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3729 <        f.complete(null);
3730 <        checkCompletedWithWrappedCFException(g);
3725 >    public void testCompletedStage() {
3726 >        AtomicInteger x = new AtomicInteger(0);
3727 >        AtomicReference<Throwable> r = new AtomicReference<>();
3728 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3729 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3730 >        assertEquals(x.get(), 1);
3731 >        assertNull(r.get());
3732      }
3733  
3734      /**
3735 <     * thenRunAsync result completes exceptionally if source cancelled
3735 >     * defaultExecutor by default returns the commonPool if
3736 >     * it supports more than one thread.
3737       */
3738 <    public void testThenRunAsync4() {
3738 >    public void testDefaultExecutor() {
3739          CompletableFuture<Integer> f = new CompletableFuture<>();
3740 <        Noop r = new Noop();
3741 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3742 <        assertTrue(f.cancel(true));
3743 <        checkCompletedWithWrappedCancellationException(g);
3740 >        Executor e = f.defaultExecutor();
3741 >        Executor c = ForkJoinPool.commonPool();
3742 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3743 >            assertSame(e, c);
3744 >        else
3745 >            assertNotSame(e, c);
3746      }
3747  
3748      /**
3749 <     * thenApplyAsync result completes normally after normal completion of source
3749 >     * failedFuture returns a CompletableFuture completed
3750 >     * exceptionally with the given Exception
3751       */
3752 <    public void testThenApplyAsync() {
3753 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3754 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3755 <        f.complete(one);
3101 <        checkCompletedNormally(g, two);
3752 >    public void testFailedFuture() {
3753 >        CFException ex = new CFException();
3754 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3755 >        checkCompletedExceptionally(f, ex);
3756      }
3757  
3758      /**
3759 <     * thenApplyAsync result completes exceptionally after exceptional
3106 <     * completion of source
3759 >     * failedFuture(null) throws NPE
3760       */
3761 <    public void testThenApplyAsync2() {
3762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3763 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3764 <        f.completeExceptionally(new CFException());
3765 <        checkCompletedWithWrappedCFException(g);
3761 >    public void testFailedFuture_null() {
3762 >        try {
3763 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3764 >            shouldThrow();
3765 >        } catch (NullPointerException success) {}
3766      }
3767  
3768      /**
3769 <     * thenApplyAsync result completes exceptionally if action does
3769 >     * copy returns a CompletableFuture that is completed normally,
3770 >     * with the same value, when source is.
3771       */
3772 <    public void testThenApplyAsync3() {
3772 >    public void testCopy_normalCompletion() {
3773 >        for (boolean createIncomplete : new boolean[] { true, false })
3774 >        for (Integer v1 : new Integer[] { 1, null })
3775 >    {
3776          CompletableFuture<Integer> f = new CompletableFuture<>();
3777 <        FailingFunction r = new FailingFunction();
3778 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3779 <        f.complete(null);
3780 <        checkCompletedWithWrappedCFException(g);
3781 <    }
3777 >        if (!createIncomplete) assertTrue(f.complete(v1));
3778 >        CompletableFuture<Integer> g = f.copy();
3779 >        if (createIncomplete) {
3780 >            checkIncomplete(f);
3781 >            checkIncomplete(g);
3782 >            assertTrue(f.complete(v1));
3783 >        }
3784 >        checkCompletedNormally(f, v1);
3785 >        checkCompletedNormally(g, v1);
3786 >    }}
3787  
3788      /**
3789 <     * thenApplyAsync result completes exceptionally if source cancelled
3789 >     * copy returns a CompletableFuture that is completed exceptionally
3790 >     * when source is.
3791       */
3792 <    public void testThenApplyAsync4() {
3792 >    public void testCopy_exceptionalCompletion() {
3793 >        for (boolean createIncomplete : new boolean[] { true, false })
3794 >    {
3795 >        CFException ex = new CFException();
3796          CompletableFuture<Integer> f = new CompletableFuture<>();
3797 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3798 <        assertTrue(f.cancel(true));
3799 <        checkCompletedWithWrappedCancellationException(g);
3800 <    }
3797 >        if (!createIncomplete) f.completeExceptionally(ex);
3798 >        CompletableFuture<Integer> g = f.copy();
3799 >        if (createIncomplete) {
3800 >            checkIncomplete(f);
3801 >            checkIncomplete(g);
3802 >            f.completeExceptionally(ex);
3803 >        }
3804 >        checkCompletedExceptionally(f, ex);
3805 >        checkCompletedWithWrappedException(g, ex);
3806 >    }}
3807  
3808      /**
3809 <     * thenAcceptAsync result completes normally after normal
3138 <     * completion of source
3809 >     * Completion of a copy does not complete its source.
3810       */
3811 <    public void testThenAcceptAsync() {
3811 >    public void testCopy_oneWayPropagation() {
3812          CompletableFuture<Integer> f = new CompletableFuture<>();
3813 <        IncAction r = new IncAction();
3814 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3815 <        f.complete(one);
3816 <        checkCompletedNormally(g, null);
3817 <        assertEquals(r.value, (Integer) 2);
3813 >        assertTrue(f.copy().complete(1));
3814 >        assertTrue(f.copy().complete(null));
3815 >        assertTrue(f.copy().cancel(true));
3816 >        assertTrue(f.copy().cancel(false));
3817 >        assertTrue(f.copy().completeExceptionally(new CFException()));
3818 >        checkIncomplete(f);
3819      }
3820  
3821      /**
3822 <     * thenAcceptAsync result completes exceptionally after exceptional
3823 <     * completion of source
3822 >     * minimalCompletionStage returns a CompletableFuture that is
3823 >     * completed normally, with the same value, when source is.
3824       */
3825 <    public void testThenAcceptAsync2() {
3825 >    public void testMinimalCompletionStage() {
3826          CompletableFuture<Integer> f = new CompletableFuture<>();
3827 <        IncAction r = new IncAction();
3828 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3829 <        f.completeExceptionally(new CFException());
3830 <        checkCompletedWithWrappedCFException(g);
3827 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3828 >        AtomicInteger x = new AtomicInteger(0);
3829 >        AtomicReference<Throwable> r = new AtomicReference<>();
3830 >        checkIncomplete(f);
3831 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3832 >        f.complete(1);
3833 >        checkCompletedNormally(f, 1);
3834 >        assertEquals(x.get(), 1);
3835 >        assertNull(r.get());
3836      }
3837  
3838      /**
3839 <     * thenAcceptAsync result completes exceptionally if action does
3839 >     * minimalCompletionStage returns a CompletableFuture that is
3840 >     * completed exceptionally when source is.
3841       */
3842 <    public void testThenAcceptAsync3() {
3842 >    public void testMinimalCompletionStage2() {
3843          CompletableFuture<Integer> f = new CompletableFuture<>();
3844 <        FailingConsumer r = new FailingConsumer();
3845 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3846 <        f.complete(null);
3847 <        checkCompletedWithWrappedCFException(g);
3844 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3845 >        AtomicInteger x = new AtomicInteger(0);
3846 >        AtomicReference<Throwable> r = new AtomicReference<>();
3847 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3848 >        checkIncomplete(f);
3849 >        CFException ex = new CFException();
3850 >        f.completeExceptionally(ex);
3851 >        checkCompletedExceptionally(f, ex);
3852 >        assertEquals(x.get(), 0);
3853 >        assertEquals(r.get().getCause(), ex);
3854      }
3855  
3856      /**
3857 <     * thenAcceptAsync result completes exceptionally if source cancelled
3857 >     * failedStage returns a CompletionStage completed
3858 >     * exceptionally with the given Exception
3859       */
3860 <    public void testThenAcceptAsync4() {
3861 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3862 <        IncAction r = new IncAction();
3863 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3864 <        assertTrue(f.cancel(true));
3865 <        checkCompletedWithWrappedCancellationException(g);
3860 >    public void testFailedStage() {
3861 >        CFException ex = new CFException();
3862 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3863 >        AtomicInteger x = new AtomicInteger(0);
3864 >        AtomicReference<Throwable> r = new AtomicReference<>();
3865 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3866 >        assertEquals(x.get(), 0);
3867 >        assertEquals(r.get(), ex);
3868      }
3869  
3183    // async with explicit executors
3184
3870      /**
3871 <     * thenRunAsync result completes normally after normal completion of source
3871 >     * completeAsync completes with value of given supplier
3872       */
3873 <    public void testThenRunAsyncE() {
3873 >    public void testCompleteAsync() {
3874 >        for (Integer v1 : new Integer[] { 1, null })
3875 >    {
3876          CompletableFuture<Integer> f = new CompletableFuture<>();
3877 <        Noop r = new Noop();
3878 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3879 <        f.complete(null);
3880 <        checkCompletedNormally(g, null);
3194 <
3195 <        // 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 <    }
3877 >        f.completeAsync(() -> v1);
3878 >        f.join();
3879 >        checkCompletedNormally(f, v1);
3880 >    }}
3881  
3882      /**
3883 <     * thenRunAsync result completes exceptionally after exceptional
3205 <     * completion of source
3883 >     * completeAsync completes exceptionally if given supplier throws
3884       */
3885 <    public void testThenRunAsync2E() {
3885 >    public void testCompleteAsync2() {
3886          CompletableFuture<Integer> f = new CompletableFuture<>();
3887 <        Noop r = new Noop();
3888 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3211 <        f.completeExceptionally(new CFException());
3887 >        CFException ex = new CFException();
3888 >        f.completeAsync(() -> { throw ex; });
3889          try {
3890 <            g.join();
3890 >            f.join();
3891              shouldThrow();
3892          } catch (CompletionException success) {}
3893 <        checkCompletedWithWrappedCFException(g);
3893 >        checkCompletedWithWrappedException(f, ex);
3894      }
3895  
3896      /**
3897 <     * thenRunAsync result completes exceptionally if action does
3897 >     * completeAsync with given executor completes with value of given supplier
3898       */
3899 <    public void testThenRunAsync3E() {
3899 >    public void testCompleteAsync3() {
3900 >        for (Integer v1 : new Integer[] { 1, null })
3901 >    {
3902          CompletableFuture<Integer> f = new CompletableFuture<>();
3903 <        FailingNoop r = new FailingNoop();
3904 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3905 <        f.complete(null);
3906 <        checkCompletedWithWrappedCFException(g);
3907 <    }
3903 >        ThreadExecutor executor = new ThreadExecutor();
3904 >        f.completeAsync(() -> v1, executor);
3905 >        assertSame(v1, f.join());
3906 >        checkCompletedNormally(f, v1);
3907 >        assertEquals(1, executor.count.get());
3908 >    }}
3909  
3910      /**
3911 <     * thenRunAsync result completes exceptionally if source cancelled
3911 >     * completeAsync with given executor completes exceptionally if
3912 >     * given supplier throws
3913       */
3914 <    public void testThenRunAsync4E() {
3914 >    public void testCompleteAsync4() {
3915          CompletableFuture<Integer> f = new CompletableFuture<>();
3916 <        Noop r = new Noop();
3917 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3918 <        assertTrue(f.cancel(true));
3919 <        checkCompletedWithWrappedCancellationException(g);
3916 >        CFException ex = new CFException();
3917 >        ThreadExecutor executor = new ThreadExecutor();
3918 >        f.completeAsync(() -> { throw ex; }, executor);
3919 >        try {
3920 >            f.join();
3921 >            shouldThrow();
3922 >        } catch (CompletionException success) {}
3923 >        checkCompletedWithWrappedException(f, ex);
3924 >        assertEquals(1, executor.count.get());
3925      }
3926  
3927      /**
3928 <     * thenApplyAsync result completes normally after normal completion of source
3928 >     * orTimeout completes with TimeoutException if not complete
3929       */
3930 <    public void testThenApplyAsyncE() {
3930 >    public void testOrTimeout_timesOut() {
3931 >        long timeoutMillis = timeoutMillis();
3932          CompletableFuture<Integer> f = new CompletableFuture<>();
3933 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3934 <        f.complete(one);
3935 <        checkCompletedNormally(g, two);
3933 >        long startTime = System.nanoTime();
3934 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3935 >        checkCompletedWithTimeoutException(f);
3936 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3937      }
3938  
3939      /**
3940 <     * thenApplyAsync result completes exceptionally after exceptional
3253 <     * completion of source
3940 >     * orTimeout completes normally if completed before timeout
3941       */
3942 <    public void testThenApplyAsync2E() {
3942 >    public void testOrTimeout_completed() {
3943 >        for (Integer v1 : new Integer[] { 1, null })
3944 >    {
3945          CompletableFuture<Integer> f = new CompletableFuture<>();
3946 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3947 <        f.completeExceptionally(new CFException());
3948 <        checkCompletedWithWrappedCFException(g);
3949 <    }
3946 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3947 >        long startTime = System.nanoTime();
3948 >        f.complete(v1);
3949 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3950 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3951 >        g.complete(v1);
3952 >        checkCompletedNormally(f, v1);
3953 >        checkCompletedNormally(g, v1);
3954 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3955 >    }}
3956  
3957      /**
3958 <     * thenApplyAsync result completes exceptionally if action does
3958 >     * completeOnTimeout completes with given value if not complete
3959       */
3960 <    public void testThenApplyAsync3E() {
3961 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3962 <        FailingFunction r = new FailingFunction();
3268 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3269 <        f.complete(null);
3270 <        checkCompletedWithWrappedCFException(g);
3960 >    public void testCompleteOnTimeout_timesOut() {
3961 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3962 >                       () -> testCompleteOnTimeout_timesOut(null));
3963      }
3964  
3965      /**
3966 <     * thenApplyAsync result completes exceptionally if source cancelled
3966 >     * completeOnTimeout completes with given value if not complete
3967       */
3968 <    public void testThenApplyAsync4E() {
3968 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3969 >        long timeoutMillis = timeoutMillis();
3970          CompletableFuture<Integer> f = new CompletableFuture<>();
3971 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3972 <        assertTrue(f.cancel(true));
3973 <        checkCompletedWithWrappedCancellationException(g);
3971 >        long startTime = System.nanoTime();
3972 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3973 >        assertSame(v, f.join());
3974 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3975 >        f.complete(99);         // should have no effect
3976 >        checkCompletedNormally(f, v);
3977      }
3978  
3979      /**
3980 <     * thenAcceptAsync result completes normally after normal
3285 <     * completion of source
3980 >     * completeOnTimeout has no effect if completed within timeout
3981       */
3982 <    public void testThenAcceptAsyncE() {
3982 >    public void testCompleteOnTimeout_completed() {
3983 >        for (Integer v1 : new Integer[] { 1, null })
3984 >    {
3985          CompletableFuture<Integer> f = new CompletableFuture<>();
3986 <        IncAction r = new IncAction();
3987 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3988 <        f.complete(one);
3989 <        checkCompletedNormally(g, null);
3990 <        assertEquals(r.value, (Integer) 2);
3991 <    }
3986 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3987 >        long startTime = System.nanoTime();
3988 >        f.complete(v1);
3989 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3990 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3991 >        g.complete(v1);
3992 >        checkCompletedNormally(f, v1);
3993 >        checkCompletedNormally(g, v1);
3994 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3995 >    }}
3996  
3997      /**
3998 <     * thenAcceptAsync result completes exceptionally after exceptional
3298 <     * completion of source
3998 >     * delayedExecutor returns an executor that delays submission
3999       */
4000 <    public void testThenAcceptAsync2E() {
4001 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4002 <        IncAction r = new IncAction();
4003 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
4004 <        f.completeExceptionally(new CFException());
4005 <        checkCompletedWithWrappedCFException(g);
4006 <    }
4000 >    public void testDelayedExecutor() {
4001 >        testInParallel(() -> testDelayedExecutor(null, null),
4002 >                       () -> testDelayedExecutor(null, 1),
4003 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
4004 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
4005 >    }
4006 >
4007 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
4008 >        long timeoutMillis = timeoutMillis();
4009 >        // Use an "unreasonably long" long timeout to catch lingering threads
4010 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
4011 >        final Executor delayer, longDelayer;
4012 >        if (executor == null) {
4013 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
4014 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
4015 >        } else {
4016 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
4017 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
4018 >        }
4019 >        long startTime = System.nanoTime();
4020 >        CompletableFuture<Integer> f =
4021 >            CompletableFuture.supplyAsync(() -> v, delayer);
4022 >        CompletableFuture<Integer> g =
4023 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
4024 >
4025 >        assertNull(g.getNow(null));
4026 >
4027 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
4028 >        long millisElapsed = millisElapsedSince(startTime);
4029 >        assertTrue(millisElapsed >= timeoutMillis);
4030 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
4031 >
4032 >        checkCompletedNormally(f, v);
4033 >
4034 >        checkIncomplete(g);
4035 >        assertTrue(g.cancel(true));
4036 >    }
4037 >
4038 >    //--- tests of implementation details; not part of official tck ---
4039 >
4040 >    Object resultOf(CompletableFuture<?> f) {
4041 >        SecurityManager sm = System.getSecurityManager();
4042 >        if (sm != null) {
4043 >            try {
4044 >                System.setSecurityManager(null);
4045 >            } catch (SecurityException giveUp) {
4046 >                return "Reflection not available";
4047 >            }
4048 >        }
4049  
4050 <    /**
4051 <     * thenAcceptAsync result completes exceptionally if action does
4052 <     */
4053 <    public void testThenAcceptAsync3E() {
4054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4055 <        FailingConsumer r = new FailingConsumer();
4056 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
4057 <        f.complete(null);
4058 <        checkCompletedWithWrappedCFException(g);
4050 >        try {
4051 >            java.lang.reflect.Field resultField
4052 >                = CompletableFuture.class.getDeclaredField("result");
4053 >            resultField.setAccessible(true);
4054 >            return resultField.get(f);
4055 >        } catch (Throwable t) {
4056 >            throw new AssertionError(t);
4057 >        } finally {
4058 >            if (sm != null) System.setSecurityManager(sm);
4059 >        }
4060      }
4061  
4062 <    /**
4063 <     * thenAcceptAsync result completes exceptionally if source cancelled
4064 <     */
4065 <    public void testThenAcceptAsync4E() {
4066 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4067 <        IncAction r = new IncAction();
4068 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3326 <        assertTrue(f.cancel(true));
3327 <        checkCompletedWithWrappedCancellationException(g);
3328 <    }
4062 >    public void testExceptionPropagationReusesResultObject() {
4063 >        if (!testImplementationDetails) return;
4064 >        for (ExecutionMode m : ExecutionMode.values())
4065 >    {
4066 >        final CFException ex = new CFException();
4067 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4068 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4069  
4070 <    // other static methods
4070 >        final Runnable noopRunnable = new Noop(m);
4071 >        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4072 >        final Function<Integer, Integer> incFunction = new IncFunction(m);
4073 >
4074 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4075 >            = new ArrayList<>();
4076 >
4077 >        funs.add(y -> m.thenRun(y, noopRunnable));
4078 >        funs.add(y -> m.thenAccept(y, noopConsumer));
4079 >        funs.add(y -> m.thenApply(y, incFunction));
4080 >
4081 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4082 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4083 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4084 >
4085 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4086 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4087 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4088 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4089 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4090 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4091 >
4092 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4093 >
4094 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4095 >
4096 >        funs.add(y -> CompletableFuture.allOf(y));
4097 >        funs.add(y -> CompletableFuture.allOf(y, v42));
4098 >        funs.add(y -> CompletableFuture.allOf(v42, y));
4099 >        funs.add(y -> CompletableFuture.anyOf(y));
4100 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4101 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4102  
4103 <    /**
4104 <     * allOf(no component futures) returns a future completed normally
4105 <     * with the value null
4106 <     */
4107 <    public void testAllOf_empty() throws Exception {
4108 <        CompletableFuture<Void> f = CompletableFuture.allOf();
4109 <        checkCompletedNormally(f, null);
4110 <    }
4103 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4104 >                 fun : funs) {
4105 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4106 >            f.completeExceptionally(ex);
4107 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4108 >            checkCompletedWithWrappedException(src, ex);
4109 >            CompletableFuture<?> dep = fun.apply(src);
4110 >            checkCompletedWithWrappedException(dep, ex);
4111 >            assertSame(resultOf(src), resultOf(dep));
4112 >        }
4113  
4114 <    /**
4115 <     * allOf returns a future completed normally with the value null
4116 <     * when all components complete normally
4117 <     */
4118 <    public void testAllOf_normal() throws Exception {
4119 <        for (int k = 1; k < 20; ++k) {
4120 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
4121 <            for (int i = 0; i < k; ++i)
4122 <                fs[i] = new CompletableFuture<>();
4123 <            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
4124 <            for (int i = 0; i < k; ++i) {
4125 <                checkIncomplete(f);
4126 <                checkIncomplete(CompletableFuture.allOf(fs));
4127 <                fs[i].complete(one);
4128 <            }
4129 <            checkCompletedNormally(f, null);
4130 <            checkCompletedNormally(CompletableFuture.allOf(fs), null);
4114 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4115 >                 fun : funs) {
4116 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4117 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4118 >            CompletableFuture<?> dep = fun.apply(src);
4119 >            f.completeExceptionally(ex);
4120 >            checkCompletedWithWrappedException(src, ex);
4121 >            checkCompletedWithWrappedException(dep, ex);
4122 >            assertSame(resultOf(src), resultOf(dep));
4123 >        }
4124 >
4125 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4126 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4127 >                 fun : funs) {
4128 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4129 >            f.cancel(mayInterruptIfRunning);
4130 >            checkCancelled(f);
4131 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4132 >            checkCompletedWithWrappedCancellationException(src);
4133 >            CompletableFuture<?> dep = fun.apply(src);
4134 >            checkCompletedWithWrappedCancellationException(dep);
4135 >            assertSame(resultOf(src), resultOf(dep));
4136          }
4137 <    }
4137 >
4138 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4139 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4140 >                 fun : funs) {
4141 >            CompletableFuture<Integer> f = new CompletableFuture<>();
4142 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4143 >            CompletableFuture<?> dep = fun.apply(src);
4144 >            f.cancel(mayInterruptIfRunning);
4145 >            checkCancelled(f);
4146 >            checkCompletedWithWrappedCancellationException(src);
4147 >            checkCompletedWithWrappedCancellationException(dep);
4148 >            assertSame(resultOf(src), resultOf(dep));
4149 >        }
4150 >    }}
4151  
4152      /**
4153 <     * anyOf(no component futures) returns an incomplete future
4153 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
4154       */
4155 <    public void testAnyOf_empty() throws Exception {
4156 <        CompletableFuture<Object> f = CompletableFuture.anyOf();
4157 <        checkIncomplete(f);
4155 >    public void testMinimalCompletionStage_minimality() {
4156 >        if (!testImplementationDetails) return;
4157 >        Function<Method, String> toSignature =
4158 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4159 >        Predicate<Method> isNotStatic =
4160 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4161 >        List<Method> minimalMethods =
4162 >            Stream.of(Object.class, CompletionStage.class)
4163 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4164 >            .filter(isNotStatic)
4165 >            .collect(Collectors.toList());
4166 >        // Methods from CompletableFuture permitted NOT to throw UOE
4167 >        String[] signatureWhitelist = {
4168 >            "newIncompleteFuture[]",
4169 >            "defaultExecutor[]",
4170 >            "minimalCompletionStage[]",
4171 >            "copy[]",
4172 >        };
4173 >        Set<String> permittedMethodSignatures =
4174 >            Stream.concat(minimalMethods.stream().map(toSignature),
4175 >                          Stream.of(signatureWhitelist))
4176 >            .collect(Collectors.toSet());
4177 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4178 >            .filter(isNotStatic)
4179 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4180 >            .collect(Collectors.toList());
4181 >
4182 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
4183 >        CompletionStage<Integer> min =
4184 >            new CompletableFuture<Integer>().minimalCompletionStage();
4185 >        stages.add(min);
4186 >        stages.add(min.thenApply(x -> x));
4187 >        stages.add(CompletableFuture.completedStage(1));
4188 >        stages.add(CompletableFuture.failedStage(new CFException()));
4189 >
4190 >        List<Method> bugs = new ArrayList<>();
4191 >        for (Method method : allMethods) {
4192 >            Class<?>[] parameterTypes = method.getParameterTypes();
4193 >            Object[] args = new Object[parameterTypes.length];
4194 >            // Manufacture boxed primitives for primitive params
4195 >            for (int i = 0; i < args.length; i++) {
4196 >                Class<?> type = parameterTypes[i];
4197 >                if (parameterTypes[i] == boolean.class)
4198 >                    args[i] = false;
4199 >                else if (parameterTypes[i] == int.class)
4200 >                    args[i] = 0;
4201 >                else if (parameterTypes[i] == long.class)
4202 >                    args[i] = 0L;
4203 >            }
4204 >            for (CompletionStage<Integer> stage : stages) {
4205 >                try {
4206 >                    method.invoke(stage, args);
4207 >                    bugs.add(method);
4208 >                }
4209 >                catch (java.lang.reflect.InvocationTargetException expected) {
4210 >                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4211 >                        bugs.add(method);
4212 >                        // expected.getCause().printStackTrace();
4213 >                    }
4214 >                }
4215 >                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4216 >            }
4217 >        }
4218 >        if (!bugs.isEmpty())
4219 >            throw new Error("Methods did not throw UOE: " + bugs);
4220      }
4221  
4222      /**
4223 <     * anyOf returns a future completed normally with a value when
4224 <     * a component future does
4223 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4224 >     * is completed normally, with the same value, when source is.
4225       */
4226 <    public void testAnyOf_normal() throws Exception {
4227 <        for (int k = 0; k < 10; ++k) {
4228 <            CompletableFuture[] fs = new CompletableFuture[k];
4229 <            for (int i = 0; i < k; ++i)
4230 <                fs[i] = new CompletableFuture<>();
4231 <            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
4226 >    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4227 >        for (boolean createIncomplete : new boolean[] { true, false })
4228 >        for (Integer v1 : new Integer[] { 1, null })
4229 >    {
4230 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4231 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4232 >        if (!createIncomplete) assertTrue(f.complete(v1));
4233 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4234 >        if (createIncomplete) {
4235              checkIncomplete(f);
4236 <            for (int i = 0; i < k; ++i) {
4237 <                fs[i].complete(one);
3382 <                checkCompletedNormally(f, one);
3383 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3384 <            }
4236 >            checkIncomplete(g);
4237 >            assertTrue(f.complete(v1));
4238          }
4239 <    }
4239 >        checkCompletedNormally(f, v1);
4240 >        checkCompletedNormally(g, v1);
4241 >    }}
4242  
4243      /**
4244 <     * anyOf result completes exceptionally when any component does.
4244 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4245 >     * is completed exceptionally when source is.
4246       */
4247 <    public void testAnyOf_exceptional() throws Exception {
4248 <        for (int k = 0; k < 10; ++k) {
4249 <            CompletableFuture[] fs = new CompletableFuture[k];
4250 <            for (int i = 0; i < k; ++i)
4251 <                fs[i] = new CompletableFuture<>();
4252 <            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
4247 >    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4248 >        for (boolean createIncomplete : new boolean[] { true, false })
4249 >    {
4250 >        CFException ex = new CFException();
4251 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4252 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4253 >        if (!createIncomplete) f.completeExceptionally(ex);
4254 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4255 >        if (createIncomplete) {
4256              checkIncomplete(f);
4257 <            for (int i = 0; i < k; ++i) {
4258 <                fs[i].completeExceptionally(new CFException());
3400 <                checkCompletedWithWrappedCFException(f);
3401 <                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3402 <            }
4257 >            checkIncomplete(g);
4258 >            f.completeExceptionally(ex);
4259          }
4260 <    }
4260 >        checkCompletedExceptionally(f, ex);
4261 >        checkCompletedWithWrappedException(g, ex);
4262 >    }}
4263  
4264      /**
4265 <     * Completion methods throw NullPointerException with null arguments
4265 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4266       */
4267 <    public void testNPE() {
4267 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4268 >        for (Integer v1 : new Integer[] { 1, null })
4269 >    {
4270          CompletableFuture<Integer> f = new CompletableFuture<>();
4271 <        CompletableFuture<Integer> g = new CompletableFuture<>();
4272 <        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
4273 <        CompletableFuture<?> h;
4274 <        ThreadExecutor exec = new ThreadExecutor();
4275 <
4276 <        Runnable[] throwingActions = {
4277 <            () -> CompletableFuture.supplyAsync(null),
3418 <            () -> CompletableFuture.supplyAsync(null, exec),
3419 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3420 <
3421 <            () -> CompletableFuture.runAsync(null),
3422 <            () -> CompletableFuture.runAsync(null, exec),
3423 <            () -> CompletableFuture.runAsync(() -> {}, null),
3424 <
3425 <            () -> f.completeExceptionally(null),
3426 <
3427 <            () -> f.thenApply(null),
3428 <            () -> f.thenApplyAsync(null),
3429 <            () -> f.thenApplyAsync((x) -> x, null),
3430 <            () -> f.thenApplyAsync(null, exec),
4271 >        CompletionStage minimal = f.minimalCompletionStage();
4272 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4273 >        assertTrue(g.complete(v1));
4274 >        checkCompletedNormally(g, v1);
4275 >        checkIncomplete(f);
4276 >        checkIncomplete(minimal.toCompletableFuture());
4277 >    }}
4278  
4279 <            () -> f.thenAccept(null),
4280 <            () -> f.thenAcceptAsync(null),
4281 <            () -> f.thenAcceptAsync((x) -> {} , null),
4282 <            () -> f.thenAcceptAsync(null, exec),
4279 >    /**
4280 >     * minimalStage.toCompletableFuture().join() awaits completion
4281 >     */
4282 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4283 >        for (boolean createIncomplete : new boolean[] { true, false })
4284 >        for (Integer v1 : new Integer[] { 1, null })
4285 >    {
4286 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4287 >        if (!createIncomplete) assertTrue(f.complete(v1));
4288 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4289 >        if (createIncomplete) assertTrue(f.complete(v1));
4290 >        assertEquals(v1, minimal.toCompletableFuture().join());
4291 >        assertEquals(v1, minimal.toCompletableFuture().get());
4292 >        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4293 >    }}
4294  
4295 <            () -> f.thenRun(null),
4296 <            () -> f.thenRunAsync(null),
4297 <            () -> f.thenRunAsync(() -> {} , null),
4298 <            () -> f.thenRunAsync(null, exec),
4295 >    /**
4296 >     * Completion of a toCompletableFuture copy of a minimal stage
4297 >     * does not complete its source.
4298 >     */
4299 >    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4300 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4301 >        CompletionStage<Integer> g = f.minimalCompletionStage();
4302 >        assertTrue(g.toCompletableFuture().complete(1));
4303 >        assertTrue(g.toCompletableFuture().complete(null));
4304 >        assertTrue(g.toCompletableFuture().cancel(true));
4305 >        assertTrue(g.toCompletableFuture().cancel(false));
4306 >        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4307 >        checkIncomplete(g.toCompletableFuture());
4308 >        f.complete(1);
4309 >        checkCompletedNormally(g.toCompletableFuture(), 1);
4310 >    }
4311  
4312 <            () -> f.thenCombine(g, null),
4313 <            () -> f.thenCombineAsync(g, null),
4314 <            () -> f.thenCombineAsync(g, null, exec),
4315 <            () -> f.thenCombine(nullFuture, (x, y) -> x),
4316 <            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
4317 <            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
4318 <            () -> f.thenCombineAsync(g, (x, y) -> x, null),
4312 >    /** Demo utility method for external reliable toCompletableFuture */
4313 >    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4314 >        CompletableFuture<T> f = new CompletableFuture<>();
4315 >        stage.handle((T t, Throwable ex) -> {
4316 >                         if (ex != null) f.completeExceptionally(ex);
4317 >                         else f.complete(t);
4318 >                         return null;
4319 >                     });
4320 >        return f;
4321 >    }
4322  
4323 <            () -> f.thenAcceptBoth(g, null),
4324 <            () -> f.thenAcceptBothAsync(g, null),
4325 <            () -> f.thenAcceptBothAsync(g, null, exec),
4326 <            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3454 <            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3455 <            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3456 <            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
4323 >    /** Demo utility method to join a CompletionStage */
4324 >    static <T> T join(CompletionStage<T> stage) {
4325 >        return toCompletableFuture(stage).join();
4326 >    }
4327  
4328 <            () -> f.runAfterBoth(g, null),
4329 <            () -> f.runAfterBothAsync(g, null),
4330 <            () -> f.runAfterBothAsync(g, null, exec),
4331 <            () -> f.runAfterBoth(nullFuture, () -> {}),
4332 <            () -> f.runAfterBothAsync(nullFuture, () -> {}),
4333 <            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
4334 <            () -> f.runAfterBothAsync(g, () -> {}, null),
4328 >    /**
4329 >     * Joining a minimal stage "by hand" works
4330 >     */
4331 >    public void testMinimalCompletionStage_join_by_hand() {
4332 >        for (boolean createIncomplete : new boolean[] { true, false })
4333 >        for (Integer v1 : new Integer[] { 1, null })
4334 >    {
4335 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4336 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4337 >        CompletableFuture<Integer> g = new CompletableFuture<>();
4338 >        if (!createIncomplete) assertTrue(f.complete(v1));
4339 >        minimal.thenAccept(x -> g.complete(x));
4340 >        if (createIncomplete) assertTrue(f.complete(v1));
4341 >        g.join();
4342 >        checkCompletedNormally(g, v1);
4343 >        checkCompletedNormally(f, v1);
4344 >        assertEquals(v1, join(minimal));
4345 >    }}
4346  
4347 <            () -> f.applyToEither(g, null),
4348 <            () -> f.applyToEitherAsync(g, null),
4349 <            () -> f.applyToEitherAsync(g, null, exec),
4350 <            () -> f.applyToEither(nullFuture, (x) -> x),
4351 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
4352 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
4353 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
4347 >    static class Monad {
4348 >        static class ZeroException extends RuntimeException {
4349 >            public ZeroException() { super("monadic zero"); }
4350 >        }
4351 >        // "return", "unit"
4352 >        static <T> CompletableFuture<T> unit(T value) {
4353 >            return completedFuture(value);
4354 >        }
4355 >        // monadic zero ?
4356 >        static <T> CompletableFuture<T> zero() {
4357 >            return failedFuture(new ZeroException());
4358 >        }
4359 >        // >=>
4360 >        static <T,U,V> Function<T, CompletableFuture<V>> compose
4361 >            (Function<T, CompletableFuture<U>> f,
4362 >             Function<U, CompletableFuture<V>> g) {
4363 >            return x -> f.apply(x).thenCompose(g);
4364 >        }
4365 >
4366 >        static void assertZero(CompletableFuture<?> f) {
4367 >            try {
4368 >                f.getNow(null);
4369 >                throw new AssertionError("should throw");
4370 >            } catch (CompletionException success) {
4371 >                assertTrue(success.getCause() instanceof ZeroException);
4372 >            }
4373 >        }
4374  
4375 <            () -> f.acceptEither(g, null),
4376 <            () -> f.acceptEitherAsync(g, null),
4377 <            () -> f.acceptEitherAsync(g, null, exec),
4378 <            () -> f.acceptEither(nullFuture, (x) -> {}),
4379 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
4380 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
4381 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
4375 >        static <T> void assertFutureEquals(CompletableFuture<T> f,
4376 >                                           CompletableFuture<T> g) {
4377 >            T fval = null, gval = null;
4378 >            Throwable fex = null, gex = null;
4379 >
4380 >            try { fval = f.get(); }
4381 >            catch (ExecutionException ex) { fex = ex.getCause(); }
4382 >            catch (Throwable ex) { fex = ex; }
4383 >
4384 >            try { gval = g.get(); }
4385 >            catch (ExecutionException ex) { gex = ex.getCause(); }
4386 >            catch (Throwable ex) { gex = ex; }
4387 >
4388 >            if (fex != null || gex != null)
4389 >                assertSame(fex.getClass(), gex.getClass());
4390 >            else
4391 >                assertEquals(fval, gval);
4392 >        }
4393 >
4394 >        static class PlusFuture<T> extends CompletableFuture<T> {
4395 >            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4396 >        }
4397 >
4398 >        /** Implements "monadic plus". */
4399 >        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4400 >                                             CompletableFuture<? extends T> g) {
4401 >            PlusFuture<T> plus = new PlusFuture<T>();
4402 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4403 >                try {
4404 >                    if (ex == null) {
4405 >                        if (plus.complete(result))
4406 >                            if (plus.firstFailure.get() != null)
4407 >                                plus.firstFailure.set(null);
4408 >                    }
4409 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4410 >                        if (plus.isDone())
4411 >                            plus.firstFailure.set(null);
4412 >                    }
4413 >                    else {
4414 >                        // first failure has precedence
4415 >                        Throwable first = plus.firstFailure.getAndSet(null);
4416 >
4417 >                        // may fail with "Self-suppression not permitted"
4418 >                        try { first.addSuppressed(ex); }
4419 >                        catch (Exception ignored) {}
4420 >
4421 >                        plus.completeExceptionally(first);
4422 >                    }
4423 >                } catch (Throwable unexpected) {
4424 >                    plus.completeExceptionally(unexpected);
4425 >                }
4426 >            };
4427 >            f.whenComplete(action);
4428 >            g.whenComplete(action);
4429 >            return plus;
4430 >        }
4431 >    }
4432 >
4433 >    /**
4434 >     * CompletableFuture is an additive monad - sort of.
4435 >     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4436 >     */
4437 >    public void testAdditiveMonad() throws Throwable {
4438 >        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4439 >        CompletableFuture<Long> zero = Monad.zero();
4440 >
4441 >        // Some mutually non-commutative functions
4442 >        Function<Long, CompletableFuture<Long>> triple
4443 >            = x -> Monad.unit(3 * x);
4444 >        Function<Long, CompletableFuture<Long>> inc
4445 >            = x -> Monad.unit(x + 1);
4446 >
4447 >        // unit is a right identity: m >>= unit === m
4448 >        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4449 >                                 inc.apply(5L));
4450 >        // unit is a left identity: (unit x) >>= f === f x
4451 >        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4452 >                                 inc.apply(5L));
4453 >
4454 >        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4455 >        Monad.assertFutureEquals(
4456 >            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4457 >            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4458 >
4459 >        // The case for CompletableFuture as an additive monad is weaker...
4460 >
4461 >        // zero is a monadic zero
4462 >        Monad.assertZero(zero);
4463 >
4464 >        // left zero: zero >>= f === zero
4465 >        Monad.assertZero(zero.thenCompose(inc));
4466 >        // right zero: f >>= (\x -> zero) === zero
4467 >        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4468 >
4469 >        // f plus zero === f
4470 >        Monad.assertFutureEquals(Monad.unit(5L),
4471 >                                 Monad.plus(Monad.unit(5L), zero));
4472 >        // zero plus f === f
4473 >        Monad.assertFutureEquals(Monad.unit(5L),
4474 >                                 Monad.plus(zero, Monad.unit(5L)));
4475 >        // zero plus zero === zero
4476 >        Monad.assertZero(Monad.plus(zero, zero));
4477 >        {
4478 >            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4479 >                                                   Monad.unit(8L));
4480 >            // non-determinism
4481 >            assertTrue(f.get() == 5L || f.get() == 8L);
4482 >        }
4483 >
4484 >        CompletableFuture<Long> godot = new CompletableFuture<>();
4485 >        // f plus godot === f (doesn't wait for godot)
4486 >        Monad.assertFutureEquals(Monad.unit(5L),
4487 >                                 Monad.plus(Monad.unit(5L), godot));
4488 >        // godot plus f === f (doesn't wait for godot)
4489 >        Monad.assertFutureEquals(Monad.unit(5L),
4490 >                                 Monad.plus(godot, Monad.unit(5L)));
4491 >    }
4492 >
4493 >    /** Test long recursive chains of CompletableFutures with cascading completions */
4494 >    @SuppressWarnings("FutureReturnValueIgnored")
4495 >    public void testRecursiveChains() throws Throwable {
4496 >        for (ExecutionMode m : ExecutionMode.values())
4497 >        for (boolean addDeadEnds : new boolean[] { true, false })
4498 >    {
4499 >        final int val = 42;
4500 >        final int n = expensiveTests ? 1_000 : 2;
4501 >        CompletableFuture<Integer> head = new CompletableFuture<>();
4502 >        CompletableFuture<Integer> tail = head;
4503 >        for (int i = 0; i < n; i++) {
4504 >            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4505 >            tail = m.thenApply(tail, v -> v + 1);
4506 >            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4507 >            tail = m.applyToEither(tail, tail, v -> v + 1);
4508 >            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4509 >            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4510 >        }
4511 >        head.complete(val);
4512 >        assertEquals(val + 3 * n, (int) tail.join());
4513 >    }}
4514  
4515 <            () -> f.runAfterEither(g, null),
4516 <            () -> f.runAfterEitherAsync(g, null),
4517 <            () -> f.runAfterEitherAsync(g, null, exec),
4518 <            () -> f.runAfterEither(nullFuture, () -> {}),
4519 <            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
4520 <            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
4521 <            () -> f.runAfterEitherAsync(g, () -> {}, null),
4515 >    /**
4516 >     * A single CompletableFuture with many dependents.
4517 >     * A demo of scalability - runtime is O(n).
4518 >     */
4519 >    @SuppressWarnings("FutureReturnValueIgnored")
4520 >    public void testManyDependents() throws Throwable {
4521 >        final int n = expensiveTests ? 1_000_000 : 10;
4522 >        final CompletableFuture<Void> head = new CompletableFuture<>();
4523 >        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4524 >        final AtomicInteger count = new AtomicInteger(0);
4525 >        for (int i = 0; i < n; i++) {
4526 >            head.thenRun(() -> count.getAndIncrement());
4527 >            head.thenAccept(x -> count.getAndIncrement());
4528 >            head.thenApply(x -> count.getAndIncrement());
4529 >
4530 >            head.runAfterBoth(complete, () -> count.getAndIncrement());
4531 >            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4532 >            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4533 >            complete.runAfterBoth(head, () -> count.getAndIncrement());
4534 >            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4535 >            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4536 >
4537 >            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4538 >            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4539 >            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4540 >            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4541 >            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4542 >            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4543 >        }
4544 >        head.complete(null);
4545 >        assertEquals(5 * 3 * n, count.get());
4546 >    }
4547 >
4548 >    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4549 >    @SuppressWarnings("FutureReturnValueIgnored")
4550 >    public void testCoCompletionGarbageRetention() throws Throwable {
4551 >        final int n = expensiveTests ? 1_000_000 : 10;
4552 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4553 >        CompletableFuture<Integer> f;
4554 >        for (int i = 0; i < n; i++) {
4555 >            f = new CompletableFuture<>();
4556 >            f.runAfterEither(incomplete, () -> {});
4557 >            f.complete(null);
4558  
4559 <            () -> f.thenCompose(null),
4560 <            () -> f.thenComposeAsync(null),
4561 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3493 <            () -> f.thenComposeAsync(null, exec),
4559 >            f = new CompletableFuture<>();
4560 >            f.acceptEither(incomplete, x -> {});
4561 >            f.complete(null);
4562  
4563 <            () -> f.exceptionally(null),
4563 >            f = new CompletableFuture<>();
4564 >            f.applyToEither(incomplete, x -> x);
4565 >            f.complete(null);
4566  
4567 <            () -> f.handle(null),
4567 >            f = new CompletableFuture<>();
4568 >            CompletableFuture.anyOf(f, incomplete);
4569 >            f.complete(null);
4570 >        }
4571  
4572 <            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
4573 <            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
4574 <            () -> CompletableFuture.allOf(f, null),
4575 <            () -> CompletableFuture.allOf(null, f),
4572 >        for (int i = 0; i < n; i++) {
4573 >            f = new CompletableFuture<>();
4574 >            incomplete.runAfterEither(f, () -> {});
4575 >            f.complete(null);
4576  
4577 <            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
4578 <            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
4579 <            () -> CompletableFuture.anyOf(f, null),
3507 <            () -> CompletableFuture.anyOf(null, f),
4577 >            f = new CompletableFuture<>();
4578 >            incomplete.acceptEither(f, x -> {});
4579 >            f.complete(null);
4580  
4581 <            () -> f.obtrudeException(null),
4582 <        };
4581 >            f = new CompletableFuture<>();
4582 >            incomplete.applyToEither(f, x -> x);
4583 >            f.complete(null);
4584  
4585 <        assertThrows(NullPointerException.class, throwingActions);
4586 <        assertEquals(0, exec.count.get());
4585 >            f = new CompletableFuture<>();
4586 >            CompletableFuture.anyOf(incomplete, f);
4587 >            f.complete(null);
4588 >        }
4589      }
4590  
4591      /**
4592 <     * toCompletableFuture returns this CompletableFuture.
4592 >     * Reproduction recipe for:
4593 >     * 8160402: Garbage retention with CompletableFuture.anyOf
4594 >     * 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
4595       */
4596 <    public void testToCompletableFuture() {
4597 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4598 <        assertSame(f, f.toCompletableFuture());
4596 >    public void testAnyOfGarbageRetention() throws Throwable {
4597 >        for (Integer v : new Integer[] { 1, null })
4598 >    {
4599 >        final int n = expensiveTests ? 100_000 : 10;
4600 >        CompletableFuture<Integer>[] fs
4601 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4602 >        for (int i = 0; i < fs.length; i++)
4603 >            fs[i] = new CompletableFuture<>();
4604 >        fs[fs.length - 1].complete(v);
4605 >        for (int i = 0; i < n; i++)
4606 >            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4607 >    }}
4608 >
4609 >    /**
4610 >     * Checks for garbage retention with allOf.
4611 >     *
4612 >     * As of 2016-07, fails with OOME:
4613 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4614 >     */
4615 >    public void testCancelledAllOfGarbageRetention() throws Throwable {
4616 >        final int n = expensiveTests ? 100_000 : 10;
4617 >        CompletableFuture<Integer>[] fs
4618 >            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4619 >        for (int i = 0; i < fs.length; i++)
4620 >            fs[i] = new CompletableFuture<>();
4621 >        for (int i = 0; i < n; i++)
4622 >            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4623 >    }
4624 >
4625 >    /**
4626 >     * Checks for garbage retention when a dependent future is
4627 >     * cancelled and garbage-collected.
4628 >     * 8161600: Garbage retention when source CompletableFutures are never completed
4629 >     *
4630 >     * As of 2016-07, fails with OOME:
4631 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4632 >     */
4633 >    public void testCancelledGarbageRetention() throws Throwable {
4634 >        final int n = expensiveTests ? 100_000 : 10;
4635 >        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4636 >        for (int i = 0; i < n; i++)
4637 >            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4638 >    }
4639 >
4640 >    /**
4641 >     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4642 >     * is invoked many times.
4643 >     * 8161600: Garbage retention when source CompletableFutures are never completed
4644 >     *
4645 >     * As of 2016-07, fails with OOME:
4646 >     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4647 >     */
4648 >    public void testToCompletableFutureGarbageRetention() throws Throwable {
4649 >        final int n = expensiveTests ? 900_000 : 10;
4650 >        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4651 >        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4652 >        for (int i = 0; i < n; i++)
4653 >            assertTrue(minimal.toCompletableFuture().cancel(true));
4654 >    }
4655 >
4656 > //     static <U> U join(CompletionStage<U> stage) {
4657 > //         CompletableFuture<U> f = new CompletableFuture<>();
4658 > //         stage.whenComplete((v, ex) -> {
4659 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4660 > //         });
4661 > //         return f.join();
4662 > //     }
4663 >
4664 > //     static <U> boolean isDone(CompletionStage<U> stage) {
4665 > //         CompletableFuture<U> f = new CompletableFuture<>();
4666 > //         stage.whenComplete((v, ex) -> {
4667 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4668 > //         });
4669 > //         return f.isDone();
4670 > //     }
4671 >
4672 > //     static <U> U join2(CompletionStage<U> stage) {
4673 > //         return stage.toCompletableFuture().copy().join();
4674 > //     }
4675 >
4676 > //     static <U> boolean isDone2(CompletionStage<U> stage) {
4677 > //         return stage.toCompletableFuture().copy().isDone();
4678 > //     }
4679 >
4680 >    // For testing default implementations
4681 >    // Only non-default interface methods defined.
4682 >    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4683 >        final CompletableFuture<T> cf;
4684 >        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4685 >        public CompletableFuture<T> toCompletableFuture() {
4686 >            return cf; }
4687 >        public CompletionStage<Void> thenRun
4688 >            (Runnable action) {
4689 >            return cf.thenRun(action); }
4690 >        public CompletionStage<Void> thenRunAsync
4691 >            (Runnable action) {
4692 >            return cf.thenRunAsync(action); }
4693 >        public CompletionStage<Void> thenRunAsync
4694 >            (Runnable action,
4695 >             Executor executor) {
4696 >            return cf.thenRunAsync(action, executor); }
4697 >        public CompletionStage<Void> thenAccept
4698 >            (Consumer<? super T> action) {
4699 >            return cf.thenAccept(action); }
4700 >        public CompletionStage<Void> thenAcceptAsync
4701 >            (Consumer<? super T> action) {
4702 >            return cf.thenAcceptAsync(action); }
4703 >        public CompletionStage<Void> thenAcceptAsync
4704 >            (Consumer<? super T> action,
4705 >             Executor executor) {
4706 >            return cf.thenAcceptAsync(action, executor); }
4707 >        public <U> CompletionStage<U> thenApply
4708 >            (Function<? super T,? extends U> a) {
4709 >            return cf.thenApply(a); }
4710 >        public <U> CompletionStage<U> thenApplyAsync
4711 >            (Function<? super T,? extends U> fn) {
4712 >            return cf.thenApplyAsync(fn); }
4713 >        public <U> CompletionStage<U> thenApplyAsync
4714 >            (Function<? super T,? extends U> fn,
4715 >             Executor executor) {
4716 >            return cf.thenApplyAsync(fn, executor); }
4717 >        public <U,V> CompletionStage<V> thenCombine
4718 >            (CompletionStage<? extends U> other,
4719 >             BiFunction<? super T,? super U,? extends V> fn) {
4720 >            return cf.thenCombine(other, fn); }
4721 >        public <U,V> CompletionStage<V> thenCombineAsync
4722 >            (CompletionStage<? extends U> other,
4723 >             BiFunction<? super T,? super U,? extends V> fn) {
4724 >            return cf.thenCombineAsync(other, fn); }
4725 >        public <U,V> CompletionStage<V> thenCombineAsync
4726 >            (CompletionStage<? extends U> other,
4727 >             BiFunction<? super T,? super U,? extends V> fn,
4728 >             Executor executor) {
4729 >            return cf.thenCombineAsync(other, fn, executor); }
4730 >        public <U> CompletionStage<Void> thenAcceptBoth
4731 >            (CompletionStage<? extends U> other,
4732 >             BiConsumer<? super T, ? super U> action) {
4733 >            return cf.thenAcceptBoth(other, action); }
4734 >        public <U> CompletionStage<Void> thenAcceptBothAsync
4735 >            (CompletionStage<? extends U> other,
4736 >             BiConsumer<? super T, ? super U> action) {
4737 >            return cf.thenAcceptBothAsync(other, action); }
4738 >        public <U> CompletionStage<Void> thenAcceptBothAsync
4739 >            (CompletionStage<? extends U> other,
4740 >             BiConsumer<? super T, ? super U> action,
4741 >             Executor executor) {
4742 >            return cf.thenAcceptBothAsync(other, action, executor); }
4743 >        public CompletionStage<Void> runAfterBoth
4744 >            (CompletionStage<?> other,
4745 >             Runnable action) {
4746 >            return cf.runAfterBoth(other, action); }
4747 >        public CompletionStage<Void> runAfterBothAsync
4748 >            (CompletionStage<?> other,
4749 >             Runnable action) {
4750 >            return cf.runAfterBothAsync(other, action); }
4751 >        public CompletionStage<Void> runAfterBothAsync
4752 >            (CompletionStage<?> other,
4753 >             Runnable action,
4754 >             Executor executor) {
4755 >            return cf.runAfterBothAsync(other, action, executor); }
4756 >        public <U> CompletionStage<U> applyToEither
4757 >            (CompletionStage<? extends T> other,
4758 >             Function<? super T, U> fn) {
4759 >            return cf.applyToEither(other, fn); }
4760 >        public <U> CompletionStage<U> applyToEitherAsync
4761 >            (CompletionStage<? extends T> other,
4762 >             Function<? super T, U> fn) {
4763 >            return cf.applyToEitherAsync(other, fn); }
4764 >        public <U> CompletionStage<U> applyToEitherAsync
4765 >            (CompletionStage<? extends T> other,
4766 >             Function<? super T, U> fn,
4767 >             Executor executor) {
4768 >            return cf.applyToEitherAsync(other, fn, executor); }
4769 >        public CompletionStage<Void> acceptEither
4770 >            (CompletionStage<? extends T> other,
4771 >             Consumer<? super T> action) {
4772 >            return cf.acceptEither(other, action); }
4773 >        public CompletionStage<Void> acceptEitherAsync
4774 >            (CompletionStage<? extends T> other,
4775 >             Consumer<? super T> action) {
4776 >            return cf.acceptEitherAsync(other, action); }
4777 >        public CompletionStage<Void> acceptEitherAsync
4778 >            (CompletionStage<? extends T> other,
4779 >             Consumer<? super T> action,
4780 >             Executor executor) {
4781 >            return cf.acceptEitherAsync(other, action, executor); }
4782 >        public CompletionStage<Void> runAfterEither
4783 >            (CompletionStage<?> other,
4784 >             Runnable action) {
4785 >            return cf.runAfterEither(other, action); }
4786 >        public CompletionStage<Void> runAfterEitherAsync
4787 >            (CompletionStage<?> other,
4788 >             Runnable action) {
4789 >            return cf.runAfterEitherAsync(other, action); }
4790 >        public CompletionStage<Void> runAfterEitherAsync
4791 >            (CompletionStage<?> other,
4792 >             Runnable action,
4793 >             Executor executor) {
4794 >            return cf.runAfterEitherAsync(other, action, executor); }
4795 >        public <U> CompletionStage<U> thenCompose
4796 >            (Function<? super T, ? extends CompletionStage<U>> fn) {
4797 >            return cf.thenCompose(fn); }
4798 >        public <U> CompletionStage<U> thenComposeAsync
4799 >            (Function<? super T, ? extends CompletionStage<U>> fn) {
4800 >            return cf.thenComposeAsync(fn); }
4801 >        public <U> CompletionStage<U> thenComposeAsync
4802 >            (Function<? super T, ? extends CompletionStage<U>> fn,
4803 >             Executor executor) {
4804 >            return cf.thenComposeAsync(fn, executor); }
4805 >        public <U> CompletionStage<U> handle
4806 >            (BiFunction<? super T, Throwable, ? extends U> fn) {
4807 >            return cf.handle(fn); }
4808 >        public <U> CompletionStage<U> handleAsync
4809 >            (BiFunction<? super T, Throwable, ? extends U> fn) {
4810 >            return cf.handleAsync(fn); }
4811 >        public <U> CompletionStage<U> handleAsync
4812 >            (BiFunction<? super T, Throwable, ? extends U> fn,
4813 >             Executor executor) {
4814 >            return cf.handleAsync(fn, executor); }
4815 >        public CompletionStage<T> whenComplete
4816 >            (BiConsumer<? super T, ? super Throwable> action) {
4817 >            return cf.whenComplete(action); }
4818 >        public CompletionStage<T> whenCompleteAsync
4819 >            (BiConsumer<? super T, ? super Throwable> action) {
4820 >            return cf.whenCompleteAsync(action); }
4821 >        public CompletionStage<T> whenCompleteAsync
4822 >            (BiConsumer<? super T, ? super Throwable> action,
4823 >             Executor executor) {
4824 >            return cf.whenCompleteAsync(action, executor); }
4825 >        public CompletionStage<T> exceptionally
4826 >            (Function<Throwable, ? extends T> fn) {
4827 >            return cf.exceptionally(fn); }
4828      }
4829  
4830      /**
4831 <     * whenComplete action executes on normal completion, propagating
4832 <     * source result.
4831 >     * default-implemented exceptionallyAsync action is not invoked when
4832 >     * source completes normally, and source result is propagated
4833       */
4834 <    public void testWhenComplete_normalCompletion1() {
3529 <        for (ExecutionMode m : ExecutionMode.values())
4834 >    public void testDefaultExceptionallyAsync_normalCompletion() {
4835          for (boolean createIncomplete : new boolean[] { true, false })
4836          for (Integer v1 : new Integer[] { 1, null })
4837      {
3533        final AtomicInteger a = new AtomicInteger(0);
4838          final CompletableFuture<Integer> f = new CompletableFuture<>();
4839 <        if (!createIncomplete) f.complete(v1);
4840 <        final CompletableFuture<Integer> g = m.whenComplete
4841 <            (f,
4842 <             (Integer x, Throwable t) -> {
4843 <                threadAssertSame(x, v1);
4844 <                threadAssertNull(t);
4845 <                a.getAndIncrement();
4839 >        final DelegatedCompletionStage<Integer> d =
4840 >            new DelegatedCompletionStage<Integer>(f);
4841 >        if (!createIncomplete) assertTrue(f.complete(v1));
4842 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4843 >            ((Throwable t) -> {
4844 >                threadFail("should not be called");
4845 >                return null;            // unreached
4846              });
4847 <        if (createIncomplete) f.complete(v1);
4847 >        if (createIncomplete) assertTrue(f.complete(v1));
4848  
4849 <        checkCompletedNormally(g, v1);
3546 <        checkCompletedNormally(f, v1);
3547 <        assertEquals(1, a.get());
4849 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4850      }}
4851  
4852      /**
4853 <     * whenComplete action executes on exceptional completion, propagating
4854 <     * source result.
4853 >     * default-implemented exceptionallyAsync action completes with
4854 >     * function value on source exception
4855       */
4856 <    public void testWhenComplete_exceptionalCompletion() {
3555 <        for (ExecutionMode m : ExecutionMode.values())
4856 >    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4857          for (boolean createIncomplete : new boolean[] { true, false })
4858          for (Integer v1 : new Integer[] { 1, null })
4859      {
4860          final AtomicInteger a = new AtomicInteger(0);
4861          final CFException ex = new CFException();
4862          final CompletableFuture<Integer> f = new CompletableFuture<>();
4863 +        final DelegatedCompletionStage<Integer> d =
4864 +            new DelegatedCompletionStage<Integer>(f);
4865          if (!createIncomplete) f.completeExceptionally(ex);
4866 <        final CompletableFuture<Integer> g = m.whenComplete
4867 <            (f,
3565 <             (Integer x, Throwable t) -> {
3566 <                threadAssertNull(x);
4866 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4867 >            ((Throwable t) -> {
4868                  threadAssertSame(t, ex);
4869                  a.getAndIncrement();
4870 +                return v1;
4871              });
4872          if (createIncomplete) f.completeExceptionally(ex);
4873 <        checkCompletedWithWrappedCFException(f, ex);
4874 <        checkCompletedWithWrappedCFException(g, ex);
4873 >
4874 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4875          assertEquals(1, a.get());
4876      }}
4877  
4878      /**
4879 <     * whenComplete action executes on cancelled source, propagating
4880 <     * CancellationException.
4879 >     * Under default implementation, if an "exceptionally action"
4880 >     * throws an exception, it completes exceptionally with that
4881 >     * exception
4882       */
4883 <    public void testWhenComplete_sourceCancelled() {
3581 <        for (ExecutionMode m : ExecutionMode.values())
3582 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4883 >    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4884          for (boolean createIncomplete : new boolean[] { true, false })
4885      {
4886          final AtomicInteger a = new AtomicInteger(0);
4887 +        final CFException ex1 = new CFException();
4888 +        final CFException ex2 = new CFException();
4889          final CompletableFuture<Integer> f = new CompletableFuture<>();
4890 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
4891 <        final CompletableFuture<Integer> g = m.whenComplete
4892 <            (f,
4893 <             (Integer x, Throwable t) -> {
4894 <                threadAssertNull(x);
4895 <                threadAssertTrue(t instanceof CancellationException);
4890 >        final DelegatedCompletionStage<Integer> d =
4891 >            new DelegatedCompletionStage<Integer>(f);
4892 >        if (!createIncomplete) f.completeExceptionally(ex1);
4893 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4894 >            ((Throwable t) -> {
4895 >                threadAssertSame(t, ex1);
4896                  a.getAndIncrement();
4897 +                throw ex2;
4898              });
4899 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
4899 >        if (createIncomplete) f.completeExceptionally(ex1);
4900  
4901 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
4902 <        checkCompletedWithWrappedCancellationException(g);
4903 <        checkCancelled(f);
4901 >        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4902 >        checkCompletedExceptionally(f, ex1);
4903 >        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4904          assertEquals(1, a.get());
4905      }}
4906  
4907      /**
4908 <     * If a whenComplete action throws an exception when triggered by
4909 <     * a normal completion, it completes exceptionally
4908 >     * default-implemented exceptionallyCompose result completes
4909 >     * normally after normal completion of source
4910       */
4911 <    public void testWhenComplete_actionFailed() {
4911 >    public void testDefaultExceptionallyCompose_normalCompletion() {
4912          for (boolean createIncomplete : new boolean[] { true, false })
4913 <        for (ExecutionMode m : ExecutionMode.values())
4914 <        for (Integer v1 : new Integer[] { 1, null }) {
4913 >        for (Integer v1 : new Integer[] { 1, null })
4914 >    {
4915 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4916 >        final ExceptionalCompletableFutureFunction r =
4917 >            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4918 >        final DelegatedCompletionStage<Integer> d =
4919 >            new DelegatedCompletionStage<Integer>(f);
4920 >        if (!createIncomplete) assertTrue(f.complete(v1));
4921 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4922 >        if (createIncomplete) assertTrue(f.complete(v1));
4923  
4924 <        final AtomicInteger a = new AtomicInteger(0);
4924 >        checkCompletedNormally(f, v1);
4925 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4926 >        r.assertNotInvoked();
4927 >    }}
4928 >
4929 >    /**
4930 >     * default-implemented exceptionallyCompose result completes
4931 >     * normally after exceptional completion of source
4932 >     */
4933 >    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4934 >        for (boolean createIncomplete : new boolean[] { true, false })
4935 >    {
4936          final CFException ex = new CFException();
4937 +        final ExceptionalCompletableFutureFunction r =
4938 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4939          final CompletableFuture<Integer> f = new CompletableFuture<>();
4940 <        if (!createIncomplete) f.complete(v1);
4941 <        final CompletableFuture<Integer> g = m.whenComplete
4942 <            (f,
4943 <             (Integer x, Throwable t) -> {
4944 <                threadAssertSame(x, v1);
4945 <                threadAssertNull(t);
4946 <                a.getAndIncrement();
4947 <                throw ex;
4948 <            });
4949 <        if (createIncomplete) f.complete(v1);
4940 >        final DelegatedCompletionStage<Integer> d =
4941 >            new DelegatedCompletionStage<Integer>(f);
4942 >        if (!createIncomplete) f.completeExceptionally(ex);
4943 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4944 >        if (createIncomplete) f.completeExceptionally(ex);
4945 >
4946 >        checkCompletedExceptionally(f, ex);
4947 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
4948 >        r.assertInvoked();
4949 >    }}
4950 >
4951 >    /**
4952 >     * default-implemented exceptionallyCompose completes
4953 >     * exceptionally on exception if action does
4954 >     */
4955 >    public void testDefaultExceptionallyCompose_actionFailed() {
4956 >        for (boolean createIncomplete : new boolean[] { true, false })
4957 >    {
4958 >        final CFException ex = new CFException();
4959 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4960 >        final FailingExceptionalCompletableFutureFunction r
4961 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4962 >        final DelegatedCompletionStage<Integer> d =
4963 >            new DelegatedCompletionStage<Integer>(f);
4964 >        if (!createIncomplete) f.completeExceptionally(ex);
4965 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4966 >        if (createIncomplete) f.completeExceptionally(ex);
4967 >
4968 >        checkCompletedExceptionally(f, ex);
4969 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4970 >        r.assertInvoked();
4971 >    }}
4972 >
4973 >    /**
4974 >     * default-implemented exceptionallyComposeAsync result completes
4975 >     * normally after normal completion of source
4976 >     */
4977 >    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4978 >        for (boolean createIncomplete : new boolean[] { true, false })
4979 >        for (Integer v1 : new Integer[] { 1, null })
4980 >    {
4981 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4982 >        final ExceptionalCompletableFutureFunction r =
4983 >            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4984 >        final DelegatedCompletionStage<Integer> d =
4985 >            new DelegatedCompletionStage<Integer>(f);
4986 >        if (!createIncomplete) assertTrue(f.complete(v1));
4987 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4988 >        if (createIncomplete) assertTrue(f.complete(v1));
4989 >
4990          checkCompletedNormally(f, v1);
4991 <        checkCompletedWithWrappedCFException(g, ex);
4992 <        assertEquals(1, a.get());
4993 <        }
3629 <    }
4991 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4992 >        r.assertNotInvoked();
4993 >    }}
4994  
4995      /**
4996 <     * If a whenComplete action throws an exception when triggered by
4997 <     * a source completion that also throws an exception, the source
3634 <     * exception takes precedence.
4996 >     * default-implemented exceptionallyComposeAsync result completes
4997 >     * normally after exceptional completion of source
4998       */
4999 <    public void testWhenComplete_actionFailedSourceFailed() {
4999 >    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
5000          for (boolean createIncomplete : new boolean[] { true, false })
5001 <        for (ExecutionMode m : ExecutionMode.values())
5002 <        for (Integer v1 : new Integer[] { 1, null }) {
5001 >    {
5002 >        final CFException ex = new CFException();
5003 >        final ExceptionalCompletableFutureFunction r =
5004 >            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5006 >        final DelegatedCompletionStage<Integer> d =
5007 >            new DelegatedCompletionStage<Integer>(f);
5008 >        if (!createIncomplete) f.completeExceptionally(ex);
5009 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5010 >        if (createIncomplete) f.completeExceptionally(ex);
5011  
5012 <        final AtomicInteger a = new AtomicInteger(0);
5013 <        final CFException ex1 = new CFException();
5014 <        final CFException ex2 = new CFException();
5012 >        checkCompletedExceptionally(f, ex);
5013 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
5014 >        r.assertInvoked();
5015 >    }}
5016 >
5017 >    /**
5018 >     * default-implemented exceptionallyComposeAsync completes
5019 >     * exceptionally on exception if action does
5020 >     */
5021 >    public void testDefaultExceptionallyComposeAsync_actionFailed() {
5022 >        for (boolean createIncomplete : new boolean[] { true, false })
5023 >    {
5024 >        final CFException ex = new CFException();
5025          final CompletableFuture<Integer> f = new CompletableFuture<>();
5026 +        final FailingExceptionalCompletableFutureFunction r
5027 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5028 +        final DelegatedCompletionStage<Integer> d =
5029 +            new DelegatedCompletionStage<Integer>(f);
5030 +        if (!createIncomplete) f.completeExceptionally(ex);
5031 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5032 +        if (createIncomplete) f.completeExceptionally(ex);
5033  
5034 <        if (!createIncomplete) f.completeExceptionally(ex1);
5035 <        final CompletableFuture<Integer> g = m.whenComplete
5036 <            (f,
5037 <             (Integer x, Throwable t) -> {
3650 <                threadAssertSame(t, ex1);
3651 <                threadAssertNull(x);
3652 <                a.getAndIncrement();
3653 <                throw ex2;
3654 <            });
3655 <        if (createIncomplete) f.completeExceptionally(ex1);
5034 >        checkCompletedExceptionally(f, ex);
5035 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5036 >        r.assertInvoked();
5037 >    }}
5038  
5039 <        checkCompletedWithWrappedCFException(f, ex1);
5040 <        checkCompletedWithWrappedCFException(g, ex1);
5041 <        assertEquals(1, a.get());
5042 <        }
5043 <    }
5039 >    /**
5040 >     * default-implemented exceptionallyComposeAsync result completes
5041 >     * normally after normal completion of source
5042 >     */
5043 >    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5044 >        for (boolean createIncomplete : new boolean[] { true, false })
5045 >        for (Integer v1 : new Integer[] { 1, null })
5046 >    {
5047 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5048 >        final ExceptionalCompletableFutureFunction r =
5049 >            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5050 >        final DelegatedCompletionStage<Integer> d =
5051 >            new DelegatedCompletionStage<Integer>(f);
5052 >        if (!createIncomplete) assertTrue(f.complete(v1));
5053 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5054 >        if (createIncomplete) assertTrue(f.complete(v1));
5055 >
5056 >        checkCompletedNormally(f, v1);
5057 >        checkCompletedNormally(g.toCompletableFuture(), v1);
5058 >        r.assertNotInvoked();
5059 >    }}
5060 >
5061 >    /**
5062 >     * default-implemented exceptionallyComposeAsync result completes
5063 >     * normally after exceptional completion of source
5064 >     */
5065 >    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5066 >        for (boolean createIncomplete : new boolean[] { true, false })
5067 >    {
5068 >        final CFException ex = new CFException();
5069 >        final ExceptionalCompletableFutureFunction r =
5070 >            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5071 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5072 >        final DelegatedCompletionStage<Integer> d =
5073 >            new DelegatedCompletionStage<Integer>(f);
5074 >        if (!createIncomplete) f.completeExceptionally(ex);
5075 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5076 >        if (createIncomplete) f.completeExceptionally(ex);
5077 >
5078 >        checkCompletedExceptionally(f, ex);
5079 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
5080 >        r.assertInvoked();
5081 >    }}
5082 >
5083 >    /**
5084 >     * default-implemented exceptionallyComposeAsync completes
5085 >     * exceptionally on exception if action does
5086 >     */
5087 >    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5088 >        for (boolean createIncomplete : new boolean[] { true, false })
5089 >    {
5090 >        final CFException ex = new CFException();
5091 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5092 >        final FailingExceptionalCompletableFutureFunction r
5093 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5094 >        final DelegatedCompletionStage<Integer> d =
5095 >            new DelegatedCompletionStage<Integer>(f);
5096 >        if (!createIncomplete) f.completeExceptionally(ex);
5097 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5098 >        if (createIncomplete) f.completeExceptionally(ex);
5099 >
5100 >        checkCompletedExceptionally(f, ex);
5101 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5102 >        r.assertInvoked();
5103 >    }}
5104  
5105   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines