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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines