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.45 by jsr166, Mon Jun 2 06:07:34 2014 UTC vs.
Revision 1.138 by jsr166, Sun Nov 15 23:31:51 2015 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.TimeoutException;
34 + import java.util.concurrent.TimeUnit;
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.AssertionFailedError;
45 + import junit.framework.Test;
46 + import junit.framework.TestSuite;
47  
48   public class CompletableFutureTest extends JSR166TestCase {
49  
50      public static void main(String[] args) {
51 <        junit.textui.TestRunner.run(suite());
51 >        main(suite(), args);
52      }
53      public static Test suite() {
54          return new TestSuite(CompletableFutureTest.class);
# Line 42 | Line 59 | public class CompletableFutureTest exten
59      void checkIncomplete(CompletableFuture<?> f) {
60          assertFalse(f.isDone());
61          assertFalse(f.isCancelled());
62 <        assertTrue(f.toString().contains("[Not completed]"));
62 >        assertTrue(f.toString().contains("Not completed"));
63          try {
64              assertNull(f.getNow(null));
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 55 | Line 72 | public class CompletableFutureTest exten
72      }
73  
74      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
75 <        try {
76 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
60 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
75 >        checkTimedGet(f, value);
76 >
77          try {
78              assertEquals(value, f.join());
79          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 73 | Line 89 | public class CompletableFutureTest exten
89          assertTrue(f.toString().contains("[Completed normally]"));
90      }
91  
92 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
93 <        try {
94 <            f.get(LONG_DELAY_MS, MILLISECONDS);
95 <            shouldThrow();
96 <        } catch (ExecutionException success) {
97 <            assertTrue(success.getCause() instanceof CFException);
98 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
99 <        try {
100 <            f.join();
101 <            shouldThrow();
102 <        } catch (CompletionException success) {
103 <            assertTrue(success.getCause() instanceof CFException);
104 <        }
105 <        try {
106 <            f.getNow(null);
107 <            shouldThrow();
108 <        } catch (CompletionException success) {
93 <            assertTrue(success.getCause() instanceof CFException);
92 >    /**
93 >     * Returns the "raw" internal exceptional completion of f,
94 >     * without any additional wrapping with CompletionException.
95 >     */
96 >    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
97 >        // handle (and whenComplete) can distinguish between "direct"
98 >        // and "wrapped" exceptional completion
99 >        return f.handle((U u, Throwable t) -> t).join();
100 >    }
101 >
102 >    void checkCompletedExceptionally(CompletableFuture<?> f,
103 >                                     boolean wrapped,
104 >                                     Consumer<Throwable> checker) {
105 >        Throwable cause = exceptionalCompletion(f);
106 >        if (wrapped) {
107 >            assertTrue(cause instanceof CompletionException);
108 >            cause = cause.getCause();
109          }
110 <        try {
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]"));
104 <    }
110 >        checker.accept(cause);
111  
112 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
107 <                                              CFException ex) {
112 >        long startTime = System.nanoTime();
113          try {
114              f.get(LONG_DELAY_MS, MILLISECONDS);
115              shouldThrow();
116          } catch (ExecutionException success) {
117 <            assertSame(ex, success.getCause());
117 >            assertSame(cause, success.getCause());
118          } catch (Throwable fail) { threadUnexpectedException(fail); }
119 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
120 +
121          try {
122              f.join();
123              shouldThrow();
124          } catch (CompletionException success) {
125 <            assertSame(ex, success.getCause());
126 <        }
125 >            assertSame(cause, success.getCause());
126 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
127 >
128          try {
129              f.getNow(null);
130              shouldThrow();
131          } catch (CompletionException success) {
132 <            assertSame(ex, success.getCause());
133 <        }
132 >            assertSame(cause, success.getCause());
133 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
134 >
135          try {
136              f.get();
137              shouldThrow();
138          } catch (ExecutionException success) {
139 <            assertSame(ex, success.getCause());
139 >            assertSame(cause, success.getCause());
140          } catch (Throwable fail) { threadUnexpectedException(fail); }
141 <        assertTrue(f.isDone());
141 >
142          assertFalse(f.isCancelled());
143 +        assertTrue(f.isDone());
144 +        assertTrue(f.isCompletedExceptionally());
145          assertTrue(f.toString().contains("[Completed exceptionally]"));
146      }
147  
148 +    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
149 +        checkCompletedExceptionally(f, true,
150 +            (t) -> assertTrue(t instanceof CFException));
151 +    }
152 +
153 +    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
154 +        checkCompletedExceptionally(f, true,
155 +            (t) -> assertTrue(t instanceof CancellationException));
156 +    }
157 +
158 +    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
159 +        checkCompletedExceptionally(f, false,
160 +            (t) -> assertTrue(t instanceof TimeoutException));
161 +    }
162 +
163 +    void checkCompletedWithWrappedException(CompletableFuture<?> f,
164 +                                            Throwable ex) {
165 +        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
166 +    }
167 +
168 +    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
169 +        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
170 +    }
171 +
172      void checkCancelled(CompletableFuture<?> f) {
173 +        long startTime = System.nanoTime();
174          try {
175              f.get(LONG_DELAY_MS, MILLISECONDS);
176              shouldThrow();
177          } catch (CancellationException success) {
178          } catch (Throwable fail) { threadUnexpectedException(fail); }
179 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
180 +
181          try {
182              f.join();
183              shouldThrow();
# Line 153 | Line 191 | public class CompletableFutureTest exten
191              shouldThrow();
192          } catch (CancellationException success) {
193          } 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    }
194  
195 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
196 <        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); }
195 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
196 >
197          assertTrue(f.isDone());
188        assertFalse(f.isCancelled());
198          assertTrue(f.isCompletedExceptionally());
199 +        assertTrue(f.isCancelled());
200          assertTrue(f.toString().contains("[Completed exceptionally]"));
201      }
202  
# Line 204 | Line 214 | public class CompletableFutureTest exten
214       * isCancelled, join, get, and getNow
215       */
216      public void testComplete() {
217 +        for (Integer v1 : new Integer[] { 1, null })
218 +    {
219          CompletableFuture<Integer> f = new CompletableFuture<>();
220          checkIncomplete(f);
221 <        f.complete(one);
222 <        checkCompletedNormally(f, one);
223 <    }
221 >        assertTrue(f.complete(v1));
222 >        assertFalse(f.complete(v1));
223 >        checkCompletedNormally(f, v1);
224 >    }}
225  
226      /**
227       * completeExceptionally completes exceptionally, as indicated by
# Line 216 | Line 229 | public class CompletableFutureTest exten
229       */
230      public void testCompleteExceptionally() {
231          CompletableFuture<Integer> f = new CompletableFuture<>();
232 +        CFException ex = new CFException();
233          checkIncomplete(f);
234 <        f.completeExceptionally(new CFException());
235 <        checkCompletedWithWrappedCFException(f);
234 >        f.completeExceptionally(ex);
235 >        checkCompletedExceptionally(f, ex);
236      }
237  
238      /**
# Line 226 | Line 240 | public class CompletableFutureTest exten
240       * methods isDone, isCancelled, join, get, and getNow
241       */
242      public void testCancel() {
243 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
244 +    {
245          CompletableFuture<Integer> f = new CompletableFuture<>();
246          checkIncomplete(f);
247 <        assertTrue(f.cancel(true));
247 >        assertTrue(f.cancel(mayInterruptIfRunning));
248 >        assertTrue(f.cancel(mayInterruptIfRunning));
249 >        assertTrue(f.cancel(!mayInterruptIfRunning));
250          checkCancelled(f);
251 <    }
251 >    }}
252  
253      /**
254       * obtrudeValue forces completion with given value
# Line 238 | Line 256 | public class CompletableFutureTest exten
256      public void testObtrudeValue() {
257          CompletableFuture<Integer> f = new CompletableFuture<>();
258          checkIncomplete(f);
259 <        f.complete(one);
259 >        assertTrue(f.complete(one));
260          checkCompletedNormally(f, one);
261          f.obtrudeValue(three);
262          checkCompletedNormally(f, three);
# Line 247 | Line 265 | public class CompletableFutureTest exten
265          f = new CompletableFuture<>();
266          f.obtrudeValue(three);
267          checkCompletedNormally(f, three);
268 +        f.obtrudeValue(null);
269 +        checkCompletedNormally(f, null);
270          f = new CompletableFuture<>();
271          f.completeExceptionally(new CFException());
272          f.obtrudeValue(four);
# Line 257 | Line 277 | public class CompletableFutureTest exten
277       * obtrudeException forces completion with given exception
278       */
279      public void testObtrudeException() {
280 <        CompletableFuture<Integer> f = new CompletableFuture<>();
281 <        checkIncomplete(f);
282 <        f.complete(one);
283 <        checkCompletedNormally(f, one);
284 <        f.obtrudeException(new CFException());
265 <        checkCompletedWithWrappedCFException(f);
280 >        for (Integer v1 : new Integer[] { 1, null })
281 >    {
282 >        CFException ex;
283 >        CompletableFuture<Integer> f;
284 >
285          f = new CompletableFuture<>();
286 <        f.obtrudeException(new CFException());
287 <        checkCompletedWithWrappedCFException(f);
286 >        assertTrue(f.complete(v1));
287 >        for (int i = 0; i < 2; i++) {
288 >            f.obtrudeException(ex = new CFException());
289 >            checkCompletedExceptionally(f, ex);
290 >        }
291 >
292 >        f = new CompletableFuture<>();
293 >        for (int i = 0; i < 2; i++) {
294 >            f.obtrudeException(ex = new CFException());
295 >            checkCompletedExceptionally(f, ex);
296 >        }
297 >
298          f = new CompletableFuture<>();
299 +        f.completeExceptionally(ex = new CFException());
300 +        f.obtrudeValue(v1);
301 +        checkCompletedNormally(f, v1);
302 +        f.obtrudeException(ex = new CFException());
303 +        checkCompletedExceptionally(f, ex);
304          f.completeExceptionally(new CFException());
305 <        f.obtrudeValue(four);
306 <        checkCompletedNormally(f, four);
307 <        f.obtrudeException(new CFException());
308 <        checkCompletedWithWrappedCFException(f);
275 <    }
305 >        checkCompletedExceptionally(f, ex);
306 >        assertFalse(f.complete(v1));
307 >        checkCompletedExceptionally(f, ex);
308 >    }}
309  
310      /**
311       * getNumberOfDependents returns number of dependent tasks
312       */
313      public void testGetNumberOfDependents() {
314 +        for (ExecutionMode m : ExecutionMode.values())
315 +        for (Integer v1 : new Integer[] { 1, null })
316 +    {
317          CompletableFuture<Integer> f = new CompletableFuture<>();
318 <        assertEquals(f.getNumberOfDependents(), 0);
319 <        CompletableFuture g = f.thenRun(new Noop());
320 <        assertEquals(f.getNumberOfDependents(), 1);
321 <        assertEquals(g.getNumberOfDependents(), 0);
322 <        CompletableFuture h = f.thenRun(new Noop());
323 <        assertEquals(f.getNumberOfDependents(), 2);
324 <        f.complete(1);
318 >        assertEquals(0, f.getNumberOfDependents());
319 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
320 >        assertEquals(1, f.getNumberOfDependents());
321 >        assertEquals(0, g.getNumberOfDependents());
322 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
323 >        assertEquals(2, f.getNumberOfDependents());
324 >        assertEquals(0, h.getNumberOfDependents());
325 >        assertTrue(f.complete(v1));
326          checkCompletedNormally(g, null);
327 <        assertEquals(f.getNumberOfDependents(), 0);
328 <        assertEquals(g.getNumberOfDependents(), 0);
329 <    }
327 >        checkCompletedNormally(h, null);
328 >        assertEquals(0, f.getNumberOfDependents());
329 >        assertEquals(0, g.getNumberOfDependents());
330 >        assertEquals(0, h.getNumberOfDependents());
331 >    }}
332  
333      /**
334       * toString indicates current completion state
# Line 300 | Line 339 | public class CompletableFutureTest exten
339          f = new CompletableFuture<String>();
340          assertTrue(f.toString().contains("[Not completed]"));
341  
342 <        f.complete("foo");
342 >        assertTrue(f.complete("foo"));
343          assertTrue(f.toString().contains("[Completed normally]"));
344  
345          f = new CompletableFuture<String>();
346 <        f.completeExceptionally(new IndexOutOfBoundsException());
346 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
347          assertTrue(f.toString().contains("[Completed exceptionally]"));
348 +
349 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
350 +            f = new CompletableFuture<String>();
351 +            assertTrue(f.cancel(mayInterruptIfRunning));
352 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
353 +        }
354      }
355  
356      /**
# Line 316 | Line 361 | public class CompletableFutureTest exten
361          checkCompletedNormally(f, "test");
362      }
363  
364 <    // Choose non-commutative actions for better coverage
364 >    abstract class CheckedAction {
365 >        int invocationCount = 0;
366 >        final ExecutionMode m;
367 >        CheckedAction(ExecutionMode m) { this.m = m; }
368 >        void invoked() {
369 >            m.checkExecutionMode();
370 >            assertEquals(0, invocationCount++);
371 >        }
372 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
373 >        void assertInvoked() { assertEquals(1, invocationCount); }
374 >    }
375  
376 <    // A non-commutative function that handles and produces null values as well.
377 <    static Integer subtract(Integer x, Integer y) {
378 <        return (x == null && y == null) ? null :
379 <            ((x == null) ? 42 : x.intValue())
380 <            - ((y == null) ? 99 : y.intValue());
376 >    abstract class CheckedIntegerAction extends CheckedAction {
377 >        Integer value;
378 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
379 >        void assertValue(Integer expected) {
380 >            assertInvoked();
381 >            assertEquals(expected, value);
382 >        }
383 >    }
384 >
385 >    class IntegerSupplier extends CheckedAction
386 >        implements Supplier<Integer>
387 >    {
388 >        final Integer value;
389 >        IntegerSupplier(ExecutionMode m, Integer value) {
390 >            super(m);
391 >            this.value = value;
392 >        }
393 >        public Integer get() {
394 >            invoked();
395 >            return value;
396 >        }
397      }
398  
399      // A function that handles and produces null values as well.
# Line 330 | Line 401 | public class CompletableFutureTest exten
401          return (x == null) ? null : x + 1;
402      }
403  
404 <    static final Supplier<Integer> supplyOne =
405 <        () -> Integer.valueOf(1);
406 <    static final Function<Integer, Integer> inc =
407 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
337 <    static final BiFunction<Integer, Integer, Integer> subtract =
338 <        (Integer x, Integer y) -> subtract(x, y);
339 <    static final class IncAction implements Consumer<Integer> {
340 <        int invocationCount = 0;
341 <        Integer value;
404 >    class NoopConsumer extends CheckedIntegerAction
405 >        implements Consumer<Integer>
406 >    {
407 >        NoopConsumer(ExecutionMode m) { super(m); }
408          public void accept(Integer x) {
409 <            invocationCount++;
410 <            value = inc(x);
409 >            invoked();
410 >            value = x;
411          }
412      }
413 <    static final class IncFunction implements Function<Integer,Integer> {
414 <        int invocationCount = 0;
415 <        Integer value;
413 >
414 >    class IncFunction extends CheckedIntegerAction
415 >        implements Function<Integer,Integer>
416 >    {
417 >        IncFunction(ExecutionMode m) { super(m); }
418          public Integer apply(Integer x) {
419 <            invocationCount++;
419 >            invoked();
420              return value = inc(x);
421          }
422      }
423 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
424 <        int invocationCount = 0;
425 <        Integer value;
426 <        // Check this action was invoked exactly once when result is computed.
423 >
424 >    // Choose non-commutative actions for better coverage
425 >    // A non-commutative function that handles and produces null values as well.
426 >    static Integer subtract(Integer x, Integer y) {
427 >        return (x == null && y == null) ? null :
428 >            ((x == null) ? 42 : x.intValue())
429 >            - ((y == null) ? 99 : y.intValue());
430 >    }
431 >
432 >    class SubtractAction extends CheckedIntegerAction
433 >        implements BiConsumer<Integer, Integer>
434 >    {
435 >        SubtractAction(ExecutionMode m) { super(m); }
436          public void accept(Integer x, Integer y) {
437 <            invocationCount++;
437 >            invoked();
438              value = subtract(x, y);
439          }
440      }
441 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
442 <        int invocationCount = 0;
443 <        Integer value;
444 <        // Check this action was invoked exactly once when result is computed.
441 >
442 >    class SubtractFunction extends CheckedIntegerAction
443 >        implements BiFunction<Integer, Integer, Integer>
444 >    {
445 >        SubtractFunction(ExecutionMode m) { super(m); }
446          public Integer apply(Integer x, Integer y) {
447 <            invocationCount++;
447 >            invoked();
448              return value = subtract(x, y);
449          }
450      }
451 <    static final class Noop implements Runnable {
452 <        int invocationCount = 0;
451 >
452 >    class Noop extends CheckedAction implements Runnable {
453 >        Noop(ExecutionMode m) { super(m); }
454          public void run() {
455 <            invocationCount++;
455 >            invoked();
456          }
457      }
458  
459 <    static final class FailingSupplier implements Supplier<Integer> {
460 <        int invocationCount = 0;
459 >    class FailingSupplier extends CheckedAction
460 >        implements Supplier<Integer>
461 >    {
462 >        FailingSupplier(ExecutionMode m) { super(m); }
463          public Integer get() {
464 <            invocationCount++;
464 >            invoked();
465              throw new CFException();
466          }
467      }
468 <    static final class FailingConsumer implements Consumer<Integer> {
469 <        int invocationCount = 0;
468 >
469 >    class FailingConsumer extends CheckedIntegerAction
470 >        implements Consumer<Integer>
471 >    {
472 >        FailingConsumer(ExecutionMode m) { super(m); }
473          public void accept(Integer x) {
474 <            invocationCount++;
474 >            invoked();
475 >            value = x;
476              throw new CFException();
477          }
478      }
479 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
480 <        int invocationCount = 0;
479 >
480 >    class FailingBiConsumer extends CheckedIntegerAction
481 >        implements BiConsumer<Integer, Integer>
482 >    {
483 >        FailingBiConsumer(ExecutionMode m) { super(m); }
484          public void accept(Integer x, Integer y) {
485 <            invocationCount++;
485 >            invoked();
486 >            value = subtract(x, y);
487              throw new CFException();
488          }
489      }
490 <    static final class FailingFunction implements Function<Integer, Integer> {
491 <        int invocationCount = 0;
490 >
491 >    class FailingFunction extends CheckedIntegerAction
492 >        implements Function<Integer, Integer>
493 >    {
494 >        FailingFunction(ExecutionMode m) { super(m); }
495          public Integer apply(Integer x) {
496 <            invocationCount++;
496 >            invoked();
497 >            value = x;
498              throw new CFException();
499          }
500      }
501 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
502 <        int invocationCount = 0;
501 >
502 >    class FailingBiFunction extends CheckedIntegerAction
503 >        implements BiFunction<Integer, Integer, Integer>
504 >    {
505 >        FailingBiFunction(ExecutionMode m) { super(m); }
506          public Integer apply(Integer x, Integer y) {
507 <            invocationCount++;
507 >            invoked();
508 >            value = subtract(x, y);
509              throw new CFException();
510          }
511      }
512 <    static final class FailingNoop implements Runnable {
513 <        int invocationCount = 0;
512 >
513 >    class FailingRunnable extends CheckedAction implements Runnable {
514 >        FailingRunnable(ExecutionMode m) { super(m); }
515          public void run() {
516 <            invocationCount++;
516 >            invoked();
517              throw new CFException();
518          }
519      }
520  
521 <    static final class CompletableFutureInc
522 <        implements Function<Integer, CompletableFuture<Integer>> {
523 <        int invocationCount = 0;
521 >    class CompletableFutureInc extends CheckedIntegerAction
522 >        implements Function<Integer, CompletableFuture<Integer>>
523 >    {
524 >        CompletableFutureInc(ExecutionMode m) { super(m); }
525          public CompletableFuture<Integer> apply(Integer x) {
526 <            invocationCount++;
526 >            invoked();
527 >            value = x;
528              CompletableFuture<Integer> f = new CompletableFuture<>();
529 <            f.complete(inc(x));
529 >            assertTrue(f.complete(inc(x)));
530              return f;
531          }
532      }
533  
534 <    static final class FailingCompletableFutureFunction
535 <        implements Function<Integer, CompletableFuture<Integer>> {
536 <        int invocationCount = 0;
534 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
535 >        implements Function<Integer, CompletableFuture<Integer>>
536 >    {
537 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
538          public CompletableFuture<Integer> apply(Integer x) {
539 <            invocationCount++;
539 >            invoked();
540 >            value = x;
541              throw new CFException();
542          }
543      }
544  
545      // Used for explicit executor tests
546      static final class ThreadExecutor implements Executor {
547 <        AtomicInteger count = new AtomicInteger(0);
547 >        final AtomicInteger count = new AtomicInteger(0);
548 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
549 >        static boolean startedCurrentThread() {
550 >            return Thread.currentThread().getThreadGroup() == tg;
551 >        }
552  
553          public void execute(Runnable r) {
554              count.getAndIncrement();
555 <            new Thread(r).start();
555 >            new Thread(tg, r).start();
556          }
557      }
558  
559 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
560 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
455 <    }
456 <
457 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
458 <        int invocationCount = 0;
459 <        public Integer apply(Integer x, Throwable t) {
460 <            invocationCount++;
461 <            return (t == null) ? two : three;
462 <        }
463 <    }
559 >    static final boolean defaultExecutorIsCommonPool
560 >        = ForkJoinPool.getCommonPoolParallelism() > 1;
561  
562      /**
563       * Permits the testing of parallel code for the 3 different
564 <     * execution modes without repeating all the testing code.
564 >     * execution modes without copy/pasting all the test methods.
565       */
566      enum ExecutionMode {
567 <        DEFAULT {
567 >        SYNC {
568 >            public void checkExecutionMode() {
569 >                assertFalse(ThreadExecutor.startedCurrentThread());
570 >                assertNull(ForkJoinTask.getPool());
571 >            }
572 >            public CompletableFuture<Void> runAsync(Runnable a) {
573 >                throw new UnsupportedOperationException();
574 >            }
575 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
576 >                throw new UnsupportedOperationException();
577 >            }
578 >            public <T> CompletableFuture<Void> thenRun
579 >                (CompletableFuture<T> f, Runnable a) {
580 >                return f.thenRun(a);
581 >            }
582 >            public <T> CompletableFuture<Void> thenAccept
583 >                (CompletableFuture<T> f, Consumer<? super T> a) {
584 >                return f.thenAccept(a);
585 >            }
586 >            public <T,U> CompletableFuture<U> thenApply
587 >                (CompletableFuture<T> f, Function<? super T,U> a) {
588 >                return f.thenApply(a);
589 >            }
590 >            public <T,U> CompletableFuture<U> thenCompose
591 >                (CompletableFuture<T> f,
592 >                 Function<? super T,? extends CompletionStage<U>> a) {
593 >                return f.thenCompose(a);
594 >            }
595 >            public <T,U> CompletableFuture<U> handle
596 >                (CompletableFuture<T> f,
597 >                 BiFunction<? super T,Throwable,? extends U> a) {
598 >                return f.handle(a);
599 >            }
600 >            public <T> CompletableFuture<T> whenComplete
601 >                (CompletableFuture<T> f,
602 >                 BiConsumer<? super T,? super Throwable> a) {
603 >                return f.whenComplete(a);
604 >            }
605              public <T,U> CompletableFuture<Void> runAfterBoth
606                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
607                  return f.runAfterBoth(g, a);
# Line 484 | Line 618 | public class CompletableFutureTest exten
618                   BiFunction<? super T,? super U,? extends V> a) {
619                  return f.thenCombine(g, a);
620              }
621 <            public <T,U> CompletableFuture<U> applyToEither
621 >            public <T> CompletableFuture<Void> runAfterEither
622                  (CompletableFuture<T> f,
623 <                 CompletionStage<? extends T> g,
624 <                 Function<? super T,U> a) {
625 <                return f.applyToEither(g, a);
623 >                 CompletionStage<?> g,
624 >                 java.lang.Runnable a) {
625 >                return f.runAfterEither(g, a);
626              }
627              public <T> CompletableFuture<Void> acceptEither
628                  (CompletableFuture<T> f,
# Line 496 | Line 630 | public class CompletableFutureTest exten
630                   Consumer<? super T> a) {
631                  return f.acceptEither(g, a);
632              }
633 <            public <T> CompletableFuture<Void> runAfterEither
633 >            public <T,U> CompletableFuture<U> applyToEither
634                  (CompletableFuture<T> f,
635 <                 CompletionStage<?> g,
636 <                 java.lang.Runnable a) {
637 <                return f.runAfterEither(g, a);
635 >                 CompletionStage<? extends T> g,
636 >                 Function<? super T,U> a) {
637 >                return f.applyToEither(g, a);
638 >            }
639 >        },
640 >
641 >        ASYNC {
642 >            public void checkExecutionMode() {
643 >                assertEquals(defaultExecutorIsCommonPool,
644 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
645 >            }
646 >            public CompletableFuture<Void> runAsync(Runnable a) {
647 >                return CompletableFuture.runAsync(a);
648 >            }
649 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
650 >                return CompletableFuture.supplyAsync(a);
651 >            }
652 >            public <T> CompletableFuture<Void> thenRun
653 >                (CompletableFuture<T> f, Runnable a) {
654 >                return f.thenRunAsync(a);
655 >            }
656 >            public <T> CompletableFuture<Void> thenAccept
657 >                (CompletableFuture<T> f, Consumer<? super T> a) {
658 >                return f.thenAcceptAsync(a);
659 >            }
660 >            public <T,U> CompletableFuture<U> thenApply
661 >                (CompletableFuture<T> f, Function<? super T,U> a) {
662 >                return f.thenApplyAsync(a);
663              }
664              public <T,U> CompletableFuture<U> thenCompose
665                  (CompletableFuture<T> f,
666                   Function<? super T,? extends CompletionStage<U>> a) {
667 <                return f.thenCompose(a);
667 >                return f.thenComposeAsync(a);
668 >            }
669 >            public <T,U> CompletableFuture<U> handle
670 >                (CompletableFuture<T> f,
671 >                 BiFunction<? super T,Throwable,? extends U> a) {
672 >                return f.handleAsync(a);
673              }
674              public <T> CompletableFuture<T> whenComplete
675                  (CompletableFuture<T> f,
676                   BiConsumer<? super T,? super Throwable> a) {
677 <                return f.whenComplete(a);
677 >                return f.whenCompleteAsync(a);
678              }
515        },
516
517        DEFAULT_ASYNC {
679              public <T,U> CompletableFuture<Void> runAfterBoth
680                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
681                  return f.runAfterBothAsync(g, a);
# Line 531 | Line 692 | public class CompletableFutureTest exten
692                   BiFunction<? super T,? super U,? extends V> a) {
693                  return f.thenCombineAsync(g, a);
694              }
695 <            public <T,U> CompletableFuture<U> applyToEither
695 >            public <T> CompletableFuture<Void> runAfterEither
696                  (CompletableFuture<T> f,
697 <                 CompletionStage<? extends T> g,
698 <                 Function<? super T,U> a) {
699 <                return f.applyToEitherAsync(g, a);
697 >                 CompletionStage<?> g,
698 >                 java.lang.Runnable a) {
699 >                return f.runAfterEitherAsync(g, a);
700              }
701              public <T> CompletableFuture<Void> acceptEither
702                  (CompletableFuture<T> f,
# Line 543 | Line 704 | public class CompletableFutureTest exten
704                   Consumer<? super T> a) {
705                  return f.acceptEitherAsync(g, a);
706              }
707 <            public <T> CompletableFuture<Void> runAfterEither
707 >            public <T,U> CompletableFuture<U> applyToEither
708                  (CompletableFuture<T> f,
709 <                 CompletionStage<?> g,
710 <                 java.lang.Runnable a) {
711 <                return f.runAfterEitherAsync(g, a);
709 >                 CompletionStage<? extends T> g,
710 >                 Function<? super T,U> a) {
711 >                return f.applyToEitherAsync(g, a);
712 >            }
713 >        },
714 >
715 >        EXECUTOR {
716 >            public void checkExecutionMode() {
717 >                assertTrue(ThreadExecutor.startedCurrentThread());
718 >            }
719 >            public CompletableFuture<Void> runAsync(Runnable a) {
720 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
721 >            }
722 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
723 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
724 >            }
725 >            public <T> CompletableFuture<Void> thenRun
726 >                (CompletableFuture<T> f, Runnable a) {
727 >                return f.thenRunAsync(a, new ThreadExecutor());
728 >            }
729 >            public <T> CompletableFuture<Void> thenAccept
730 >                (CompletableFuture<T> f, Consumer<? super T> a) {
731 >                return f.thenAcceptAsync(a, new ThreadExecutor());
732 >            }
733 >            public <T,U> CompletableFuture<U> thenApply
734 >                (CompletableFuture<T> f, Function<? super T,U> a) {
735 >                return f.thenApplyAsync(a, new ThreadExecutor());
736              }
737              public <T,U> CompletableFuture<U> thenCompose
738                  (CompletableFuture<T> f,
739                   Function<? super T,? extends CompletionStage<U>> a) {
740 <                return f.thenComposeAsync(a);
740 >                return f.thenComposeAsync(a, new ThreadExecutor());
741 >            }
742 >            public <T,U> CompletableFuture<U> handle
743 >                (CompletableFuture<T> f,
744 >                 BiFunction<? super T,Throwable,? extends U> a) {
745 >                return f.handleAsync(a, new ThreadExecutor());
746              }
747              public <T> CompletableFuture<T> whenComplete
748                  (CompletableFuture<T> f,
749                   BiConsumer<? super T,? super Throwable> a) {
750 <                return f.whenCompleteAsync(a);
750 >                return f.whenCompleteAsync(a, new ThreadExecutor());
751              }
562        },
563
564        EXECUTOR {
752              public <T,U> CompletableFuture<Void> runAfterBoth
753                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
754                  return f.runAfterBothAsync(g, a, new ThreadExecutor());
# Line 578 | Line 765 | public class CompletableFutureTest exten
765                   BiFunction<? super T,? super U,? extends V> a) {
766                  return f.thenCombineAsync(g, a, new ThreadExecutor());
767              }
581            public <T,U> CompletableFuture<U> applyToEither
582                (CompletableFuture<T> f,
583                 CompletionStage<? extends T> g,
584                 Function<? super T,U> a) {
585                return f.applyToEitherAsync(g, a, new ThreadExecutor());
586            }
587            public <T> CompletableFuture<Void> acceptEither
588                (CompletableFuture<T> f,
589                 CompletionStage<? extends T> g,
590                 Consumer<? super T> a) {
591                return f.acceptEitherAsync(g, a, new ThreadExecutor());
592            }
768              public <T> CompletableFuture<Void> runAfterEither
769                  (CompletableFuture<T> f,
770                   CompletionStage<?> g,
771                   java.lang.Runnable a) {
772                  return f.runAfterEitherAsync(g, a, new ThreadExecutor());
773              }
774 <            public <T,U> CompletableFuture<U> thenCompose
774 >            public <T> CompletableFuture<Void> acceptEither
775                  (CompletableFuture<T> f,
776 <                 Function<? super T,? extends CompletionStage<U>> a) {
777 <                return f.thenComposeAsync(a, new ThreadExecutor());
776 >                 CompletionStage<? extends T> g,
777 >                 Consumer<? super T> a) {
778 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
779              }
780 <            public <T> CompletableFuture<T> whenComplete
780 >            public <T,U> CompletableFuture<U> applyToEither
781                  (CompletableFuture<T> f,
782 <                 BiConsumer<? super T,? super Throwable> a) {
783 <                return f.whenCompleteAsync(a, new ThreadExecutor());
782 >                 CompletionStage<? extends T> g,
783 >                 Function<? super T,U> a) {
784 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
785              }
786          };
787  
788 +        public abstract void checkExecutionMode();
789 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
790 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
791 +        public abstract <T> CompletableFuture<Void> thenRun
792 +            (CompletableFuture<T> f, Runnable a);
793 +        public abstract <T> CompletableFuture<Void> thenAccept
794 +            (CompletableFuture<T> f, Consumer<? super T> a);
795 +        public abstract <T,U> CompletableFuture<U> thenApply
796 +            (CompletableFuture<T> f, Function<? super T,U> a);
797 +        public abstract <T,U> CompletableFuture<U> thenCompose
798 +            (CompletableFuture<T> f,
799 +             Function<? super T,? extends CompletionStage<U>> a);
800 +        public abstract <T,U> CompletableFuture<U> handle
801 +            (CompletableFuture<T> f,
802 +             BiFunction<? super T,Throwable,? extends U> a);
803 +        public abstract <T> CompletableFuture<T> whenComplete
804 +            (CompletableFuture<T> f,
805 +             BiConsumer<? super T,? super Throwable> a);
806          public abstract <T,U> CompletableFuture<Void> runAfterBoth
807              (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
808          public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
# Line 618 | Line 813 | public class CompletableFutureTest exten
813              (CompletableFuture<T> f,
814               CompletionStage<? extends U> g,
815               BiFunction<? super T,? super U,? extends V> a);
621        public abstract <T,U> CompletableFuture<U> applyToEither
622            (CompletableFuture<T> f,
623             CompletionStage<? extends T> g,
624             Function<? super T,U> a);
625        public abstract <T> CompletableFuture<Void> acceptEither
626            (CompletableFuture<T> f,
627             CompletionStage<? extends T> g,
628             Consumer<? super T> a);
816          public abstract <T> CompletableFuture<Void> runAfterEither
817              (CompletableFuture<T> f,
818               CompletionStage<?> g,
819               java.lang.Runnable a);
820 <        public abstract <T,U> CompletableFuture<U> thenCompose
820 >        public abstract <T> CompletableFuture<Void> acceptEither
821              (CompletableFuture<T> f,
822 <             Function<? super T,? extends CompletionStage<U>> a);
823 <        public abstract <T> CompletableFuture<T> whenComplete
822 >             CompletionStage<? extends T> g,
823 >             Consumer<? super T> a);
824 >        public abstract <T,U> CompletableFuture<U> applyToEither
825              (CompletableFuture<T> f,
826 <             BiConsumer<? super T,? super Throwable> a);
827 <
640 <
641 <    }
642 <
643 <    /**
644 <     * exceptionally action completes with function value on source
645 <     * exception; otherwise with source value
646 <     */
647 <    public void testExceptionally() {
648 <        CompletableFuture<Integer> f = new CompletableFuture<>();
649 <        ExceptionToInteger r = new ExceptionToInteger();
650 <        CompletableFuture<Integer> g = f.exceptionally(r);
651 <        f.completeExceptionally(new CFException());
652 <        checkCompletedNormally(g, three);
653 <
654 <        f = new CompletableFuture<>();
655 <        r = new ExceptionToInteger();
656 <        g = f.exceptionally(r);
657 <        f.complete(one);
658 <        checkCompletedNormally(g, one);
659 <    }
660 <
661 <    /**
662 <     * handle action completes normally with function value on either
663 <     * normal or exceptional completion of source
664 <     */
665 <    public void testHandle() {
666 <        CompletableFuture<Integer> f, g;
667 <        IntegerHandler r;
668 <
669 <        f = new CompletableFuture<>();
670 <        f.completeExceptionally(new CFException());
671 <        g = f.handle(r = new IntegerHandler());
672 <        assertEquals(1, r.invocationCount);
673 <        assertEquals(1, r.invocationCount);
674 <        checkCompletedNormally(g, three);
675 <
676 <        f = new CompletableFuture<>();
677 <        g = f.handle(r = new IntegerHandler());
678 <        assertEquals(0, r.invocationCount);
679 <        f.completeExceptionally(new CFException());
680 <        checkCompletedNormally(g, three);
681 <        assertEquals(1, r.invocationCount);
682 <
683 <        f = new CompletableFuture<>();
684 <        f.complete(one);
685 <        g = f.handle(r = new IntegerHandler());
686 <        assertEquals(1, r.invocationCount);
687 <        checkCompletedNormally(g, two);
688 <
689 <        f = new CompletableFuture<>();
690 <        g = f.handle(r = new IntegerHandler());
691 <        assertEquals(0, r.invocationCount);
692 <        f.complete(one);
693 <        assertEquals(1, r.invocationCount);
694 <        checkCompletedNormally(g, two);
695 <    }
696 <
697 <    /**
698 <     * runAsync completes after running Runnable
699 <     */
700 <    public void testRunAsync() {
701 <        Noop r = new Noop();
702 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
703 <        assertNull(f.join());
704 <        assertEquals(1, r.invocationCount);
705 <        checkCompletedNormally(f, null);
706 <    }
707 <
708 <    /**
709 <     * runAsync with executor completes after running Runnable
710 <     */
711 <    public void testRunAsync2() {
712 <        Noop r = new Noop();
713 <        ThreadExecutor exec = new ThreadExecutor();
714 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
715 <        assertNull(f.join());
716 <        assertEquals(1, r.invocationCount);
717 <        checkCompletedNormally(f, null);
718 <        assertEquals(1, exec.count.get());
719 <    }
720 <
721 <    /**
722 <     * failing runAsync completes exceptionally after running Runnable
723 <     */
724 <    public void testRunAsync3() {
725 <        FailingNoop r = new FailingNoop();
726 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
727 <        checkCompletedWithWrappedCFException(f);
728 <        assertEquals(1, r.invocationCount);
826 >             CompletionStage<? extends T> g,
827 >             Function<? super T,U> a);
828      }
829  
830      /**
831 <     * supplyAsync completes with result of supplier
831 >     * exceptionally action is not invoked when source completes
832 >     * normally, and source result is propagated
833       */
834 <    public void testSupplyAsync() {
835 <        CompletableFuture<Integer> f;
836 <        f = CompletableFuture.supplyAsync(supplyOne);
837 <        assertEquals(f.join(), one);
838 <        checkCompletedNormally(f, one);
839 <    }
834 >    public void testExceptionally_normalCompletion() {
835 >        for (boolean createIncomplete : new boolean[] { true, false })
836 >        for (Integer v1 : new Integer[] { 1, null })
837 >    {
838 >        final AtomicInteger a = new AtomicInteger(0);
839 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
840 >        if (!createIncomplete) assertTrue(f.complete(v1));
841 >        final CompletableFuture<Integer> g = f.exceptionally
842 >            ((Throwable t) -> {
843 >                a.getAndIncrement();
844 >                threadFail("should not be called");
845 >                return null;            // unreached
846 >            });
847 >        if (createIncomplete) assertTrue(f.complete(v1));
848  
849 <    /**
850 <     * supplyAsync with executor completes with result of supplier
851 <     */
852 <    public void testSupplyAsync2() {
745 <        CompletableFuture<Integer> f;
746 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
747 <        assertEquals(f.join(), one);
748 <        checkCompletedNormally(f, one);
749 <    }
849 >        checkCompletedNormally(g, v1);
850 >        checkCompletedNormally(f, v1);
851 >        assertEquals(0, a.get());
852 >    }}
853  
854      /**
855 <     * Failing supplyAsync completes exceptionally
855 >     * exceptionally action completes with function value on source
856 >     * exception
857       */
858 <    public void testSupplyAsync3() {
859 <        FailingSupplier r = new FailingSupplier();
860 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
861 <        checkCompletedWithWrappedCFException(f);
862 <        assertEquals(1, r.invocationCount);
863 <    }
858 >    public void testExceptionally_exceptionalCompletion() {
859 >        for (boolean createIncomplete : new boolean[] { true, false })
860 >        for (Integer v1 : new Integer[] { 1, null })
861 >    {
862 >        final AtomicInteger a = new AtomicInteger(0);
863 >        final CFException ex = new CFException();
864 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
865 >        if (!createIncomplete) f.completeExceptionally(ex);
866 >        final CompletableFuture<Integer> g = f.exceptionally
867 >            ((Throwable t) -> {
868 >                ExecutionMode.SYNC.checkExecutionMode();
869 >                threadAssertSame(t, ex);
870 >                a.getAndIncrement();
871 >                return v1;
872 >            });
873 >        if (createIncomplete) f.completeExceptionally(ex);
874  
875 <    // seq completion methods
875 >        checkCompletedNormally(g, v1);
876 >        assertEquals(1, a.get());
877 >    }}
878  
879      /**
880 <     * thenRun result completes normally after normal completion of source
880 >     * If an "exceptionally action" throws an exception, it completes
881 >     * exceptionally with that exception
882       */
883 <    public void testThenRun() {
884 <        CompletableFuture<Integer> f;
885 <        CompletableFuture<Void> g;
886 <        Noop r;
887 <
888 <        f = new CompletableFuture<>();
889 <        g = f.thenRun(r = new Noop());
890 <        f.complete(null);
891 <        checkCompletedNormally(g, null);
892 <        assertEquals(1, r.invocationCount);
883 >    public void testExceptionally_exceptionalCompletionActionFailed() {
884 >        for (boolean createIncomplete : new boolean[] { true, false })
885 >    {
886 >        final AtomicInteger a = new AtomicInteger(0);
887 >        final CFException ex1 = new CFException();
888 >        final CFException ex2 = new CFException();
889 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
890 >        if (!createIncomplete) f.completeExceptionally(ex1);
891 >        final CompletableFuture<Integer> g = f.exceptionally
892 >            ((Throwable t) -> {
893 >                ExecutionMode.SYNC.checkExecutionMode();
894 >                threadAssertSame(t, ex1);
895 >                a.getAndIncrement();
896 >                throw ex2;
897 >            });
898 >        if (createIncomplete) f.completeExceptionally(ex1);
899  
900 <        f = new CompletableFuture<>();
901 <        f.complete(null);
902 <        g = f.thenRun(r = new Noop());
903 <        checkCompletedNormally(g, null);
781 <        assertEquals(1, r.invocationCount);
782 <    }
900 >        checkCompletedWithWrappedException(g, ex2);
901 >        checkCompletedExceptionally(f, ex1);
902 >        assertEquals(1, a.get());
903 >    }}
904  
905      /**
906 <     * thenRun result completes exceptionally after exceptional
907 <     * completion of source
906 >     * whenComplete action executes on normal completion, propagating
907 >     * source result.
908       */
909 <    public void testThenRun2() {
910 <        CompletableFuture<Integer> f;
911 <        CompletableFuture<Void> g;
912 <        Noop r;
913 <
914 <        f = new CompletableFuture<>();
915 <        g = f.thenRun(r = new Noop());
916 <        f.completeExceptionally(new CFException());
917 <        checkCompletedWithWrappedCFException(g);
918 <        assertEquals(0, r.invocationCount);
909 >    public void testWhenComplete_normalCompletion() {
910 >        for (ExecutionMode m : ExecutionMode.values())
911 >        for (boolean createIncomplete : new boolean[] { true, false })
912 >        for (Integer v1 : new Integer[] { 1, null })
913 >    {
914 >        final AtomicInteger a = new AtomicInteger(0);
915 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
916 >        if (!createIncomplete) assertTrue(f.complete(v1));
917 >        final CompletableFuture<Integer> g = m.whenComplete
918 >            (f,
919 >             (Integer result, Throwable t) -> {
920 >                m.checkExecutionMode();
921 >                threadAssertSame(result, v1);
922 >                threadAssertNull(t);
923 >                a.getAndIncrement();
924 >            });
925 >        if (createIncomplete) assertTrue(f.complete(v1));
926  
927 <        f = new CompletableFuture<>();
928 <        f.completeExceptionally(new CFException());
929 <        g = f.thenRun(r = new Noop());
930 <        checkCompletedWithWrappedCFException(g);
803 <        assertEquals(0, r.invocationCount);
804 <    }
927 >        checkCompletedNormally(g, v1);
928 >        checkCompletedNormally(f, v1);
929 >        assertEquals(1, a.get());
930 >    }}
931  
932      /**
933 <     * thenRun result completes exceptionally if action does
933 >     * whenComplete action executes on exceptional completion, propagating
934 >     * source result.
935       */
936 <    public void testThenRun3() {
937 <        CompletableFuture<Integer> f;
938 <        CompletableFuture<Void> g;
939 <        FailingNoop r;
940 <
941 <        f = new CompletableFuture<>();
942 <        g = f.thenRun(r = new FailingNoop());
943 <        f.complete(null);
944 <        checkCompletedWithWrappedCFException(g);
936 >    public void testWhenComplete_exceptionalCompletion() {
937 >        for (ExecutionMode m : ExecutionMode.values())
938 >        for (boolean createIncomplete : new boolean[] { true, false })
939 >    {
940 >        final AtomicInteger a = new AtomicInteger(0);
941 >        final CFException ex = new CFException();
942 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
943 >        if (!createIncomplete) f.completeExceptionally(ex);
944 >        final CompletableFuture<Integer> g = m.whenComplete
945 >            (f,
946 >             (Integer result, Throwable t) -> {
947 >                m.checkExecutionMode();
948 >                threadAssertNull(result);
949 >                threadAssertSame(t, ex);
950 >                a.getAndIncrement();
951 >            });
952 >        if (createIncomplete) f.completeExceptionally(ex);
953  
954 <        f = new CompletableFuture<>();
955 <        f.complete(null);
956 <        g = f.thenRun(r = new FailingNoop());
957 <        checkCompletedWithWrappedCFException(g);
823 <    }
954 >        checkCompletedWithWrappedException(g, ex);
955 >        checkCompletedExceptionally(f, ex);
956 >        assertEquals(1, a.get());
957 >    }}
958  
959      /**
960 <     * thenRun result completes exceptionally if source cancelled
960 >     * whenComplete action executes on cancelled source, propagating
961 >     * CancellationException.
962       */
963 <    public void testThenRun4() {
964 <        CompletableFuture<Integer> f;
965 <        CompletableFuture<Void> g;
966 <        Noop r;
967 <
968 <        f = new CompletableFuture<>();
969 <        g = f.thenRun(r = new Noop());
970 <        assertTrue(f.cancel(true));
971 <        checkCompletedWithWrappedCancellationException(g);
963 >    public void testWhenComplete_sourceCancelled() {
964 >        for (ExecutionMode m : ExecutionMode.values())
965 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
966 >        for (boolean createIncomplete : new boolean[] { true, false })
967 >    {
968 >        final AtomicInteger a = new AtomicInteger(0);
969 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
970 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
971 >        final CompletableFuture<Integer> g = m.whenComplete
972 >            (f,
973 >             (Integer result, Throwable t) -> {
974 >                m.checkExecutionMode();
975 >                threadAssertNull(result);
976 >                threadAssertTrue(t instanceof CancellationException);
977 >                a.getAndIncrement();
978 >            });
979 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
980  
838        f = new CompletableFuture<>();
839        assertTrue(f.cancel(true));
840        g = f.thenRun(r = new Noop());
981          checkCompletedWithWrappedCancellationException(g);
982 <    }
982 >        checkCancelled(f);
983 >        assertEquals(1, a.get());
984 >    }}
985  
986      /**
987 <     * thenApply result completes normally after normal completion of source
987 >     * If a whenComplete action throws an exception when triggered by
988 >     * a normal completion, it completes exceptionally
989       */
990 <    public void testThenApply() {
991 <        CompletableFuture<Integer> f = new CompletableFuture<>();
992 <        CompletableFuture<Integer> g = f.thenApply(inc);
993 <        f.complete(one);
994 <        checkCompletedNormally(g, two);
995 <    }
990 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
991 >        for (boolean createIncomplete : new boolean[] { true, false })
992 >        for (ExecutionMode m : ExecutionMode.values())
993 >        for (Integer v1 : new Integer[] { 1, null })
994 >    {
995 >        final AtomicInteger a = new AtomicInteger(0);
996 >        final CFException ex = new CFException();
997 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
998 >        if (!createIncomplete) assertTrue(f.complete(v1));
999 >        final CompletableFuture<Integer> g = m.whenComplete
1000 >            (f,
1001 >             (Integer result, Throwable t) -> {
1002 >                m.checkExecutionMode();
1003 >                threadAssertSame(result, v1);
1004 >                threadAssertNull(t);
1005 >                a.getAndIncrement();
1006 >                throw ex;
1007 >            });
1008 >        if (createIncomplete) assertTrue(f.complete(v1));
1009  
1010 <    /**
1011 <     * thenApply result completes exceptionally after exceptional
1012 <     * completion of source
1013 <     */
858 <    public void testThenApply2() {
859 <        CompletableFuture<Integer> f = new CompletableFuture<>();
860 <        CompletableFuture<Integer> g = f.thenApply(inc);
861 <        f.completeExceptionally(new CFException());
862 <        checkCompletedWithWrappedCFException(g);
863 <    }
1010 >        checkCompletedWithWrappedException(g, ex);
1011 >        checkCompletedNormally(f, v1);
1012 >        assertEquals(1, a.get());
1013 >    }}
1014  
1015      /**
1016 <     * thenApply result completes exceptionally if action does
1016 >     * If a whenComplete action throws an exception when triggered by
1017 >     * a source completion that also throws an exception, the source
1018 >     * exception takes precedence (unlike handle)
1019       */
1020 <    public void testThenApply3() {
1021 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1022 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1023 <        f.complete(one);
1024 <        checkCompletedWithWrappedCFException(g);
1025 <    }
1020 >    public void testWhenComplete_sourceFailedActionFailed() {
1021 >        for (boolean createIncomplete : new boolean[] { true, false })
1022 >        for (ExecutionMode m : ExecutionMode.values())
1023 >    {
1024 >        final AtomicInteger a = new AtomicInteger(0);
1025 >        final CFException ex1 = new CFException();
1026 >        final CFException ex2 = new CFException();
1027 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1028  
1029 <    /**
1030 <     * thenApply result completes exceptionally if source cancelled
1031 <     */
1032 <    public void testThenApply4() {
1033 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1034 <        CompletableFuture<Integer> g = f.thenApply(inc);
1035 <        assertTrue(f.cancel(true));
1036 <        checkCompletedWithWrappedCancellationException(g);
1037 <    }
1029 >        if (!createIncomplete) f.completeExceptionally(ex1);
1030 >        final CompletableFuture<Integer> g = m.whenComplete
1031 >            (f,
1032 >             (Integer result, Throwable t) -> {
1033 >                m.checkExecutionMode();
1034 >                threadAssertSame(t, ex1);
1035 >                threadAssertNull(result);
1036 >                a.getAndIncrement();
1037 >                throw ex2;
1038 >            });
1039 >        if (createIncomplete) f.completeExceptionally(ex1);
1040  
1041 <    /**
1042 <     * thenAccept result completes normally after normal completion of source
1043 <     */
1044 <    public void testThenAccept() {
1045 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1046 <        IncAction r = new IncAction();
891 <        CompletableFuture<Void> g = f.thenAccept(r);
892 <        f.complete(one);
893 <        checkCompletedNormally(g, null);
894 <        assertEquals(r.value, (Integer) 2);
895 <    }
1041 >        checkCompletedWithWrappedException(g, ex1);
1042 >        checkCompletedExceptionally(f, ex1);
1043 >        assertEquals(1, ex1.getSuppressed().length);
1044 >        assertSame(ex2, ex1.getSuppressed()[0]);
1045 >        assertEquals(1, a.get());
1046 >    }}
1047  
1048      /**
1049 <     * thenAccept result completes exceptionally after exceptional
1049 >     * handle action completes normally with function value on normal
1050       * completion of source
1051       */
1052 <    public void testThenAccept2() {
902 <        CompletableFuture<Integer> f = new CompletableFuture<>();
903 <        IncAction r = new IncAction();
904 <        CompletableFuture<Void> g = f.thenAccept(r);
905 <        f.completeExceptionally(new CFException());
906 <        checkCompletedWithWrappedCFException(g);
907 <    }
908 <
909 <    /**
910 <     * thenAccept result completes exceptionally if action does
911 <     */
912 <    public void testThenAccept3() {
913 <        CompletableFuture<Integer> f = new CompletableFuture<>();
914 <        FailingConsumer r = new FailingConsumer();
915 <        CompletableFuture<Void> g = f.thenAccept(r);
916 <        f.complete(one);
917 <        checkCompletedWithWrappedCFException(g);
918 <        assertEquals(1, r.invocationCount);
919 <    }
920 <
921 <    /**
922 <     * thenAccept result completes exceptionally if source cancelled
923 <     */
924 <    public void testThenAccept4() {
925 <        CompletableFuture<Integer> f = new CompletableFuture<>();
926 <        IncAction r = new IncAction();
927 <        CompletableFuture<Void> g = f.thenAccept(r);
928 <        assertTrue(f.cancel(true));
929 <        checkCompletedWithWrappedCancellationException(g);
930 <    }
931 <
932 <    /**
933 <     * thenCombine result completes normally after normal completion
934 <     * of sources
935 <     */
936 <    public void testThenCombine_normalCompletion1() {
937 <        for (boolean createIncomplete : new boolean[] { true, false })
938 <        for (boolean fFirst : new boolean[] { true, false })
1052 >    public void testHandle_normalCompletion() {
1053          for (ExecutionMode m : ExecutionMode.values())
1054 +        for (boolean createIncomplete : new boolean[] { true, false })
1055          for (Integer v1 : new Integer[] { 1, null })
1056 <        for (Integer v2 : new Integer[] { 2, null }) {
942 <
1056 >    {
1057          final CompletableFuture<Integer> f = new CompletableFuture<>();
1058 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1059 <        final SubtractFunction r = new SubtractFunction();
1060 <        CompletableFuture<Integer> h = null;
1061 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1062 <
1063 <        if (fFirst)
1064 <            f.complete(v1);
1065 <        else
1066 <            g.complete(v2);
1067 <        if (createIncomplete) checkIncomplete(h);
1068 <        assertEquals(0, r.invocationCount);
1069 <        if (!fFirst)
956 <            f.complete(v1);
957 <        else
958 <            g.complete(v2);
959 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1058 >        final AtomicInteger a = new AtomicInteger(0);
1059 >        if (!createIncomplete) assertTrue(f.complete(v1));
1060 >        final CompletableFuture<Integer> g = m.handle
1061 >            (f,
1062 >             (Integer result, Throwable t) -> {
1063 >                m.checkExecutionMode();
1064 >                threadAssertSame(result, v1);
1065 >                threadAssertNull(t);
1066 >                a.getAndIncrement();
1067 >                return inc(v1);
1068 >            });
1069 >        if (createIncomplete) assertTrue(f.complete(v1));
1070  
1071 <        checkCompletedNormally(h, subtract(v1, v2));
1071 >        checkCompletedNormally(g, inc(v1));
1072          checkCompletedNormally(f, v1);
1073 <        checkCompletedNormally(g, v2);
1074 <        assertEquals(1, r.invocationCount);
965 <        }
966 <    }
1073 >        assertEquals(1, a.get());
1074 >    }}
1075  
1076      /**
1077 <     * thenCombine result completes exceptionally after exceptional
1078 <     * completion of either source
1077 >     * handle action completes normally with function value on
1078 >     * exceptional completion of source
1079       */
1080 <    public void testThenCombine_exceptionalCompletion1() {
1080 >    public void testHandle_exceptionalCompletion() {
1081          for (ExecutionMode m : ExecutionMode.values())
1082 <        for (Integer v1 : new Integer[] { 1, null }) {
1083 <
1082 >        for (boolean createIncomplete : new boolean[] { true, false })
1083 >        for (Integer v1 : new Integer[] { 1, null })
1084 >    {
1085          final CompletableFuture<Integer> f = new CompletableFuture<>();
1086 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
978 <        final SubtractFunction r = new SubtractFunction();
979 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1086 >        final AtomicInteger a = new AtomicInteger(0);
1087          final CFException ex = new CFException();
1088 +        if (!createIncomplete) f.completeExceptionally(ex);
1089 +        final CompletableFuture<Integer> g = m.handle
1090 +            (f,
1091 +             (Integer result, Throwable t) -> {
1092 +                m.checkExecutionMode();
1093 +                threadAssertNull(result);
1094 +                threadAssertSame(t, ex);
1095 +                a.getAndIncrement();
1096 +                return v1;
1097 +            });
1098 +        if (createIncomplete) f.completeExceptionally(ex);
1099  
982        f.completeExceptionally(ex);
983        checkIncomplete(h);
984        g.complete(v1);
985
986        checkCompletedWithWrappedCFException(h, ex);
987        checkCompletedWithWrappedCFException(f, ex);
988        assertEquals(0, r.invocationCount);
1100          checkCompletedNormally(g, v1);
1101 <        }
1102 <    }
1101 >        checkCompletedExceptionally(f, ex);
1102 >        assertEquals(1, a.get());
1103 >    }}
1104  
1105 <    public void testThenCombine_exceptionalCompletion2() {
1105 >    /**
1106 >     * handle action completes normally with function value on
1107 >     * cancelled source
1108 >     */
1109 >    public void testHandle_sourceCancelled() {
1110          for (ExecutionMode m : ExecutionMode.values())
1111 <        for (Integer v1 : new Integer[] { 1, null }) {
1112 <
1111 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1112 >        for (boolean createIncomplete : new boolean[] { true, false })
1113 >        for (Integer v1 : new Integer[] { 1, null })
1114 >    {
1115          final CompletableFuture<Integer> f = new CompletableFuture<>();
1116 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1117 <        final SubtractFunction r = new SubtractFunction();
1118 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1119 <        final CFException ex = new CFException();
1120 <
1121 <        g.completeExceptionally(ex);
1122 <        checkIncomplete(h);
1123 <        f.complete(v1);
1116 >        final AtomicInteger a = new AtomicInteger(0);
1117 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1118 >        final CompletableFuture<Integer> g = m.handle
1119 >            (f,
1120 >             (Integer result, Throwable t) -> {
1121 >                m.checkExecutionMode();
1122 >                threadAssertNull(result);
1123 >                threadAssertTrue(t instanceof CancellationException);
1124 >                a.getAndIncrement();
1125 >                return v1;
1126 >            });
1127 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1128  
1129 <        checkCompletedWithWrappedCFException(h, ex);
1130 <        checkCompletedWithWrappedCFException(g, ex);
1131 <        assertEquals(0, r.invocationCount);
1132 <        checkCompletedNormally(f, v1);
1011 <        }
1012 <    }
1129 >        checkCompletedNormally(g, v1);
1130 >        checkCancelled(f);
1131 >        assertEquals(1, a.get());
1132 >    }}
1133  
1134 <    public void testThenCombine_exceptionalCompletion3() {
1134 >    /**
1135 >     * If a "handle action" throws an exception when triggered by
1136 >     * a normal completion, it completes exceptionally
1137 >     */
1138 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1139          for (ExecutionMode m : ExecutionMode.values())
1140 <        for (Integer v1 : new Integer[] { 1, null }) {
1141 <
1140 >        for (boolean createIncomplete : new boolean[] { true, false })
1141 >        for (Integer v1 : new Integer[] { 1, null })
1142 >    {
1143          final CompletableFuture<Integer> f = new CompletableFuture<>();
1144 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1020 <        final SubtractFunction r = new SubtractFunction();
1144 >        final AtomicInteger a = new AtomicInteger(0);
1145          final CFException ex = new CFException();
1146 +        if (!createIncomplete) assertTrue(f.complete(v1));
1147 +        final CompletableFuture<Integer> g = m.handle
1148 +            (f,
1149 +             (Integer result, Throwable t) -> {
1150 +                m.checkExecutionMode();
1151 +                threadAssertSame(result, v1);
1152 +                threadAssertNull(t);
1153 +                a.getAndIncrement();
1154 +                throw ex;
1155 +            });
1156 +        if (createIncomplete) assertTrue(f.complete(v1));
1157  
1158 <        g.completeExceptionally(ex);
1024 <        f.complete(v1);
1025 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1026 <
1027 <        checkCompletedWithWrappedCFException(h, ex);
1028 <        checkCompletedWithWrappedCFException(g, ex);
1029 <        assertEquals(0, r.invocationCount);
1158 >        checkCompletedWithWrappedException(g, ex);
1159          checkCompletedNormally(f, v1);
1160 <        }
1161 <    }
1160 >        assertEquals(1, a.get());
1161 >    }}
1162  
1163 <    public void testThenCombine_exceptionalCompletion4() {
1163 >    /**
1164 >     * If a "handle action" throws an exception when triggered by
1165 >     * a source completion that also throws an exception, the action
1166 >     * exception takes precedence (unlike whenComplete)
1167 >     */
1168 >    public void testHandle_sourceFailedActionFailed() {
1169 >        for (boolean createIncomplete : new boolean[] { true, false })
1170          for (ExecutionMode m : ExecutionMode.values())
1171 <        for (Integer v1 : new Integer[] { 1, null }) {
1172 <
1171 >    {
1172 >        final AtomicInteger a = new AtomicInteger(0);
1173 >        final CFException ex1 = new CFException();
1174 >        final CFException ex2 = new CFException();
1175          final CompletableFuture<Integer> f = new CompletableFuture<>();
1039        final CompletableFuture<Integer> g = new CompletableFuture<>();
1040        final SubtractFunction r = new SubtractFunction();
1041        final CFException ex = new CFException();
1176  
1177 <        f.completeExceptionally(ex);
1178 <        g.complete(v1);
1179 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1177 >        if (!createIncomplete) f.completeExceptionally(ex1);
1178 >        final CompletableFuture<Integer> g = m.handle
1179 >            (f,
1180 >             (Integer result, Throwable t) -> {
1181 >                m.checkExecutionMode();
1182 >                threadAssertNull(result);
1183 >                threadAssertSame(ex1, t);
1184 >                a.getAndIncrement();
1185 >                throw ex2;
1186 >            });
1187 >        if (createIncomplete) f.completeExceptionally(ex1);
1188  
1189 <        checkCompletedWithWrappedCFException(h, ex);
1190 <        checkCompletedWithWrappedCFException(f, ex);
1191 <        assertEquals(0, r.invocationCount);
1192 <        checkCompletedNormally(g, v1);
1051 <        }
1052 <    }
1189 >        checkCompletedWithWrappedException(g, ex2);
1190 >        checkCompletedExceptionally(f, ex1);
1191 >        assertEquals(1, a.get());
1192 >    }}
1193  
1194      /**
1195 <     * thenCombine result completes exceptionally if action does
1195 >     * runAsync completes after running Runnable
1196       */
1197 <    public void testThenCombine_actionFailed1() {
1198 <        for (ExecutionMode m : ExecutionMode.values())
1199 <        for (Integer v1 : new Integer[] { 1, null })
1200 <        for (Integer v2 : new Integer[] { 2, null }) {
1201 <
1202 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1203 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1204 <        final FailingBiFunction r = new FailingBiFunction();
1205 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1206 <
1207 <        f.complete(v1);
1208 <        checkIncomplete(h);
1209 <        g.complete(v2);
1197 >    public void testRunAsync_normalCompletion() {
1198 >        ExecutionMode[] executionModes = {
1199 >            ExecutionMode.ASYNC,
1200 >            ExecutionMode.EXECUTOR,
1201 >        };
1202 >        for (ExecutionMode m : executionModes)
1203 >    {
1204 >        final Noop r = new Noop(m);
1205 >        final CompletableFuture<Void> f = m.runAsync(r);
1206 >        assertNull(f.join());
1207 >        checkCompletedNormally(f, null);
1208 >        r.assertInvoked();
1209 >    }}
1210  
1211 <        checkCompletedWithWrappedCFException(h);
1212 <        checkCompletedNormally(f, v1);
1213 <        checkCompletedNormally(g, v2);
1214 <        }
1215 <    }
1211 >    /**
1212 >     * failing runAsync completes exceptionally after running Runnable
1213 >     */
1214 >    public void testRunAsync_exceptionalCompletion() {
1215 >        ExecutionMode[] executionModes = {
1216 >            ExecutionMode.ASYNC,
1217 >            ExecutionMode.EXECUTOR,
1218 >        };
1219 >        for (ExecutionMode m : executionModes)
1220 >    {
1221 >        final FailingRunnable r = new FailingRunnable(m);
1222 >        final CompletableFuture<Void> f = m.runAsync(r);
1223 >        checkCompletedWithWrappedCFException(f);
1224 >        r.assertInvoked();
1225 >    }}
1226  
1227 <    public void testThenCombine_actionFailed2() {
1228 <        for (ExecutionMode m : ExecutionMode.values())
1227 >    /**
1228 >     * supplyAsync completes with result of supplier
1229 >     */
1230 >    public void testSupplyAsync_normalCompletion() {
1231 >        ExecutionMode[] executionModes = {
1232 >            ExecutionMode.ASYNC,
1233 >            ExecutionMode.EXECUTOR,
1234 >        };
1235 >        for (ExecutionMode m : executionModes)
1236          for (Integer v1 : new Integer[] { 1, null })
1237 <        for (Integer v2 : new Integer[] { 2, null }) {
1238 <
1239 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1240 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1084 <        final FailingBiFunction r = new FailingBiFunction();
1085 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1086 <
1087 <        g.complete(v2);
1088 <        checkIncomplete(h);
1089 <        f.complete(v1);
1090 <
1091 <        checkCompletedWithWrappedCFException(h);
1237 >    {
1238 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1239 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1240 >        assertSame(v1, f.join());
1241          checkCompletedNormally(f, v1);
1242 <        checkCompletedNormally(g, v2);
1243 <        }
1095 <    }
1242 >        r.assertInvoked();
1243 >    }}
1244  
1245      /**
1246 <     * thenCombine result completes exceptionally if either source cancelled
1246 >     * Failing supplyAsync completes exceptionally
1247       */
1248 <    public void testThenCombine_sourceCancelled1() {
1249 <        for (ExecutionMode m : ExecutionMode.values())
1250 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1251 <        for (Integer v1 : new Integer[] { 1, null }) {
1252 <
1253 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1254 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1255 <        final SubtractFunction r = new SubtractFunction();
1256 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1257 <
1258 <        assertTrue(f.cancel(mayInterruptIfRunning));
1259 <        checkIncomplete(h);
1112 <        g.complete(v1);
1248 >    public void testSupplyAsync_exceptionalCompletion() {
1249 >        ExecutionMode[] executionModes = {
1250 >            ExecutionMode.ASYNC,
1251 >            ExecutionMode.EXECUTOR,
1252 >        };
1253 >        for (ExecutionMode m : executionModes)
1254 >    {
1255 >        FailingSupplier r = new FailingSupplier(m);
1256 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1257 >        checkCompletedWithWrappedCFException(f);
1258 >        r.assertInvoked();
1259 >    }}
1260  
1261 <        checkCompletedWithWrappedCancellationException(h);
1115 <        checkCancelled(f);
1116 <        assertEquals(0, r.invocationCount);
1117 <        checkCompletedNormally(g, v1);
1118 <        }
1119 <    }
1261 >    // seq completion methods
1262  
1263 <    public void testThenCombine_sourceCancelled2() {
1263 >    /**
1264 >     * thenRun result completes normally after normal completion of source
1265 >     */
1266 >    public void testThenRun_normalCompletion() {
1267          for (ExecutionMode m : ExecutionMode.values())
1268 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1269 <        for (Integer v1 : new Integer[] { 1, null }) {
1125 <
1268 >        for (Integer v1 : new Integer[] { 1, null })
1269 >    {
1270          final CompletableFuture<Integer> f = new CompletableFuture<>();
1271 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1272 <        final SubtractFunction r = new SubtractFunction();
1129 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1271 >        final Noop[] rs = new Noop[6];
1272 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1273  
1274 <        assertTrue(g.cancel(mayInterruptIfRunning));
1275 <        checkIncomplete(h);
1276 <        f.complete(v1);
1277 <
1278 <        checkCompletedWithWrappedCancellationException(h);
1279 <        checkCancelled(g);
1280 <        assertEquals(0, r.invocationCount);
1274 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1275 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1276 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1277 >        checkIncomplete(h0);
1278 >        checkIncomplete(h1);
1279 >        checkIncomplete(h2);
1280 >        assertTrue(f.complete(v1));
1281 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1282 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1283 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1284 >
1285 >        checkCompletedNormally(h0, null);
1286 >        checkCompletedNormally(h1, null);
1287 >        checkCompletedNormally(h2, null);
1288 >        checkCompletedNormally(h3, null);
1289 >        checkCompletedNormally(h4, null);
1290 >        checkCompletedNormally(h5, null);
1291          checkCompletedNormally(f, v1);
1292 <        }
1293 <    }
1292 >        for (Noop r : rs) r.assertInvoked();
1293 >    }}
1294  
1295 <    public void testThenCombine_sourceCancelled3() {
1295 >    /**
1296 >     * thenRun result completes exceptionally after exceptional
1297 >     * completion of source
1298 >     */
1299 >    public void testThenRun_exceptionalCompletion() {
1300          for (ExecutionMode m : ExecutionMode.values())
1301 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1302 <        for (Integer v1 : new Integer[] { 1, null }) {
1146 <
1301 >    {
1302 >        final CFException ex = new CFException();
1303          final CompletableFuture<Integer> f = new CompletableFuture<>();
1304 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1305 <        final SubtractFunction r = new SubtractFunction();
1150 <
1151 <        assertTrue(g.cancel(mayInterruptIfRunning));
1152 <        f.complete(v1);
1153 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1304 >        final Noop[] rs = new Noop[6];
1305 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1306  
1307 <        checkCompletedWithWrappedCancellationException(h);
1308 <        checkCancelled(g);
1309 <        assertEquals(0, r.invocationCount);
1310 <        checkCompletedNormally(f, v1);
1311 <        }
1312 <    }
1307 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1308 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1309 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1310 >        checkIncomplete(h0);
1311 >        checkIncomplete(h1);
1312 >        checkIncomplete(h2);
1313 >        assertTrue(f.completeExceptionally(ex));
1314 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1315 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1316 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1317 >
1318 >        checkCompletedWithWrappedException(h0, ex);
1319 >        checkCompletedWithWrappedException(h1, ex);
1320 >        checkCompletedWithWrappedException(h2, ex);
1321 >        checkCompletedWithWrappedException(h3, ex);
1322 >        checkCompletedWithWrappedException(h4, ex);
1323 >        checkCompletedWithWrappedException(h5, ex);
1324 >        checkCompletedExceptionally(f, ex);
1325 >        for (Noop r : rs) r.assertNotInvoked();
1326 >    }}
1327  
1328 <    public void testThenCombine_sourceCancelled4() {
1328 >    /**
1329 >     * thenRun result completes exceptionally if source cancelled
1330 >     */
1331 >    public void testThenRun_sourceCancelled() {
1332          for (ExecutionMode m : ExecutionMode.values())
1333          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1334 <        for (Integer v1 : new Integer[] { 1, null }) {
1166 <
1334 >    {
1335          final CompletableFuture<Integer> f = new CompletableFuture<>();
1336 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1337 <        final SubtractFunction r = new SubtractFunction();
1336 >        final Noop[] rs = new Noop[6];
1337 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1338  
1339 +        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1340 +        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1341 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1342 +        checkIncomplete(h0);
1343 +        checkIncomplete(h1);
1344 +        checkIncomplete(h2);
1345          assertTrue(f.cancel(mayInterruptIfRunning));
1346 <        g.complete(v1);
1347 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1348 <
1349 <        checkCompletedWithWrappedCancellationException(h);
1346 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1347 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1348 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1349 >
1350 >        checkCompletedWithWrappedCancellationException(h0);
1351 >        checkCompletedWithWrappedCancellationException(h1);
1352 >        checkCompletedWithWrappedCancellationException(h2);
1353 >        checkCompletedWithWrappedCancellationException(h3);
1354 >        checkCompletedWithWrappedCancellationException(h4);
1355 >        checkCompletedWithWrappedCancellationException(h5);
1356          checkCancelled(f);
1357 <        assertEquals(0, r.invocationCount);
1358 <        checkCompletedNormally(g, v1);
1179 <        }
1180 <    }
1357 >        for (Noop r : rs) r.assertNotInvoked();
1358 >    }}
1359  
1360      /**
1361 <     * thenAcceptBoth result completes normally after normal
1184 <     * completion of sources
1361 >     * thenRun result completes exceptionally if action does
1362       */
1363 <    public void testThenAcceptBoth_normalCompletion1() {
1363 >    public void testThenRun_actionFailed() {
1364          for (ExecutionMode m : ExecutionMode.values())
1365          for (Integer v1 : new Integer[] { 1, null })
1366 <        for (Integer v2 : new Integer[] { 2, null }) {
1190 <
1191 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1192 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1193 <        final SubtractAction r = new SubtractAction();
1194 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1195 <
1196 <        f.complete(v1);
1197 <        checkIncomplete(h);
1198 <        assertEquals(0, r.invocationCount);
1199 <        g.complete(v2);
1200 <
1201 <        checkCompletedNormally(h, null);
1202 <        assertEquals(r.value, subtract(v1, v2));
1203 <        checkCompletedNormally(f, v1);
1204 <        checkCompletedNormally(g, v2);
1205 <        }
1206 <    }
1207 <
1208 <    public void testThenAcceptBoth_normalCompletion2() {
1209 <        for (ExecutionMode m : ExecutionMode.values())
1210 <        for (Integer v1 : new Integer[] { 1, null })
1211 <        for (Integer v2 : new Integer[] { 2, null }) {
1212 <
1213 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1214 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1215 <        final SubtractAction r = new SubtractAction();
1216 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1217 <
1218 <        g.complete(v2);
1219 <        checkIncomplete(h);
1220 <        assertEquals(0, r.invocationCount);
1221 <        f.complete(v1);
1222 <
1223 <        checkCompletedNormally(h, null);
1224 <        assertEquals(r.value, subtract(v1, v2));
1225 <        checkCompletedNormally(f, v1);
1226 <        checkCompletedNormally(g, v2);
1227 <        }
1228 <    }
1229 <
1230 <    public void testThenAcceptBoth_normalCompletion3() {
1231 <        for (ExecutionMode m : ExecutionMode.values())
1232 <        for (Integer v1 : new Integer[] { 1, null })
1233 <        for (Integer v2 : new Integer[] { 2, null }) {
1234 <
1366 >    {
1367          final CompletableFuture<Integer> f = new CompletableFuture<>();
1368 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1369 <        final SubtractAction r = new SubtractAction();
1238 <
1239 <        g.complete(v2);
1240 <        f.complete(v1);
1241 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1368 >        final FailingRunnable[] rs = new FailingRunnable[6];
1369 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1370  
1371 <        checkCompletedNormally(h, null);
1372 <        assertEquals(r.value, subtract(v1, v2));
1371 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1372 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1373 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1374 >        assertTrue(f.complete(v1));
1375 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1376 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1377 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1378 >
1379 >        checkCompletedWithWrappedCFException(h0);
1380 >        checkCompletedWithWrappedCFException(h1);
1381 >        checkCompletedWithWrappedCFException(h2);
1382 >        checkCompletedWithWrappedCFException(h3);
1383 >        checkCompletedWithWrappedCFException(h4);
1384 >        checkCompletedWithWrappedCFException(h5);
1385          checkCompletedNormally(f, v1);
1386 <        checkCompletedNormally(g, v2);
1247 <        }
1248 <    }
1386 >    }}
1387  
1388 <    public void testThenAcceptBoth_normalCompletion4() {
1388 >    /**
1389 >     * thenApply result completes normally after normal completion of source
1390 >     */
1391 >    public void testThenApply_normalCompletion() {
1392          for (ExecutionMode m : ExecutionMode.values())
1393          for (Integer v1 : new Integer[] { 1, null })
1394 <        for (Integer v2 : new Integer[] { 2, null }) {
1254 <
1394 >    {
1395          final CompletableFuture<Integer> f = new CompletableFuture<>();
1396 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1397 <        final SubtractAction r = new SubtractAction();
1396 >        final IncFunction[] rs = new IncFunction[4];
1397 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1398  
1399 <        f.complete(v1);
1400 <        g.complete(v2);
1401 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1399 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1400 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1401 >        checkIncomplete(h0);
1402 >        checkIncomplete(h1);
1403 >        assertTrue(f.complete(v1));
1404 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1405 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1406  
1407 <        checkCompletedNormally(h, null);
1408 <        assertEquals(r.value, subtract(v1, v2));
1407 >        checkCompletedNormally(h0, inc(v1));
1408 >        checkCompletedNormally(h1, inc(v1));
1409 >        checkCompletedNormally(h2, inc(v1));
1410 >        checkCompletedNormally(h3, inc(v1));
1411          checkCompletedNormally(f, v1);
1412 <        checkCompletedNormally(g, v2);
1413 <        }
1268 <    }
1412 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1413 >    }}
1414  
1415      /**
1416 <     * thenAcceptBoth result completes exceptionally after exceptional
1417 <     * completion of either source
1416 >     * thenApply result completes exceptionally after exceptional
1417 >     * completion of source
1418       */
1419 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1419 >    public void testThenApply_exceptionalCompletion() {
1420          for (ExecutionMode m : ExecutionMode.values())
1421 <        for (Integer v1 : new Integer[] { 1, null }) {
1277 <
1278 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1279 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1280 <        final SubtractAction r = new SubtractAction();
1281 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1421 >    {
1422          final CFException ex = new CFException();
1283
1284        f.completeExceptionally(ex);
1285        checkIncomplete(h);
1286        g.complete(v1);
1287
1288        checkCompletedWithWrappedCFException(h, ex);
1289        checkCompletedWithWrappedCFException(f, ex);
1290        assertEquals(0, r.invocationCount);
1291        checkCompletedNormally(g, v1);
1292        }
1293    }
1294
1295    public void testThenAcceptBoth_exceptionalCompletion2() {
1296        for (ExecutionMode m : ExecutionMode.values())
1297        for (Integer v1 : new Integer[] { 1, null }) {
1298
1423          final CompletableFuture<Integer> f = new CompletableFuture<>();
1424 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1425 <        final SubtractAction r = new SubtractAction();
1302 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1303 <        final CFException ex = new CFException();
1304 <
1305 <        g.completeExceptionally(ex);
1306 <        checkIncomplete(h);
1307 <        f.complete(v1);
1424 >        final IncFunction[] rs = new IncFunction[4];
1425 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1426  
1427 <        checkCompletedWithWrappedCFException(h, ex);
1428 <        checkCompletedWithWrappedCFException(g, ex);
1429 <        assertEquals(0, r.invocationCount);
1430 <        checkCompletedNormally(f, v1);
1431 <        }
1432 <    }
1427 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1428 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1429 >        assertTrue(f.completeExceptionally(ex));
1430 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1431 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1432 >
1433 >        checkCompletedWithWrappedException(h0, ex);
1434 >        checkCompletedWithWrappedException(h1, ex);
1435 >        checkCompletedWithWrappedException(h2, ex);
1436 >        checkCompletedWithWrappedException(h3, ex);
1437 >        checkCompletedExceptionally(f, ex);
1438 >        for (IncFunction r : rs) r.assertNotInvoked();
1439 >    }}
1440  
1441 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1441 >    /**
1442 >     * thenApply result completes exceptionally if source cancelled
1443 >     */
1444 >    public void testThenApply_sourceCancelled() {
1445          for (ExecutionMode m : ExecutionMode.values())
1446 <        for (Integer v1 : new Integer[] { 1, null }) {
1447 <
1446 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1447 >    {
1448          final CompletableFuture<Integer> f = new CompletableFuture<>();
1449 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1450 <        final SubtractAction r = new SubtractAction();
1323 <        final CFException ex = new CFException();
1449 >        final IncFunction[] rs = new IncFunction[4];
1450 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1451  
1452 <        g.completeExceptionally(ex);
1453 <        f.complete(v1);
1454 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1452 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1453 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1454 >        assertTrue(f.cancel(mayInterruptIfRunning));
1455 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1456 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1457  
1458 <        checkCompletedWithWrappedCFException(h, ex);
1459 <        checkCompletedWithWrappedCFException(g, ex);
1460 <        assertEquals(0, r.invocationCount);
1461 <        checkCompletedNormally(f, v1);
1462 <        }
1463 <    }
1458 >        checkCompletedWithWrappedCancellationException(h0);
1459 >        checkCompletedWithWrappedCancellationException(h1);
1460 >        checkCompletedWithWrappedCancellationException(h2);
1461 >        checkCompletedWithWrappedCancellationException(h3);
1462 >        checkCancelled(f);
1463 >        for (IncFunction r : rs) r.assertNotInvoked();
1464 >    }}
1465  
1466 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1466 >    /**
1467 >     * thenApply result completes exceptionally if action does
1468 >     */
1469 >    public void testThenApply_actionFailed() {
1470          for (ExecutionMode m : ExecutionMode.values())
1471 <        for (Integer v1 : new Integer[] { 1, null }) {
1472 <
1471 >        for (Integer v1 : new Integer[] { 1, null })
1472 >    {
1473          final CompletableFuture<Integer> f = new CompletableFuture<>();
1474 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1475 <        final SubtractAction r = new SubtractAction();
1343 <        final CFException ex = new CFException();
1474 >        final FailingFunction[] rs = new FailingFunction[4];
1475 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1476  
1477 <        f.completeExceptionally(ex);
1478 <        g.complete(v1);
1479 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1477 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1478 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1479 >        assertTrue(f.complete(v1));
1480 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1481 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1482  
1483 <        checkCompletedWithWrappedCFException(h, ex);
1484 <        checkCompletedWithWrappedCFException(f, ex);
1485 <        assertEquals(0, r.invocationCount);
1486 <        checkCompletedNormally(g, v1);
1487 <        }
1488 <    }
1483 >        checkCompletedWithWrappedCFException(h0);
1484 >        checkCompletedWithWrappedCFException(h1);
1485 >        checkCompletedWithWrappedCFException(h2);
1486 >        checkCompletedWithWrappedCFException(h3);
1487 >        checkCompletedNormally(f, v1);
1488 >    }}
1489  
1490      /**
1491 <     * thenAcceptBoth result completes exceptionally if action does
1491 >     * thenAccept result completes normally after normal completion of source
1492       */
1493 <    public void testThenAcceptBoth_actionFailed1() {
1493 >    public void testThenAccept_normalCompletion() {
1494          for (ExecutionMode m : ExecutionMode.values())
1495          for (Integer v1 : new Integer[] { 1, null })
1496 <        for (Integer v2 : new Integer[] { 2, null }) {
1363 <
1496 >    {
1497          final CompletableFuture<Integer> f = new CompletableFuture<>();
1498 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1499 <        final FailingBiConsumer r = new FailingBiConsumer();
1367 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1498 >        final NoopConsumer[] rs = new NoopConsumer[4];
1499 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1500  
1501 <        f.complete(v1);
1502 <        checkIncomplete(h);
1503 <        g.complete(v2);
1501 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1502 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1503 >        checkIncomplete(h0);
1504 >        checkIncomplete(h1);
1505 >        assertTrue(f.complete(v1));
1506 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1507 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1508  
1509 <        checkCompletedWithWrappedCFException(h);
1509 >        checkCompletedNormally(h0, null);
1510 >        checkCompletedNormally(h1, null);
1511 >        checkCompletedNormally(h2, null);
1512 >        checkCompletedNormally(h3, null);
1513          checkCompletedNormally(f, v1);
1514 <        checkCompletedNormally(g, v2);
1515 <        }
1377 <    }
1514 >        for (NoopConsumer r : rs) r.assertValue(v1);
1515 >    }}
1516  
1517 <    public void testThenAcceptBoth_actionFailed2() {
1517 >    /**
1518 >     * thenAccept result completes exceptionally after exceptional
1519 >     * completion of source
1520 >     */
1521 >    public void testThenAccept_exceptionalCompletion() {
1522          for (ExecutionMode m : ExecutionMode.values())
1523 <        for (Integer v1 : new Integer[] { 1, null })
1524 <        for (Integer v2 : new Integer[] { 2, null }) {
1383 <
1523 >    {
1524 >        final CFException ex = new CFException();
1525          final CompletableFuture<Integer> f = new CompletableFuture<>();
1526 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1527 <        final FailingBiConsumer r = new FailingBiConsumer();
1387 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1388 <
1389 <        g.complete(v2);
1390 <        checkIncomplete(h);
1391 <        f.complete(v1);
1526 >        final NoopConsumer[] rs = new NoopConsumer[4];
1527 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1528  
1529 <        checkCompletedWithWrappedCFException(h);
1530 <        checkCompletedNormally(f, v1);
1531 <        checkCompletedNormally(g, v2);
1532 <        }
1533 <    }
1529 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1530 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1531 >        assertTrue(f.completeExceptionally(ex));
1532 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1533 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1534 >
1535 >        checkCompletedWithWrappedException(h0, ex);
1536 >        checkCompletedWithWrappedException(h1, ex);
1537 >        checkCompletedWithWrappedException(h2, ex);
1538 >        checkCompletedWithWrappedException(h3, ex);
1539 >        checkCompletedExceptionally(f, ex);
1540 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1541 >    }}
1542  
1543      /**
1544 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1544 >     * thenAccept result completes exceptionally if source cancelled
1545       */
1546 <    public void testThenAcceptBoth_sourceCancelled1() {
1546 >    public void testThenAccept_sourceCancelled() {
1547          for (ExecutionMode m : ExecutionMode.values())
1548          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1549 <        for (Integer v1 : new Integer[] { 1, null }) {
1406 <
1549 >    {
1550          final CompletableFuture<Integer> f = new CompletableFuture<>();
1551 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1552 <        final SubtractAction r = new SubtractAction();
1410 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1551 >        final NoopConsumer[] rs = new NoopConsumer[4];
1552 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1553  
1554 +        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1555 +        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1556          assertTrue(f.cancel(mayInterruptIfRunning));
1557 <        checkIncomplete(h);
1558 <        g.complete(v1);
1557 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1558 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1559  
1560 <        checkCompletedWithWrappedCancellationException(h);
1560 >        checkCompletedWithWrappedCancellationException(h0);
1561 >        checkCompletedWithWrappedCancellationException(h1);
1562 >        checkCompletedWithWrappedCancellationException(h2);
1563 >        checkCompletedWithWrappedCancellationException(h3);
1564          checkCancelled(f);
1565 <        assertEquals(0, r.invocationCount);
1566 <        checkCompletedNormally(g, v1);
1420 <        }
1421 <    }
1565 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1566 >    }}
1567  
1568 <    public void testThenAcceptBoth_sourceCancelled2() {
1568 >    /**
1569 >     * thenAccept result completes exceptionally if action does
1570 >     */
1571 >    public void testThenAccept_actionFailed() {
1572          for (ExecutionMode m : ExecutionMode.values())
1573 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1574 <        for (Integer v1 : new Integer[] { 1, null }) {
1427 <
1573 >        for (Integer v1 : new Integer[] { 1, null })
1574 >    {
1575          final CompletableFuture<Integer> f = new CompletableFuture<>();
1576 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1577 <        final SubtractAction r = new SubtractAction();
1431 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1576 >        final FailingConsumer[] rs = new FailingConsumer[4];
1577 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1578  
1579 <        assertTrue(g.cancel(mayInterruptIfRunning));
1580 <        checkIncomplete(h);
1581 <        f.complete(v1);
1579 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1580 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1581 >        assertTrue(f.complete(v1));
1582 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1583 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1584  
1585 <        checkCompletedWithWrappedCancellationException(h);
1586 <        checkCancelled(g);
1587 <        assertEquals(0, r.invocationCount);
1585 >        checkCompletedWithWrappedCFException(h0);
1586 >        checkCompletedWithWrappedCFException(h1);
1587 >        checkCompletedWithWrappedCFException(h2);
1588 >        checkCompletedWithWrappedCFException(h3);
1589          checkCompletedNormally(f, v1);
1590 <        }
1442 <    }
1590 >    }}
1591  
1592 <    public void testThenAcceptBoth_sourceCancelled3() {
1592 >    /**
1593 >     * thenCombine result completes normally after normal completion
1594 >     * of sources
1595 >     */
1596 >    public void testThenCombine_normalCompletion() {
1597          for (ExecutionMode m : ExecutionMode.values())
1598 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1599 <        for (Integer v1 : new Integer[] { 1, null }) {
1600 <
1598 >        for (boolean fFirst : new boolean[] { true, false })
1599 >        for (Integer v1 : new Integer[] { 1, null })
1600 >        for (Integer v2 : new Integer[] { 2, null })
1601 >    {
1602          final CompletableFuture<Integer> f = new CompletableFuture<>();
1603          final CompletableFuture<Integer> g = new CompletableFuture<>();
1604 <        final SubtractAction r = new SubtractAction();
1604 >        final SubtractFunction[] rs = new SubtractFunction[6];
1605 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1606  
1607 <        assertTrue(g.cancel(mayInterruptIfRunning));
1608 <        f.complete(v1);
1609 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1607 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1608 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1609 >        final Integer w1 =  fFirst ? v1 : v2;
1610 >        final Integer w2 = !fFirst ? v1 : v2;
1611 >
1612 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1613 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1614 >        assertTrue(fst.complete(w1));
1615 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1616 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1617 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1618 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1619 >        checkCompletedNormally(h1, subtract(w1, w1));
1620 >        checkCompletedNormally(h3, subtract(w1, w1));
1621 >        rs[1].assertValue(subtract(w1, w1));
1622 >        rs[3].assertValue(subtract(w1, w1));
1623 >        assertTrue(snd.complete(w2));
1624 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1625 >
1626 >        checkCompletedNormally(h0, subtract(v1, v2));
1627 >        checkCompletedNormally(h2, subtract(v1, v2));
1628 >        checkCompletedNormally(h4, subtract(v1, v2));
1629 >        rs[0].assertValue(subtract(v1, v2));
1630 >        rs[2].assertValue(subtract(v1, v2));
1631 >        rs[4].assertValue(subtract(v1, v2));
1632  
1457        checkCompletedWithWrappedCancellationException(h);
1458        checkCancelled(g);
1459        assertEquals(0, r.invocationCount);
1633          checkCompletedNormally(f, v1);
1634 <        }
1635 <    }
1463 <
1464 <    public void testThenAcceptBoth_sourceCancelled4() {
1465 <        for (ExecutionMode m : ExecutionMode.values())
1466 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1467 <        for (Integer v1 : new Integer[] { 1, null }) {
1468 <
1469 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1471 <        final SubtractAction r = new SubtractAction();
1472 <
1473 <        assertTrue(f.cancel(mayInterruptIfRunning));
1474 <        g.complete(v1);
1475 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1476 <
1477 <        checkCompletedWithWrappedCancellationException(h);
1478 <        checkCancelled(f);
1479 <        assertEquals(0, r.invocationCount);
1480 <        checkCompletedNormally(g, v1);
1481 <        }
1482 <    }
1634 >        checkCompletedNormally(g, v2);
1635 >    }}
1636  
1637      /**
1638 <     * runAfterBoth result completes normally after normal
1639 <     * completion of sources
1638 >     * thenCombine result completes exceptionally after exceptional
1639 >     * completion of either source
1640       */
1641 <    public void testRunAfterBoth_normalCompletion1() {
1641 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1642          for (ExecutionMode m : ExecutionMode.values())
1643 +        for (boolean fFirst : new boolean[] { true, false })
1644 +        for (boolean failFirst : new boolean[] { true, false })
1645          for (Integer v1 : new Integer[] { 1, null })
1646 <        for (Integer v2 : new Integer[] { 2, null }) {
1492 <
1646 >    {
1647          final CompletableFuture<Integer> f = new CompletableFuture<>();
1648          final CompletableFuture<Integer> g = new CompletableFuture<>();
1649 <        final Noop r = new Noop();
1650 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1651 <
1652 <        f.complete(v1);
1653 <        checkIncomplete(h);
1654 <        assertEquals(0, r.invocationCount);
1655 <        g.complete(v2);
1656 <
1657 <        checkCompletedNormally(h, null);
1658 <        assertEquals(1, r.invocationCount);
1659 <        checkCompletedNormally(f, v1);
1660 <        checkCompletedNormally(g, v2);
1661 <        }
1662 <    }
1649 >        final CFException ex = new CFException();
1650 >        final SubtractFunction r1 = new SubtractFunction(m);
1651 >        final SubtractFunction r2 = new SubtractFunction(m);
1652 >        final SubtractFunction r3 = new SubtractFunction(m);
1653 >
1654 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1655 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1656 >        final Callable<Boolean> complete1 = failFirst ?
1657 >            () -> fst.completeExceptionally(ex) :
1658 >            () -> fst.complete(v1);
1659 >        final Callable<Boolean> complete2 = failFirst ?
1660 >            () -> snd.complete(v1) :
1661 >            () -> snd.completeExceptionally(ex);
1662 >
1663 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1664 >        assertTrue(complete1.call());
1665 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1666 >        checkIncomplete(h1);
1667 >        checkIncomplete(h2);
1668 >        assertTrue(complete2.call());
1669 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1670 >
1671 >        checkCompletedWithWrappedException(h1, ex);
1672 >        checkCompletedWithWrappedException(h2, ex);
1673 >        checkCompletedWithWrappedException(h3, ex);
1674 >        r1.assertNotInvoked();
1675 >        r2.assertNotInvoked();
1676 >        r3.assertNotInvoked();
1677 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1678 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1679 >    }}
1680  
1681 <    public void testRunAfterBoth_normalCompletion2() {
1681 >    /**
1682 >     * thenCombine result completes exceptionally if either source cancelled
1683 >     */
1684 >    public void testThenCombine_sourceCancelled() throws Throwable {
1685          for (ExecutionMode m : ExecutionMode.values())
1686 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1687 +        for (boolean fFirst : new boolean[] { true, false })
1688 +        for (boolean failFirst : new boolean[] { true, false })
1689          for (Integer v1 : new Integer[] { 1, null })
1690 <        for (Integer v2 : new Integer[] { 2, null }) {
1514 <
1690 >    {
1691          final CompletableFuture<Integer> f = new CompletableFuture<>();
1692          final CompletableFuture<Integer> g = new CompletableFuture<>();
1693 <        final Noop r = new Noop();
1694 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1695 <
1696 <        g.complete(v2);
1697 <        checkIncomplete(h);
1698 <        assertEquals(0, r.invocationCount);
1699 <        f.complete(v1);
1700 <
1701 <        checkCompletedNormally(h, null);
1702 <        assertEquals(1, r.invocationCount);
1703 <        checkCompletedNormally(f, v1);
1704 <        checkCompletedNormally(g, v2);
1705 <        }
1706 <    }
1693 >        final SubtractFunction r1 = new SubtractFunction(m);
1694 >        final SubtractFunction r2 = new SubtractFunction(m);
1695 >        final SubtractFunction r3 = new SubtractFunction(m);
1696 >
1697 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1698 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1699 >        final Callable<Boolean> complete1 = failFirst ?
1700 >            () -> fst.cancel(mayInterruptIfRunning) :
1701 >            () -> fst.complete(v1);
1702 >        final Callable<Boolean> complete2 = failFirst ?
1703 >            () -> snd.complete(v1) :
1704 >            () -> snd.cancel(mayInterruptIfRunning);
1705 >
1706 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1707 >        assertTrue(complete1.call());
1708 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1709 >        checkIncomplete(h1);
1710 >        checkIncomplete(h2);
1711 >        assertTrue(complete2.call());
1712 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1713 >
1714 >        checkCompletedWithWrappedCancellationException(h1);
1715 >        checkCompletedWithWrappedCancellationException(h2);
1716 >        checkCompletedWithWrappedCancellationException(h3);
1717 >        r1.assertNotInvoked();
1718 >        r2.assertNotInvoked();
1719 >        r3.assertNotInvoked();
1720 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1721 >        checkCancelled(failFirst ? fst : snd);
1722 >    }}
1723  
1724 <    public void testRunAfterBoth_normalCompletion3() {
1724 >    /**
1725 >     * thenCombine result completes exceptionally if action does
1726 >     */
1727 >    public void testThenCombine_actionFailed() {
1728          for (ExecutionMode m : ExecutionMode.values())
1729 +        for (boolean fFirst : new boolean[] { true, false })
1730          for (Integer v1 : new Integer[] { 1, null })
1731 <        for (Integer v2 : new Integer[] { 2, null }) {
1732 <
1731 >        for (Integer v2 : new Integer[] { 2, null })
1732 >    {
1733          final CompletableFuture<Integer> f = new CompletableFuture<>();
1734          final CompletableFuture<Integer> g = new CompletableFuture<>();
1735 <        final Noop r = new Noop();
1736 <
1737 <        g.complete(v2);
1738 <        f.complete(v1);
1739 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1740 <
1741 <        checkCompletedNormally(h, null);
1742 <        assertEquals(1, r.invocationCount);
1735 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1736 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1737 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1738 >
1739 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1740 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1741 >        final Integer w1 =  fFirst ? v1 : v2;
1742 >        final Integer w2 = !fFirst ? v1 : v2;
1743 >
1744 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1745 >        assertTrue(fst.complete(w1));
1746 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1747 >        assertTrue(snd.complete(w2));
1748 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1749 >
1750 >        checkCompletedWithWrappedCFException(h1);
1751 >        checkCompletedWithWrappedCFException(h2);
1752 >        checkCompletedWithWrappedCFException(h3);
1753 >        r1.assertInvoked();
1754 >        r2.assertInvoked();
1755 >        r3.assertInvoked();
1756          checkCompletedNormally(f, v1);
1757          checkCompletedNormally(g, v2);
1758 <        }
1550 <    }
1758 >    }}
1759  
1760 <    public void testRunAfterBoth_normalCompletion4() {
1760 >    /**
1761 >     * thenAcceptBoth result completes normally after normal
1762 >     * completion of sources
1763 >     */
1764 >    public void testThenAcceptBoth_normalCompletion() {
1765          for (ExecutionMode m : ExecutionMode.values())
1766 +        for (boolean fFirst : new boolean[] { true, false })
1767          for (Integer v1 : new Integer[] { 1, null })
1768 <        for (Integer v2 : new Integer[] { 2, null }) {
1769 <
1768 >        for (Integer v2 : new Integer[] { 2, null })
1769 >    {
1770          final CompletableFuture<Integer> f = new CompletableFuture<>();
1771          final CompletableFuture<Integer> g = new CompletableFuture<>();
1772 <        final Noop r = new Noop();
1773 <
1774 <        f.complete(v1);
1775 <        g.complete(v2);
1776 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1777 <
1778 <        checkCompletedNormally(h, null);
1779 <        assertEquals(1, r.invocationCount);
1772 >        final SubtractAction r1 = new SubtractAction(m);
1773 >        final SubtractAction r2 = new SubtractAction(m);
1774 >        final SubtractAction r3 = new SubtractAction(m);
1775 >
1776 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1777 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1778 >        final Integer w1 =  fFirst ? v1 : v2;
1779 >        final Integer w2 = !fFirst ? v1 : v2;
1780 >
1781 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1782 >        assertTrue(fst.complete(w1));
1783 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1784 >        checkIncomplete(h1);
1785 >        checkIncomplete(h2);
1786 >        r1.assertNotInvoked();
1787 >        r2.assertNotInvoked();
1788 >        assertTrue(snd.complete(w2));
1789 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1790 >
1791 >        checkCompletedNormally(h1, null);
1792 >        checkCompletedNormally(h2, null);
1793 >        checkCompletedNormally(h3, null);
1794 >        r1.assertValue(subtract(v1, v2));
1795 >        r2.assertValue(subtract(v1, v2));
1796 >        r3.assertValue(subtract(v1, v2));
1797          checkCompletedNormally(f, v1);
1798          checkCompletedNormally(g, v2);
1799 <        }
1570 <    }
1799 >    }}
1800  
1801      /**
1802 <     * runAfterBoth result completes exceptionally after exceptional
1802 >     * thenAcceptBoth result completes exceptionally after exceptional
1803       * completion of either source
1804       */
1805 <    public void testRunAfterBoth_exceptionalCompletion1() {
1577 <        for (ExecutionMode m : ExecutionMode.values())
1578 <        for (Integer v1 : new Integer[] { 1, null }) {
1579 <
1580 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1581 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1582 <        final Noop r = new Noop();
1583 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 <        final CFException ex = new CFException();
1585 <
1586 <        f.completeExceptionally(ex);
1587 <        checkIncomplete(h);
1588 <        g.complete(v1);
1589 <
1590 <        checkCompletedWithWrappedCFException(h, ex);
1591 <        checkCompletedWithWrappedCFException(f, ex);
1592 <        assertEquals(0, r.invocationCount);
1593 <        checkCompletedNormally(g, v1);
1594 <        }
1595 <    }
1596 <
1597 <    public void testRunAfterBoth_exceptionalCompletion2() {
1598 <        for (ExecutionMode m : ExecutionMode.values())
1599 <        for (Integer v1 : new Integer[] { 1, null }) {
1600 <
1601 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1602 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1603 <        final Noop r = new Noop();
1604 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1605 <        final CFException ex = new CFException();
1606 <
1607 <        g.completeExceptionally(ex);
1608 <        checkIncomplete(h);
1609 <        f.complete(v1);
1610 <
1611 <        checkCompletedWithWrappedCFException(h, ex);
1612 <        checkCompletedWithWrappedCFException(g, ex);
1613 <        assertEquals(0, r.invocationCount);
1614 <        checkCompletedNormally(f, v1);
1615 <        }
1616 <    }
1617 <
1618 <    public void testRunAfterBoth_exceptionalCompletion3() {
1805 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1806          for (ExecutionMode m : ExecutionMode.values())
1807 <        for (Integer v1 : new Integer[] { 1, null }) {
1808 <
1807 >        for (boolean fFirst : new boolean[] { true, false })
1808 >        for (boolean failFirst : new boolean[] { true, false })
1809 >        for (Integer v1 : new Integer[] { 1, null })
1810 >    {
1811          final CompletableFuture<Integer> f = new CompletableFuture<>();
1812          final CompletableFuture<Integer> g = new CompletableFuture<>();
1624        final Noop r = new Noop();
1813          final CFException ex = new CFException();
1814 +        final SubtractAction r1 = new SubtractAction(m);
1815 +        final SubtractAction r2 = new SubtractAction(m);
1816 +        final SubtractAction r3 = new SubtractAction(m);
1817 +
1818 +        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1819 +        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1820 +        final Callable<Boolean> complete1 = failFirst ?
1821 +            () -> fst.completeExceptionally(ex) :
1822 +            () -> fst.complete(v1);
1823 +        final Callable<Boolean> complete2 = failFirst ?
1824 +            () -> snd.complete(v1) :
1825 +            () -> snd.completeExceptionally(ex);
1826 +
1827 +        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1828 +        assertTrue(complete1.call());
1829 +        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1830 +        checkIncomplete(h1);
1831 +        checkIncomplete(h2);
1832 +        assertTrue(complete2.call());
1833 +        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1834 +
1835 +        checkCompletedWithWrappedException(h1, ex);
1836 +        checkCompletedWithWrappedException(h2, ex);
1837 +        checkCompletedWithWrappedException(h3, ex);
1838 +        r1.assertNotInvoked();
1839 +        r2.assertNotInvoked();
1840 +        r3.assertNotInvoked();
1841 +        checkCompletedNormally(failFirst ? snd : fst, v1);
1842 +        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1843 +    }}
1844  
1845 <        g.completeExceptionally(ex);
1846 <        f.complete(v1);
1847 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1848 <
1631 <        checkCompletedWithWrappedCFException(h, ex);
1632 <        checkCompletedWithWrappedCFException(g, ex);
1633 <        assertEquals(0, r.invocationCount);
1634 <        checkCompletedNormally(f, v1);
1635 <        }
1636 <    }
1637 <
1638 <    public void testRunAfterBoth_exceptionalCompletion4() {
1845 >    /**
1846 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1847 >     */
1848 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1849          for (ExecutionMode m : ExecutionMode.values())
1850 <        for (Integer v1 : new Integer[] { 1, null }) {
1851 <
1850 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1851 >        for (boolean fFirst : new boolean[] { true, false })
1852 >        for (boolean failFirst : new boolean[] { true, false })
1853 >        for (Integer v1 : new Integer[] { 1, null })
1854 >    {
1855          final CompletableFuture<Integer> f = new CompletableFuture<>();
1856          final CompletableFuture<Integer> g = new CompletableFuture<>();
1857 <        final Noop r = new Noop();
1858 <        final CFException ex = new CFException();
1859 <
1860 <        f.completeExceptionally(ex);
1861 <        g.complete(v1);
1862 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1863 <
1864 <        checkCompletedWithWrappedCFException(h, ex);
1865 <        checkCompletedWithWrappedCFException(f, ex);
1866 <        assertEquals(0, r.invocationCount);
1867 <        checkCompletedNormally(g, v1);
1868 <        }
1869 <    }
1857 >        final SubtractAction r1 = new SubtractAction(m);
1858 >        final SubtractAction r2 = new SubtractAction(m);
1859 >        final SubtractAction r3 = new SubtractAction(m);
1860 >
1861 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1862 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1863 >        final Callable<Boolean> complete1 = failFirst ?
1864 >            () -> fst.cancel(mayInterruptIfRunning) :
1865 >            () -> fst.complete(v1);
1866 >        final Callable<Boolean> complete2 = failFirst ?
1867 >            () -> snd.complete(v1) :
1868 >            () -> snd.cancel(mayInterruptIfRunning);
1869 >
1870 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1871 >        assertTrue(complete1.call());
1872 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1873 >        checkIncomplete(h1);
1874 >        checkIncomplete(h2);
1875 >        assertTrue(complete2.call());
1876 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1877 >
1878 >        checkCompletedWithWrappedCancellationException(h1);
1879 >        checkCompletedWithWrappedCancellationException(h2);
1880 >        checkCompletedWithWrappedCancellationException(h3);
1881 >        r1.assertNotInvoked();
1882 >        r2.assertNotInvoked();
1883 >        r3.assertNotInvoked();
1884 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1885 >        checkCancelled(failFirst ? fst : snd);
1886 >    }}
1887  
1888      /**
1889 <     * runAfterBoth result completes exceptionally if action does
1889 >     * thenAcceptBoth result completes exceptionally if action does
1890       */
1891 <    public void testRunAfterBoth_actionFailed1() {
1891 >    public void testThenAcceptBoth_actionFailed() {
1892          for (ExecutionMode m : ExecutionMode.values())
1893 +        for (boolean fFirst : new boolean[] { true, false })
1894          for (Integer v1 : new Integer[] { 1, null })
1895 <        for (Integer v2 : new Integer[] { 2, null }) {
1896 <
1895 >        for (Integer v2 : new Integer[] { 2, null })
1896 >    {
1897          final CompletableFuture<Integer> f = new CompletableFuture<>();
1898          final CompletableFuture<Integer> g = new CompletableFuture<>();
1899 <        final FailingNoop r = new FailingNoop();
1900 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1901 <
1902 <        f.complete(v1);
1903 <        checkIncomplete(h);
1904 <        g.complete(v2);
1905 <
1906 <        checkCompletedWithWrappedCFException(h);
1899 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1900 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1901 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1902 >
1903 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1904 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1905 >        final Integer w1 =  fFirst ? v1 : v2;
1906 >        final Integer w2 = !fFirst ? v1 : v2;
1907 >
1908 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1909 >        assertTrue(fst.complete(w1));
1910 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1911 >        assertTrue(snd.complete(w2));
1912 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1913 >
1914 >        checkCompletedWithWrappedCFException(h1);
1915 >        checkCompletedWithWrappedCFException(h2);
1916 >        checkCompletedWithWrappedCFException(h3);
1917 >        r1.assertInvoked();
1918 >        r2.assertInvoked();
1919 >        r3.assertInvoked();
1920          checkCompletedNormally(f, v1);
1921          checkCompletedNormally(g, v2);
1922 <        }
1679 <    }
1922 >    }}
1923  
1924 <    public void testRunAfterBoth_actionFailed2() {
1924 >    /**
1925 >     * runAfterBoth result completes normally after normal
1926 >     * completion of sources
1927 >     */
1928 >    public void testRunAfterBoth_normalCompletion() {
1929          for (ExecutionMode m : ExecutionMode.values())
1930 +        for (boolean fFirst : new boolean[] { true, false })
1931          for (Integer v1 : new Integer[] { 1, null })
1932 <        for (Integer v2 : new Integer[] { 2, null }) {
1933 <
1932 >        for (Integer v2 : new Integer[] { 2, null })
1933 >    {
1934          final CompletableFuture<Integer> f = new CompletableFuture<>();
1935          final CompletableFuture<Integer> g = new CompletableFuture<>();
1936 <        final FailingNoop r = new FailingNoop();
1937 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1938 <
1939 <        g.complete(v2);
1940 <        checkIncomplete(h);
1941 <        f.complete(v1);
1942 <
1943 <        checkCompletedWithWrappedCFException(h);
1936 >        final Noop r1 = new Noop(m);
1937 >        final Noop r2 = new Noop(m);
1938 >        final Noop r3 = new Noop(m);
1939 >
1940 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1941 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1942 >        final Integer w1 =  fFirst ? v1 : v2;
1943 >        final Integer w2 = !fFirst ? v1 : v2;
1944 >
1945 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1946 >        assertTrue(fst.complete(w1));
1947 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1948 >        checkIncomplete(h1);
1949 >        checkIncomplete(h2);
1950 >        r1.assertNotInvoked();
1951 >        r2.assertNotInvoked();
1952 >        assertTrue(snd.complete(w2));
1953 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1954 >
1955 >        checkCompletedNormally(h1, null);
1956 >        checkCompletedNormally(h2, null);
1957 >        checkCompletedNormally(h3, null);
1958 >        r1.assertInvoked();
1959 >        r2.assertInvoked();
1960 >        r3.assertInvoked();
1961          checkCompletedNormally(f, v1);
1962          checkCompletedNormally(g, v2);
1963 <        }
1699 <    }
1963 >    }}
1964  
1965      /**
1966 <     * runAfterBoth result completes exceptionally if either source cancelled
1966 >     * runAfterBoth result completes exceptionally after exceptional
1967 >     * completion of either source
1968       */
1969 <    public void testRunAfterBoth_sourceCancelled1() {
1969 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1970          for (ExecutionMode m : ExecutionMode.values())
1971 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1972 <        for (Integer v1 : new Integer[] { 1, null }) {
1973 <
1971 >        for (boolean fFirst : new boolean[] { true, false })
1972 >        for (boolean failFirst : new boolean[] { true, false })
1973 >        for (Integer v1 : new Integer[] { 1, null })
1974 >    {
1975          final CompletableFuture<Integer> f = new CompletableFuture<>();
1976          final CompletableFuture<Integer> g = new CompletableFuture<>();
1977 <        final Noop r = new Noop();
1978 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1979 <
1980 <        assertTrue(f.cancel(mayInterruptIfRunning));
1981 <        checkIncomplete(h);
1982 <        g.complete(v1);
1983 <
1984 <        checkCompletedWithWrappedCancellationException(h);
1985 <        checkCancelled(f);
1986 <        assertEquals(0, r.invocationCount);
1987 <        checkCompletedNormally(g, v1);
1988 <        }
1989 <    }
1977 >        final CFException ex = new CFException();
1978 >        final Noop r1 = new Noop(m);
1979 >        final Noop r2 = new Noop(m);
1980 >        final Noop r3 = new Noop(m);
1981 >
1982 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1983 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1984 >        final Callable<Boolean> complete1 = failFirst ?
1985 >            () -> fst.completeExceptionally(ex) :
1986 >            () -> fst.complete(v1);
1987 >        final Callable<Boolean> complete2 = failFirst ?
1988 >            () -> snd.complete(v1) :
1989 >            () -> snd.completeExceptionally(ex);
1990 >
1991 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1992 >        assertTrue(complete1.call());
1993 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1994 >        checkIncomplete(h1);
1995 >        checkIncomplete(h2);
1996 >        assertTrue(complete2.call());
1997 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1998 >
1999 >        checkCompletedWithWrappedException(h1, ex);
2000 >        checkCompletedWithWrappedException(h2, ex);
2001 >        checkCompletedWithWrappedException(h3, ex);
2002 >        r1.assertNotInvoked();
2003 >        r2.assertNotInvoked();
2004 >        r3.assertNotInvoked();
2005 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2006 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2007 >    }}
2008  
2009 <    public void testRunAfterBoth_sourceCancelled2() {
2009 >    /**
2010 >     * runAfterBoth result completes exceptionally if either source cancelled
2011 >     */
2012 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2013          for (ExecutionMode m : ExecutionMode.values())
2014          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2015 <        for (Integer v1 : new Integer[] { 1, null }) {
2016 <
2015 >        for (boolean fFirst : new boolean[] { true, false })
2016 >        for (boolean failFirst : new boolean[] { true, false })
2017 >        for (Integer v1 : new Integer[] { 1, null })
2018 >    {
2019          final CompletableFuture<Integer> f = new CompletableFuture<>();
2020          final CompletableFuture<Integer> g = new CompletableFuture<>();
2021 <        final Noop r = new Noop();
2022 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2023 <
2024 <        assertTrue(g.cancel(mayInterruptIfRunning));
2025 <        checkIncomplete(h);
2026 <        f.complete(v1);
2027 <
2028 <        checkCompletedWithWrappedCancellationException(h);
2029 <        checkCancelled(g);
2030 <        assertEquals(0, r.invocationCount);
2031 <        checkCompletedNormally(f, v1);
2032 <        }
2033 <    }
2021 >        final Noop r1 = new Noop(m);
2022 >        final Noop r2 = new Noop(m);
2023 >        final Noop r3 = new Noop(m);
2024 >
2025 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2026 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2027 >        final Callable<Boolean> complete1 = failFirst ?
2028 >            () -> fst.cancel(mayInterruptIfRunning) :
2029 >            () -> fst.complete(v1);
2030 >        final Callable<Boolean> complete2 = failFirst ?
2031 >            () -> snd.complete(v1) :
2032 >            () -> snd.cancel(mayInterruptIfRunning);
2033 >
2034 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2035 >        assertTrue(complete1.call());
2036 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2037 >        checkIncomplete(h1);
2038 >        checkIncomplete(h2);
2039 >        assertTrue(complete2.call());
2040 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2041 >
2042 >        checkCompletedWithWrappedCancellationException(h1);
2043 >        checkCompletedWithWrappedCancellationException(h2);
2044 >        checkCompletedWithWrappedCancellationException(h3);
2045 >        r1.assertNotInvoked();
2046 >        r2.assertNotInvoked();
2047 >        r3.assertNotInvoked();
2048 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2049 >        checkCancelled(failFirst ? fst : snd);
2050 >    }}
2051  
2052 <    public void testRunAfterBoth_sourceCancelled3() {
2052 >    /**
2053 >     * runAfterBoth result completes exceptionally if action does
2054 >     */
2055 >    public void testRunAfterBoth_actionFailed() {
2056          for (ExecutionMode m : ExecutionMode.values())
2057 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2058 <        for (Integer v1 : new Integer[] { 1, null }) {
2059 <
2057 >        for (boolean fFirst : new boolean[] { true, false })
2058 >        for (Integer v1 : new Integer[] { 1, null })
2059 >        for (Integer v2 : new Integer[] { 2, null })
2060 >    {
2061          final CompletableFuture<Integer> f = new CompletableFuture<>();
2062          final CompletableFuture<Integer> g = new CompletableFuture<>();
2063 <        final Noop r = new Noop();
2064 <
2065 <        assertTrue(g.cancel(mayInterruptIfRunning));
2066 <        f.complete(v1);
2067 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2068 <
2069 <        checkCompletedWithWrappedCancellationException(h);
2070 <        checkCancelled(g);
2071 <        assertEquals(0, r.invocationCount);
2063 >        final FailingRunnable r1 = new FailingRunnable(m);
2064 >        final FailingRunnable r2 = new FailingRunnable(m);
2065 >        final FailingRunnable r3 = new FailingRunnable(m);
2066 >
2067 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2068 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2069 >        final Integer w1 =  fFirst ? v1 : v2;
2070 >        final Integer w2 = !fFirst ? v1 : v2;
2071 >
2072 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2073 >        assertTrue(fst.complete(w1));
2074 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2075 >        assertTrue(snd.complete(w2));
2076 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2077 >
2078 >        checkCompletedWithWrappedCFException(h1);
2079 >        checkCompletedWithWrappedCFException(h2);
2080 >        checkCompletedWithWrappedCFException(h3);
2081 >        r1.assertInvoked();
2082 >        r2.assertInvoked();
2083 >        r3.assertInvoked();
2084          checkCompletedNormally(f, v1);
2085 <        }
2086 <    }
1765 <
1766 <    public void testRunAfterBoth_sourceCancelled4() {
1767 <        for (ExecutionMode m : ExecutionMode.values())
1768 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1769 <        for (Integer v1 : new Integer[] { 1, null }) {
1770 <
1771 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1772 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1773 <        final Noop r = new Noop();
1774 <
1775 <        assertTrue(f.cancel(mayInterruptIfRunning));
1776 <        g.complete(v1);
1777 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1778 <
1779 <        checkCompletedWithWrappedCancellationException(h);
1780 <        checkCancelled(f);
1781 <        assertEquals(0, r.invocationCount);
1782 <        checkCompletedNormally(g, v1);
1783 <        }
1784 <    }
2085 >        checkCompletedNormally(g, v2);
2086 >    }}
2087  
2088      /**
2089       * applyToEither result completes normally after normal completion
2090       * of either source
2091       */
2092 <    public void testApplyToEither_normalCompletion1() {
2092 >    public void testApplyToEither_normalCompletion() {
2093          for (ExecutionMode m : ExecutionMode.values())
2094          for (Integer v1 : new Integer[] { 1, null })
2095 <        for (Integer v2 : new Integer[] { 2, null }) {
2096 <
2095 >        for (Integer v2 : new Integer[] { 2, null })
2096 >    {
2097          final CompletableFuture<Integer> f = new CompletableFuture<>();
2098          final CompletableFuture<Integer> g = new CompletableFuture<>();
2099 <        final IncFunction r = new IncFunction();
2100 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2099 >        final IncFunction[] rs = new IncFunction[6];
2100 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2101  
2102 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2103 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2104 +        checkIncomplete(h0);
2105 +        checkIncomplete(h1);
2106 +        rs[0].assertNotInvoked();
2107 +        rs[1].assertNotInvoked();
2108          f.complete(v1);
2109 <        checkCompletedNormally(h, inc(v1));
2110 <        g.complete(v2);
2111 <
2112 <        checkCompletedNormally(f, v1);
2113 <        checkCompletedNormally(g, v2);
2114 <        checkCompletedNormally(h, inc(v1));
1807 <        }
1808 <    }
1809 <
1810 <    public void testApplyToEither_normalCompletion2() {
1811 <        for (ExecutionMode m : ExecutionMode.values())
1812 <        for (Integer v1 : new Integer[] { 1, null })
1813 <        for (Integer v2 : new Integer[] { 2, null }) {
1814 <
1815 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1816 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1817 <        final IncFunction r = new IncFunction();
1818 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1819 <
2109 >        checkCompletedNormally(h0, inc(v1));
2110 >        checkCompletedNormally(h1, inc(v1));
2111 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2112 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2113 >        checkCompletedNormally(h2, inc(v1));
2114 >        checkCompletedNormally(h3, inc(v1));
2115          g.complete(v2);
1821        checkCompletedNormally(h, inc(v2));
1822        f.complete(v1);
1823
1824        checkCompletedNormally(f, v1);
1825        checkCompletedNormally(g, v2);
1826        checkCompletedNormally(h, inc(v2));
1827        }
1828    }
1829    public void testApplyToEither_normalCompletion3() {
1830        for (ExecutionMode m : ExecutionMode.values())
1831        for (Integer v1 : new Integer[] { 1, null })
1832        for (Integer v2 : new Integer[] { 2, null }) {
2116  
2117 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2118 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2119 <        final IncFunction r = new IncFunction();
2120 <
2121 <        f.complete(v1);
2122 <        g.complete(v2);
2123 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2117 >        // unspecified behavior - both source completions available
2118 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2119 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2120 >        rs[4].assertValue(h4.join());
2121 >        rs[5].assertValue(h5.join());
2122 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2123 >                   Objects.equals(inc(v2), h4.join()));
2124 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2125 >                   Objects.equals(inc(v2), h5.join()));
2126  
2127          checkCompletedNormally(f, v1);
2128          checkCompletedNormally(g, v2);
2129 <
2130 <        // unspecified behavior
2131 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2132 <                   Objects.equals(h.join(), inc(v2)));
2133 <        assertEquals(1, r.invocationCount);
2134 <        }
1850 <    }
2129 >        checkCompletedNormally(h0, inc(v1));
2130 >        checkCompletedNormally(h1, inc(v1));
2131 >        checkCompletedNormally(h2, inc(v1));
2132 >        checkCompletedNormally(h3, inc(v1));
2133 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2134 >    }}
2135  
2136      /**
2137       * applyToEither result completes exceptionally after exceptional
2138       * completion of either source
2139       */
2140 <    public void testApplyToEither_exceptionalCompletion1() {
2140 >    public void testApplyToEither_exceptionalCompletion() {
2141          for (ExecutionMode m : ExecutionMode.values())
2142 <        for (Integer v1 : new Integer[] { 1, null }) {
2143 <
2142 >        for (Integer v1 : new Integer[] { 1, null })
2143 >    {
2144          final CompletableFuture<Integer> f = new CompletableFuture<>();
2145          final CompletableFuture<Integer> g = new CompletableFuture<>();
1862        final IncFunction r = new IncFunction();
1863        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2146          final CFException ex = new CFException();
2147 +        final IncFunction[] rs = new IncFunction[6];
2148 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2149  
2150 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2151 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2152 +        checkIncomplete(h0);
2153 +        checkIncomplete(h1);
2154 +        rs[0].assertNotInvoked();
2155 +        rs[1].assertNotInvoked();
2156          f.completeExceptionally(ex);
2157 <        checkCompletedWithWrappedCFException(h, ex);
2157 >        checkCompletedWithWrappedException(h0, ex);
2158 >        checkCompletedWithWrappedException(h1, ex);
2159 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2160 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2161 >        checkCompletedWithWrappedException(h2, ex);
2162 >        checkCompletedWithWrappedException(h3, ex);
2163          g.complete(v1);
2164  
2165 <        assertEquals(0, r.invocationCount);
2166 <        checkCompletedNormally(g, v1);
2167 <        checkCompletedWithWrappedCFException(f, ex);
2168 <        checkCompletedWithWrappedCFException(h, ex);
2169 <        }
2170 <    }
2171 <
2172 <    public void testApplyToEither_exceptionalCompletion2() {
2173 <        for (ExecutionMode m : ExecutionMode.values())
1879 <        for (Integer v1 : new Integer[] { 1, null }) {
1880 <
1881 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1882 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1883 <        final IncFunction r = new IncFunction();
1884 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1885 <        final CFException ex = new CFException();
1886 <
1887 <        g.completeExceptionally(ex);
1888 <        checkCompletedWithWrappedCFException(h, ex);
1889 <        f.complete(v1);
1890 <
1891 <        assertEquals(0, r.invocationCount);
1892 <        checkCompletedNormally(f, v1);
1893 <        checkCompletedWithWrappedCFException(g, ex);
1894 <        checkCompletedWithWrappedCFException(h, ex);
2165 >        // unspecified behavior - both source completions available
2166 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2167 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2168 >        try {
2169 >            assertEquals(inc(v1), h4.join());
2170 >            rs[4].assertValue(inc(v1));
2171 >        } catch (CompletionException ok) {
2172 >            checkCompletedWithWrappedException(h4, ex);
2173 >            rs[4].assertNotInvoked();
2174          }
1896    }
1897
1898    public void testApplyToEither_exceptionalCompletion3() {
1899        for (ExecutionMode m : ExecutionMode.values())
1900        for (Integer v1 : new Integer[] { 1, null }) {
1901
1902        final CompletableFuture<Integer> f = new CompletableFuture<>();
1903        final CompletableFuture<Integer> g = new CompletableFuture<>();
1904        final IncFunction r = new IncFunction();
1905        final CFException ex = new CFException();
1906
1907        g.completeExceptionally(ex);
1908        f.complete(v1);
1909        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1910
1911        // unspecified behavior
1912        Integer v;
2175          try {
2176 <            assertEquals(h.join(), inc(v1));
2177 <            assertEquals(1, r.invocationCount);
2176 >            assertEquals(inc(v1), h5.join());
2177 >            rs[5].assertValue(inc(v1));
2178          } catch (CompletionException ok) {
2179 <            checkCompletedWithWrappedCFException(h, ex);
2180 <            assertEquals(0, r.invocationCount);
2179 >            checkCompletedWithWrappedException(h5, ex);
2180 >            rs[5].assertNotInvoked();
2181          }
2182  
2183 <        checkCompletedWithWrappedCFException(g, ex);
2184 <        checkCompletedNormally(f, v1);
2185 <        }
2186 <    }
2183 >        checkCompletedExceptionally(f, ex);
2184 >        checkCompletedNormally(g, v1);
2185 >        checkCompletedWithWrappedException(h0, ex);
2186 >        checkCompletedWithWrappedException(h1, ex);
2187 >        checkCompletedWithWrappedException(h2, ex);
2188 >        checkCompletedWithWrappedException(h3, ex);
2189 >        checkCompletedWithWrappedException(h4, ex);
2190 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2191 >    }}
2192  
2193 <    public void testApplyToEither_exceptionalCompletion4() {
2193 >    public void testApplyToEither_exceptionalCompletion2() {
2194          for (ExecutionMode m : ExecutionMode.values())
2195 <        for (Integer v1 : new Integer[] { 1, null }) {
2196 <
2195 >        for (boolean fFirst : new boolean[] { true, false })
2196 >        for (Integer v1 : new Integer[] { 1, null })
2197 >    {
2198          final CompletableFuture<Integer> f = new CompletableFuture<>();
2199          final CompletableFuture<Integer> g = new CompletableFuture<>();
1932        final IncFunction r = new IncFunction();
2200          final CFException ex = new CFException();
2201 +        final IncFunction[] rs = new IncFunction[6];
2202 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2203  
2204 <        f.completeExceptionally(ex);
2205 <        g.complete(v1);
2206 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2204 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2205 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2206 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2207 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2208 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2209 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2210  
2211 <        // unspecified behavior
1940 <        Integer v;
2211 >        // unspecified behavior - both source completions available
2212          try {
2213 <            assertEquals(h.join(), inc(v1));
2214 <            assertEquals(1, r.invocationCount);
2213 >            assertEquals(inc(v1), h0.join());
2214 >            rs[0].assertValue(inc(v1));
2215          } catch (CompletionException ok) {
2216 <            checkCompletedWithWrappedCFException(h, ex);
2217 <            assertEquals(0, r.invocationCount);
2216 >            checkCompletedWithWrappedException(h0, ex);
2217 >            rs[0].assertNotInvoked();
2218          }
2219 <
2220 <        checkCompletedWithWrappedCFException(f, ex);
2221 <        checkCompletedNormally(g, v1);
2219 >        try {
2220 >            assertEquals(inc(v1), h1.join());
2221 >            rs[1].assertValue(inc(v1));
2222 >        } catch (CompletionException ok) {
2223 >            checkCompletedWithWrappedException(h1, ex);
2224 >            rs[1].assertNotInvoked();
2225          }
2226 <    }
2227 <
2228 <    /**
2229 <     * applyToEither result completes exceptionally if action does
2230 <     */
2231 <    public void testApplyToEither_actionFailed1() {
2232 <        for (ExecutionMode m : ExecutionMode.values())
2233 <        for (Integer v1 : new Integer[] { 1, null })
2234 <        for (Integer v2 : new Integer[] { 2, null }) {
2235 <
2236 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2237 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2238 <        final FailingFunction r = new FailingFunction();
1965 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1966 <
1967 <        f.complete(v1);
1968 <        checkCompletedWithWrappedCFException(h);
1969 <        g.complete(v2);
1970 <        checkCompletedNormally(f, v1);
1971 <        checkCompletedNormally(g, v2);
2226 >        try {
2227 >            assertEquals(inc(v1), h2.join());
2228 >            rs[2].assertValue(inc(v1));
2229 >        } catch (CompletionException ok) {
2230 >            checkCompletedWithWrappedException(h2, ex);
2231 >            rs[2].assertNotInvoked();
2232 >        }
2233 >        try {
2234 >            assertEquals(inc(v1), h3.join());
2235 >            rs[3].assertValue(inc(v1));
2236 >        } catch (CompletionException ok) {
2237 >            checkCompletedWithWrappedException(h3, ex);
2238 >            rs[3].assertNotInvoked();
2239          }
1973    }
1974
1975    public void testApplyToEither_actionFailed2() {
1976        for (ExecutionMode m : ExecutionMode.values())
1977        for (Integer v1 : new Integer[] { 1, null })
1978        for (Integer v2 : new Integer[] { 2, null }) {
1979
1980        final CompletableFuture<Integer> f = new CompletableFuture<>();
1981        final CompletableFuture<Integer> g = new CompletableFuture<>();
1982        final FailingFunction r = new FailingFunction();
1983        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2240  
1985        g.complete(v2);
1986        checkCompletedWithWrappedCFException(h);
1987        f.complete(v1);
2241          checkCompletedNormally(f, v1);
2242 <        checkCompletedNormally(g, v2);
2243 <        }
1991 <    }
2242 >        checkCompletedExceptionally(g, ex);
2243 >    }}
2244  
2245      /**
2246       * applyToEither result completes exceptionally if either source cancelled
2247       */
2248 <    public void testApplyToEither_sourceCancelled1() {
2248 >    public void testApplyToEither_sourceCancelled() {
2249          for (ExecutionMode m : ExecutionMode.values())
2250          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2251 <        for (Integer v1 : new Integer[] { 1, null }) {
2252 <
2251 >        for (Integer v1 : new Integer[] { 1, null })
2252 >    {
2253          final CompletableFuture<Integer> f = new CompletableFuture<>();
2254          final CompletableFuture<Integer> g = new CompletableFuture<>();
2255 <        final IncFunction r = new IncFunction();
2256 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2255 >        final IncFunction[] rs = new IncFunction[6];
2256 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2257  
2258 <        assertTrue(f.cancel(mayInterruptIfRunning));
2259 <        checkCompletedWithWrappedCancellationException(h);
2258 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2259 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2260 >        checkIncomplete(h0);
2261 >        checkIncomplete(h1);
2262 >        rs[0].assertNotInvoked();
2263 >        rs[1].assertNotInvoked();
2264 >        f.cancel(mayInterruptIfRunning);
2265 >        checkCompletedWithWrappedCancellationException(h0);
2266 >        checkCompletedWithWrappedCancellationException(h1);
2267 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2268 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2269 >        checkCompletedWithWrappedCancellationException(h2);
2270 >        checkCompletedWithWrappedCancellationException(h3);
2271          g.complete(v1);
2272  
2273 +        // unspecified behavior - both source completions available
2274 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2275 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2276 +        try {
2277 +            assertEquals(inc(v1), h4.join());
2278 +            rs[4].assertValue(inc(v1));
2279 +        } catch (CompletionException ok) {
2280 +            checkCompletedWithWrappedCancellationException(h4);
2281 +            rs[4].assertNotInvoked();
2282 +        }
2283 +        try {
2284 +            assertEquals(inc(v1), h5.join());
2285 +            rs[5].assertValue(inc(v1));
2286 +        } catch (CompletionException ok) {
2287 +            checkCompletedWithWrappedCancellationException(h5);
2288 +            rs[5].assertNotInvoked();
2289 +        }
2290 +
2291          checkCancelled(f);
2011        assertEquals(0, r.invocationCount);
2292          checkCompletedNormally(g, v1);
2293 <        checkCompletedWithWrappedCancellationException(h);
2294 <        }
2295 <    }
2293 >        checkCompletedWithWrappedCancellationException(h0);
2294 >        checkCompletedWithWrappedCancellationException(h1);
2295 >        checkCompletedWithWrappedCancellationException(h2);
2296 >        checkCompletedWithWrappedCancellationException(h3);
2297 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2298 >    }}
2299  
2300      public void testApplyToEither_sourceCancelled2() {
2301          for (ExecutionMode m : ExecutionMode.values())
2302          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2303 <        for (Integer v1 : new Integer[] { 1, null }) {
2304 <
2303 >        for (boolean fFirst : new boolean[] { true, false })
2304 >        for (Integer v1 : new Integer[] { 1, null })
2305 >    {
2306          final CompletableFuture<Integer> f = new CompletableFuture<>();
2307          final CompletableFuture<Integer> g = new CompletableFuture<>();
2308 <        final IncFunction r = new IncFunction();
2309 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2308 >        final IncFunction[] rs = new IncFunction[6];
2309 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2310  
2311 <        assertTrue(g.cancel(mayInterruptIfRunning));
2312 <        checkCompletedWithWrappedCancellationException(h);
2313 <        f.complete(v1);
2311 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2312 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2313 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2314 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2315 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2316 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2317  
2318 <        checkCancelled(g);
2319 <        assertEquals(0, r.invocationCount);
2320 <        checkCompletedNormally(f, v1);
2321 <        checkCompletedWithWrappedCancellationException(h);
2318 >        // unspecified behavior - both source completions available
2319 >        try {
2320 >            assertEquals(inc(v1), h0.join());
2321 >            rs[0].assertValue(inc(v1));
2322 >        } catch (CompletionException ok) {
2323 >            checkCompletedWithWrappedCancellationException(h0);
2324 >            rs[0].assertNotInvoked();
2325          }
2036    }
2037
2038    public void testApplyToEither_sourceCancelled3() {
2039        for (ExecutionMode m : ExecutionMode.values())
2040        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2041        for (Integer v1 : new Integer[] { 1, null }) {
2042
2043        final CompletableFuture<Integer> f = new CompletableFuture<>();
2044        final CompletableFuture<Integer> g = new CompletableFuture<>();
2045        final IncFunction r = new IncFunction();
2046
2047        assertTrue(g.cancel(mayInterruptIfRunning));
2048        f.complete(v1);
2049        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2050
2051        // unspecified behavior
2052        Integer v;
2326          try {
2327 <            assertEquals(h.join(), inc(v1));
2328 <            assertEquals(1, r.invocationCount);
2327 >            assertEquals(inc(v1), h1.join());
2328 >            rs[1].assertValue(inc(v1));
2329          } catch (CompletionException ok) {
2330 <            checkCompletedWithWrappedCancellationException(h);
2331 <            assertEquals(0, r.invocationCount);
2330 >            checkCompletedWithWrappedCancellationException(h1);
2331 >            rs[1].assertNotInvoked();
2332          }
2333 <
2334 <        checkCancelled(g);
2335 <        checkCompletedNormally(f, v1);
2333 >        try {
2334 >            assertEquals(inc(v1), h2.join());
2335 >            rs[2].assertValue(inc(v1));
2336 >        } catch (CompletionException ok) {
2337 >            checkCompletedWithWrappedCancellationException(h2);
2338 >            rs[2].assertNotInvoked();
2339          }
2064    }
2065
2066    public void testApplyToEither_sourceCancelled4() {
2067        for (ExecutionMode m : ExecutionMode.values())
2068        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2069        for (Integer v1 : new Integer[] { 1, null }) {
2070
2071        final CompletableFuture<Integer> f = new CompletableFuture<>();
2072        final CompletableFuture<Integer> g = new CompletableFuture<>();
2073        final IncFunction r = new IncFunction();
2074
2075        assertTrue(f.cancel(mayInterruptIfRunning));
2076        g.complete(v1);
2077        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2078
2079        // unspecified behavior
2080        Integer v;
2340          try {
2341 <            assertEquals(h.join(), inc(v1));
2342 <            assertEquals(1, r.invocationCount);
2341 >            assertEquals(inc(v1), h3.join());
2342 >            rs[3].assertValue(inc(v1));
2343          } catch (CompletionException ok) {
2344 <            checkCompletedWithWrappedCancellationException(h);
2345 <            assertEquals(0, r.invocationCount);
2344 >            checkCompletedWithWrappedCancellationException(h3);
2345 >            rs[3].assertNotInvoked();
2346          }
2347  
2348 <        checkCancelled(f);
2349 <        checkCompletedNormally(g, v1);
2350 <        }
2092 <    }
2348 >        checkCompletedNormally(f, v1);
2349 >        checkCancelled(g);
2350 >    }}
2351  
2352      /**
2353 <     * acceptEither result completes normally after normal completion
2096 <     * of either source
2353 >     * applyToEither result completes exceptionally if action does
2354       */
2355 <    public void testAcceptEither_normalCompletion1() {
2355 >    public void testApplyToEither_actionFailed() {
2356          for (ExecutionMode m : ExecutionMode.values())
2357          for (Integer v1 : new Integer[] { 1, null })
2358 <        for (Integer v2 : new Integer[] { 2, null }) {
2359 <
2358 >        for (Integer v2 : new Integer[] { 2, null })
2359 >    {
2360          final CompletableFuture<Integer> f = new CompletableFuture<>();
2361          final CompletableFuture<Integer> g = new CompletableFuture<>();
2362 <        final IncAction r = new IncAction();
2363 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2362 >        final FailingFunction[] rs = new FailingFunction[6];
2363 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2364  
2365 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2366 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2367          f.complete(v1);
2368 <        checkCompletedNormally(h, null);
2369 <        assertEquals(r.value, inc(v1));
2370 <        g.complete(v2);
2368 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2369 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2370 >        checkCompletedWithWrappedCFException(h0);
2371 >        checkCompletedWithWrappedCFException(h1);
2372 >        checkCompletedWithWrappedCFException(h2);
2373 >        checkCompletedWithWrappedCFException(h3);
2374 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2375  
2376 <        checkCompletedNormally(f, v1);
2114 <        checkCompletedNormally(g, v2);
2115 <        checkCompletedNormally(h, null);
2116 <        }
2117 <    }
2118 <
2119 <    public void testAcceptEither_normalCompletion2() {
2120 <        for (ExecutionMode m : ExecutionMode.values())
2121 <        for (Integer v1 : new Integer[] { 1, null })
2122 <        for (Integer v2 : new Integer[] { 2, null }) {
2376 >        g.complete(v2);
2377  
2378 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2379 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2380 <        final IncAction r = new IncAction();
2127 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2378 >        // unspecified behavior - both source completions available
2379 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2380 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2381  
2382 <        g.complete(v2);
2383 <        checkCompletedNormally(h, null);
2384 <        assertEquals(r.value, inc(v2));
2385 <        f.complete(v1);
2382 >        checkCompletedWithWrappedCFException(h4);
2383 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2384 >                   Objects.equals(v2, rs[4].value));
2385 >        checkCompletedWithWrappedCFException(h5);
2386 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2387 >                   Objects.equals(v2, rs[5].value));
2388  
2389          checkCompletedNormally(f, v1);
2390          checkCompletedNormally(g, v2);
2391 <        checkCompletedNormally(h, null);
2392 <        }
2393 <    }
2394 <    public void testAcceptEither_normalCompletion3() {
2391 >    }}
2392 >
2393 >    /**
2394 >     * acceptEither result completes normally after normal completion
2395 >     * of either source
2396 >     */
2397 >    public void testAcceptEither_normalCompletion() {
2398          for (ExecutionMode m : ExecutionMode.values())
2399          for (Integer v1 : new Integer[] { 1, null })
2400 <        for (Integer v2 : new Integer[] { 2, null }) {
2401 <
2400 >        for (Integer v2 : new Integer[] { 2, null })
2401 >    {
2402          final CompletableFuture<Integer> f = new CompletableFuture<>();
2403          final CompletableFuture<Integer> g = new CompletableFuture<>();
2404 <        final IncAction r = new IncAction();
2404 >        final NoopConsumer[] rs = new NoopConsumer[6];
2405 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2406 >
2407 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2408 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2409 >        checkIncomplete(h0);
2410 >        checkIncomplete(h1);
2411 >        rs[0].assertNotInvoked();
2412 >        rs[1].assertNotInvoked();
2413 >        f.complete(v1);
2414 >        checkCompletedNormally(h0, null);
2415 >        checkCompletedNormally(h1, null);
2416 >        rs[0].assertValue(v1);
2417 >        rs[1].assertValue(v1);
2418 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2419 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2420 >        checkCompletedNormally(h2, null);
2421 >        checkCompletedNormally(h3, null);
2422 >        rs[2].assertValue(v1);
2423 >        rs[3].assertValue(v1);
2424 >        g.complete(v2);
2425 >
2426 >        // unspecified behavior - both source completions available
2427 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2428 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2429 >        checkCompletedNormally(h4, null);
2430 >        checkCompletedNormally(h5, null);
2431 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2432 >                   Objects.equals(v2, rs[4].value));
2433 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2434 >                   Objects.equals(v2, rs[5].value));
2435  
2148        f.complete(v1);
2149        g.complete(v2);
2150        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2151
2152        checkCompletedNormally(h, null);
2436          checkCompletedNormally(f, v1);
2437          checkCompletedNormally(g, v2);
2438 <
2439 <        // unspecified behavior
2440 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2441 <                   Objects.equals(r.value, inc(v2)));
2442 <        }
2443 <    }
2438 >        checkCompletedNormally(h0, null);
2439 >        checkCompletedNormally(h1, null);
2440 >        checkCompletedNormally(h2, null);
2441 >        checkCompletedNormally(h3, null);
2442 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2443 >    }}
2444  
2445      /**
2446       * acceptEither result completes exceptionally after exceptional
2447       * completion of either source
2448       */
2449 <    public void testAcceptEither_exceptionalCompletion1() {
2449 >    public void testAcceptEither_exceptionalCompletion() {
2450          for (ExecutionMode m : ExecutionMode.values())
2451 <        for (Integer v1 : new Integer[] { 1, null }) {
2452 <
2451 >        for (Integer v1 : new Integer[] { 1, null })
2452 >    {
2453          final CompletableFuture<Integer> f = new CompletableFuture<>();
2454          final CompletableFuture<Integer> g = new CompletableFuture<>();
2172        final IncAction r = new IncAction();
2173        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2455          final CFException ex = new CFException();
2456 +        final NoopConsumer[] rs = new NoopConsumer[6];
2457 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2458  
2459 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2460 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2461 +        checkIncomplete(h0);
2462 +        checkIncomplete(h1);
2463 +        rs[0].assertNotInvoked();
2464 +        rs[1].assertNotInvoked();
2465          f.completeExceptionally(ex);
2466 <        checkCompletedWithWrappedCFException(h, ex);
2467 <        g.complete(v1);
2468 <
2469 <        assertEquals(0, r.invocationCount);
2470 <        checkCompletedNormally(g, v1);
2471 <        checkCompletedWithWrappedCFException(f, ex);
2183 <        checkCompletedWithWrappedCFException(h, ex);
2184 <        }
2185 <    }
2186 <
2187 <    public void testAcceptEither_exceptionalCompletion2() {
2188 <        for (ExecutionMode m : ExecutionMode.values())
2189 <        for (Integer v1 : new Integer[] { 1, null }) {
2190 <
2191 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2192 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2193 <        final IncAction r = new IncAction();
2194 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2195 <        final CFException ex = new CFException();
2466 >        checkCompletedWithWrappedException(h0, ex);
2467 >        checkCompletedWithWrappedException(h1, ex);
2468 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2469 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2470 >        checkCompletedWithWrappedException(h2, ex);
2471 >        checkCompletedWithWrappedException(h3, ex);
2472  
2473 <        g.completeExceptionally(ex);
2198 <        checkCompletedWithWrappedCFException(h, ex);
2199 <        f.complete(v1);
2473 >        g.complete(v1);
2474  
2475 <        assertEquals(0, r.invocationCount);
2476 <        checkCompletedNormally(f, v1);
2477 <        checkCompletedWithWrappedCFException(g, ex);
2478 <        checkCompletedWithWrappedCFException(h, ex);
2475 >        // unspecified behavior - both source completions available
2476 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2477 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2478 >        try {
2479 >            assertNull(h4.join());
2480 >            rs[4].assertValue(v1);
2481 >        } catch (CompletionException ok) {
2482 >            checkCompletedWithWrappedException(h4, ex);
2483 >            rs[4].assertNotInvoked();
2484          }
2206    }
2207
2208    public void testAcceptEither_exceptionalCompletion3() {
2209        for (ExecutionMode m : ExecutionMode.values())
2210        for (Integer v1 : new Integer[] { 1, null }) {
2211
2212        final CompletableFuture<Integer> f = new CompletableFuture<>();
2213        final CompletableFuture<Integer> g = new CompletableFuture<>();
2214        final IncAction r = new IncAction();
2215        final CFException ex = new CFException();
2216
2217        g.completeExceptionally(ex);
2218        f.complete(v1);
2219        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2220
2221        // unspecified behavior
2222        Integer v;
2485          try {
2486 <            assertEquals(h.join(), null);
2487 <            assertEquals(1, r.invocationCount);
2226 <            assertEquals(inc(v1), r.value);
2486 >            assertNull(h5.join());
2487 >            rs[5].assertValue(v1);
2488          } catch (CompletionException ok) {
2489 <            checkCompletedWithWrappedCFException(h, ex);
2490 <            assertEquals(0, r.invocationCount);
2489 >            checkCompletedWithWrappedException(h5, ex);
2490 >            rs[5].assertNotInvoked();
2491          }
2492  
2493 <        checkCompletedWithWrappedCFException(g, ex);
2494 <        checkCompletedNormally(f, v1);
2495 <        }
2496 <    }
2493 >        checkCompletedExceptionally(f, ex);
2494 >        checkCompletedNormally(g, v1);
2495 >        checkCompletedWithWrappedException(h0, ex);
2496 >        checkCompletedWithWrappedException(h1, ex);
2497 >        checkCompletedWithWrappedException(h2, ex);
2498 >        checkCompletedWithWrappedException(h3, ex);
2499 >        checkCompletedWithWrappedException(h4, ex);
2500 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2501 >    }}
2502  
2503 <    public void testAcceptEither_exceptionalCompletion4() {
2503 >    public void testAcceptEither_exceptionalCompletion2() {
2504          for (ExecutionMode m : ExecutionMode.values())
2505 <        for (Integer v1 : new Integer[] { 1, null }) {
2506 <
2505 >        for (boolean fFirst : new boolean[] { true, false })
2506 >        for (Integer v1 : new Integer[] { 1, null })
2507 >    {
2508          final CompletableFuture<Integer> f = new CompletableFuture<>();
2509          final CompletableFuture<Integer> g = new CompletableFuture<>();
2243        final IncAction r = new IncAction();
2510          final CFException ex = new CFException();
2511 +        final NoopConsumer[] rs = new NoopConsumer[6];
2512 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2513  
2514 <        f.completeExceptionally(ex);
2515 <        g.complete(v1);
2516 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2514 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2515 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2516 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2517 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2518 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2519 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2520  
2521 <        // unspecified behavior
2251 <        Integer v;
2521 >        // unspecified behavior - both source completions available
2522          try {
2523 <            assertEquals(h.join(), null);
2524 <            assertEquals(1, r.invocationCount);
2255 <            assertEquals(inc(v1), r.value);
2523 >            assertEquals(null, h0.join());
2524 >            rs[0].assertValue(v1);
2525          } catch (CompletionException ok) {
2526 <            checkCompletedWithWrappedCFException(h, ex);
2527 <            assertEquals(0, r.invocationCount);
2526 >            checkCompletedWithWrappedException(h0, ex);
2527 >            rs[0].assertNotInvoked();
2528          }
2529 <
2530 <        checkCompletedWithWrappedCFException(f, ex);
2531 <        checkCompletedNormally(g, v1);
2529 >        try {
2530 >            assertEquals(null, h1.join());
2531 >            rs[1].assertValue(v1);
2532 >        } catch (CompletionException ok) {
2533 >            checkCompletedWithWrappedException(h1, ex);
2534 >            rs[1].assertNotInvoked();
2535          }
2536 <    }
2537 <
2538 <    /**
2539 <     * acceptEither result completes exceptionally if action does
2540 <     */
2541 <    public void testAcceptEither_actionFailed1() {
2542 <        for (ExecutionMode m : ExecutionMode.values())
2543 <        for (Integer v1 : new Integer[] { 1, null })
2544 <        for (Integer v2 : new Integer[] { 2, null }) {
2545 <
2546 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2547 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2548 <        final FailingConsumer r = new FailingConsumer();
2277 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2278 <
2279 <        f.complete(v1);
2280 <        checkCompletedWithWrappedCFException(h);
2281 <        g.complete(v2);
2282 <        checkCompletedNormally(f, v1);
2283 <        checkCompletedNormally(g, v2);
2536 >        try {
2537 >            assertEquals(null, h2.join());
2538 >            rs[2].assertValue(v1);
2539 >        } catch (CompletionException ok) {
2540 >            checkCompletedWithWrappedException(h2, ex);
2541 >            rs[2].assertNotInvoked();
2542 >        }
2543 >        try {
2544 >            assertEquals(null, h3.join());
2545 >            rs[3].assertValue(v1);
2546 >        } catch (CompletionException ok) {
2547 >            checkCompletedWithWrappedException(h3, ex);
2548 >            rs[3].assertNotInvoked();
2549          }
2285    }
2286
2287    public void testAcceptEither_actionFailed2() {
2288        for (ExecutionMode m : ExecutionMode.values())
2289        for (Integer v1 : new Integer[] { 1, null })
2290        for (Integer v2 : new Integer[] { 2, null }) {
2291
2292        final CompletableFuture<Integer> f = new CompletableFuture<>();
2293        final CompletableFuture<Integer> g = new CompletableFuture<>();
2294        final FailingConsumer r = new FailingConsumer();
2295        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2550  
2297        g.complete(v2);
2298        checkCompletedWithWrappedCFException(h);
2299        f.complete(v1);
2551          checkCompletedNormally(f, v1);
2552 <        checkCompletedNormally(g, v2);
2553 <        }
2303 <    }
2552 >        checkCompletedExceptionally(g, ex);
2553 >    }}
2554  
2555      /**
2556       * acceptEither result completes exceptionally if either source cancelled
2557       */
2558 <    public void testAcceptEither_sourceCancelled1() {
2309 <        for (ExecutionMode m : ExecutionMode.values())
2310 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2311 <        for (Integer v1 : new Integer[] { 1, null }) {
2312 <
2313 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2314 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2315 <        final IncAction r = new IncAction();
2316 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2317 <
2318 <        assertTrue(f.cancel(mayInterruptIfRunning));
2319 <        checkCompletedWithWrappedCancellationException(h);
2320 <        g.complete(v1);
2321 <
2322 <        checkCancelled(f);
2323 <        assertEquals(0, r.invocationCount);
2324 <        checkCompletedNormally(g, v1);
2325 <        checkCompletedWithWrappedCancellationException(h);
2326 <        }
2327 <    }
2328 <
2329 <    public void testAcceptEither_sourceCancelled2() {
2558 >    public void testAcceptEither_sourceCancelled() {
2559          for (ExecutionMode m : ExecutionMode.values())
2560          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2561 <        for (Integer v1 : new Integer[] { 1, null }) {
2562 <
2561 >        for (Integer v1 : new Integer[] { 1, null })
2562 >    {
2563          final CompletableFuture<Integer> f = new CompletableFuture<>();
2564          final CompletableFuture<Integer> g = new CompletableFuture<>();
2565 <        final IncAction r = new IncAction();
2566 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2338 <
2339 <        assertTrue(g.cancel(mayInterruptIfRunning));
2340 <        checkCompletedWithWrappedCancellationException(h);
2341 <        f.complete(v1);
2342 <
2343 <        checkCancelled(g);
2344 <        assertEquals(0, r.invocationCount);
2345 <        checkCompletedNormally(f, v1);
2346 <        checkCompletedWithWrappedCancellationException(h);
2347 <        }
2348 <    }
2349 <
2350 <    public void testAcceptEither_sourceCancelled3() {
2351 <        for (ExecutionMode m : ExecutionMode.values())
2352 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2353 <        for (Integer v1 : new Integer[] { 1, null }) {
2565 >        final NoopConsumer[] rs = new NoopConsumer[6];
2566 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2567  
2568 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2569 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2570 <        final IncAction r = new IncAction();
2568 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2569 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2570 >        checkIncomplete(h0);
2571 >        checkIncomplete(h1);
2572 >        rs[0].assertNotInvoked();
2573 >        rs[1].assertNotInvoked();
2574 >        f.cancel(mayInterruptIfRunning);
2575 >        checkCompletedWithWrappedCancellationException(h0);
2576 >        checkCompletedWithWrappedCancellationException(h1);
2577 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2578 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2579 >        checkCompletedWithWrappedCancellationException(h2);
2580 >        checkCompletedWithWrappedCancellationException(h3);
2581  
2582 <        assertTrue(g.cancel(mayInterruptIfRunning));
2360 <        f.complete(v1);
2361 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2582 >        g.complete(v1);
2583  
2584 <        // unspecified behavior
2585 <        Integer v;
2584 >        // unspecified behavior - both source completions available
2585 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2586 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2587          try {
2588 <            assertEquals(h.join(), null);
2589 <            assertEquals(1, r.invocationCount);
2368 <            assertEquals(inc(v1), r.value);
2588 >            assertNull(h4.join());
2589 >            rs[4].assertValue(v1);
2590          } catch (CompletionException ok) {
2591 <            checkCompletedWithWrappedCancellationException(h);
2592 <            assertEquals(0, r.invocationCount);
2591 >            checkCompletedWithWrappedCancellationException(h4);
2592 >            rs[4].assertNotInvoked();
2593          }
2373
2374        checkCancelled(g);
2375        checkCompletedNormally(f, v1);
2376        }
2377    }
2378
2379    public void testAcceptEither_sourceCancelled4() {
2380        for (ExecutionMode m : ExecutionMode.values())
2381        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2382        for (Integer v1 : new Integer[] { 1, null }) {
2383
2384        final CompletableFuture<Integer> f = new CompletableFuture<>();
2385        final CompletableFuture<Integer> g = new CompletableFuture<>();
2386        final IncAction r = new IncAction();
2387
2388        assertTrue(f.cancel(mayInterruptIfRunning));
2389        g.complete(v1);
2390        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2391
2392        // unspecified behavior
2393        Integer v;
2594          try {
2595 <            assertEquals(h.join(), null);
2596 <            assertEquals(1, r.invocationCount);
2397 <            assertEquals(inc(v1), r.value);
2595 >            assertNull(h5.join());
2596 >            rs[5].assertValue(v1);
2597          } catch (CompletionException ok) {
2598 <            checkCompletedWithWrappedCancellationException(h);
2599 <            assertEquals(0, r.invocationCount);
2598 >            checkCompletedWithWrappedCancellationException(h5);
2599 >            rs[5].assertNotInvoked();
2600          }
2601  
2602          checkCancelled(f);
2603          checkCompletedNormally(g, v1);
2604 <        }
2605 <    }
2604 >        checkCompletedWithWrappedCancellationException(h0);
2605 >        checkCompletedWithWrappedCancellationException(h1);
2606 >        checkCompletedWithWrappedCancellationException(h2);
2607 >        checkCompletedWithWrappedCancellationException(h3);
2608 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2609 >    }}
2610  
2611      /**
2612 <     * runAfterEither result completes normally after normal completion
2410 <     * of either source
2612 >     * acceptEither result completes exceptionally if action does
2613       */
2614 <    public void testRunAfterEither_normalCompletion1() {
2614 >    public void testAcceptEither_actionFailed() {
2615          for (ExecutionMode m : ExecutionMode.values())
2616          for (Integer v1 : new Integer[] { 1, null })
2617 <        for (Integer v2 : new Integer[] { 2, null }) {
2618 <
2617 >        for (Integer v2 : new Integer[] { 2, null })
2618 >    {
2619          final CompletableFuture<Integer> f = new CompletableFuture<>();
2620          final CompletableFuture<Integer> g = new CompletableFuture<>();
2621 <        final Noop r = new Noop();
2622 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2621 >        final FailingConsumer[] rs = new FailingConsumer[6];
2622 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2623  
2624 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2625 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2626          f.complete(v1);
2627 <        checkCompletedNormally(h, null);
2628 <        assertEquals(1, r.invocationCount);
2629 <        g.complete(v2);
2630 <
2631 <        checkCompletedNormally(f, v1);
2632 <        checkCompletedNormally(g, v2);
2633 <        checkCompletedNormally(h, null);
2430 <        assertEquals(1, r.invocationCount);
2431 <        }
2432 <    }
2627 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2628 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2629 >        checkCompletedWithWrappedCFException(h0);
2630 >        checkCompletedWithWrappedCFException(h1);
2631 >        checkCompletedWithWrappedCFException(h2);
2632 >        checkCompletedWithWrappedCFException(h3);
2633 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2634  
2635 <    public void testRunAfterEither_normalCompletion2() {
2435 <        for (ExecutionMode m : ExecutionMode.values())
2436 <        for (Integer v1 : new Integer[] { 1, null })
2437 <        for (Integer v2 : new Integer[] { 2, null }) {
2635 >        g.complete(v2);
2636  
2637 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2638 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2639 <        final Noop r = new Noop();
2442 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2637 >        // unspecified behavior - both source completions available
2638 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2639 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2640  
2641 <        g.complete(v2);
2642 <        checkCompletedNormally(h, null);
2643 <        assertEquals(1, r.invocationCount);
2644 <        f.complete(v1);
2641 >        checkCompletedWithWrappedCFException(h4);
2642 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2643 >                   Objects.equals(v2, rs[4].value));
2644 >        checkCompletedWithWrappedCFException(h5);
2645 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2646 >                   Objects.equals(v2, rs[5].value));
2647  
2648          checkCompletedNormally(f, v1);
2649          checkCompletedNormally(g, v2);
2650 <        checkCompletedNormally(h, null);
2651 <        assertEquals(1, r.invocationCount);
2652 <        }
2653 <    }
2654 <    public void testRunAfterEither_normalCompletion3() {
2650 >    }}
2651 >
2652 >    /**
2653 >     * runAfterEither result completes normally after normal completion
2654 >     * of either source
2655 >     */
2656 >    public void testRunAfterEither_normalCompletion() {
2657          for (ExecutionMode m : ExecutionMode.values())
2658          for (Integer v1 : new Integer[] { 1, null })
2659 <        for (Integer v2 : new Integer[] { 2, null }) {
2660 <
2659 >        for (Integer v2 : new Integer[] { 2, null })
2660 >    {
2661          final CompletableFuture<Integer> f = new CompletableFuture<>();
2662          final CompletableFuture<Integer> g = new CompletableFuture<>();
2663 <        final Noop r = new Noop();
2663 >        final Noop[] rs = new Noop[6];
2664 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2665  
2666 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2667 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2668 +        checkIncomplete(h0);
2669 +        checkIncomplete(h1);
2670 +        rs[0].assertNotInvoked();
2671 +        rs[1].assertNotInvoked();
2672          f.complete(v1);
2673 +        checkCompletedNormally(h0, null);
2674 +        checkCompletedNormally(h1, null);
2675 +        rs[0].assertInvoked();
2676 +        rs[1].assertInvoked();
2677 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2678 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2679 +        checkCompletedNormally(h2, null);
2680 +        checkCompletedNormally(h3, null);
2681 +        rs[2].assertInvoked();
2682 +        rs[3].assertInvoked();
2683 +
2684          g.complete(v2);
2466        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2685  
2686 <        checkCompletedNormally(h, null);
2686 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2687 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2688 >
2689          checkCompletedNormally(f, v1);
2690          checkCompletedNormally(g, v2);
2691 <        assertEquals(1, r.invocationCount);
2692 <        }
2693 <    }
2691 >        checkCompletedNormally(h0, null);
2692 >        checkCompletedNormally(h1, null);
2693 >        checkCompletedNormally(h2, null);
2694 >        checkCompletedNormally(h3, null);
2695 >        checkCompletedNormally(h4, null);
2696 >        checkCompletedNormally(h5, null);
2697 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2698 >    }}
2699  
2700      /**
2701       * runAfterEither result completes exceptionally after exceptional
2702       * completion of either source
2703       */
2704 <    public void testRunAfterEither_exceptionalCompletion1() {
2704 >    public void testRunAfterEither_exceptionalCompletion() {
2705          for (ExecutionMode m : ExecutionMode.values())
2706 <        for (Integer v1 : new Integer[] { 1, null }) {
2707 <
2706 >        for (Integer v1 : new Integer[] { 1, null })
2707 >    {
2708          final CompletableFuture<Integer> f = new CompletableFuture<>();
2709          final CompletableFuture<Integer> g = new CompletableFuture<>();
2485        final Noop r = new Noop();
2486        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2710          final CFException ex = new CFException();
2711 +        final Noop[] rs = new Noop[6];
2712 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2713  
2714 <        f.completeExceptionally(ex);
2715 <        checkCompletedWithWrappedCFException(h, ex);
2716 <        g.complete(v1);
2717 <
2718 <        assertEquals(0, r.invocationCount);
2719 <        checkCompletedNormally(g, v1);
2720 <        checkCompletedWithWrappedCFException(f, ex);
2721 <        checkCompletedWithWrappedCFException(h, ex);
2722 <        }
2723 <    }
2724 <
2725 <    public void testRunAfterEither_exceptionalCompletion2() {
2726 <        for (ExecutionMode m : ExecutionMode.values())
2502 <        for (Integer v1 : new Integer[] { 1, null }) {
2503 <
2504 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2505 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2506 <        final Noop r = new Noop();
2507 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2508 <        final CFException ex = new CFException();
2714 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2715 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2716 >        checkIncomplete(h0);
2717 >        checkIncomplete(h1);
2718 >        rs[0].assertNotInvoked();
2719 >        rs[1].assertNotInvoked();
2720 >        assertTrue(f.completeExceptionally(ex));
2721 >        checkCompletedWithWrappedException(h0, ex);
2722 >        checkCompletedWithWrappedException(h1, ex);
2723 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2724 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2725 >        checkCompletedWithWrappedException(h2, ex);
2726 >        checkCompletedWithWrappedException(h3, ex);
2727  
2728 <        g.completeExceptionally(ex);
2511 <        checkCompletedWithWrappedCFException(h, ex);
2512 <        f.complete(v1);
2728 >        assertTrue(g.complete(v1));
2729  
2730 <        assertEquals(0, r.invocationCount);
2731 <        checkCompletedNormally(f, v1);
2732 <        checkCompletedWithWrappedCFException(g, ex);
2733 <        checkCompletedWithWrappedCFException(h, ex);
2730 >        // unspecified behavior - both source completions available
2731 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2732 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2733 >        try {
2734 >            assertNull(h4.join());
2735 >            rs[4].assertInvoked();
2736 >        } catch (CompletionException ok) {
2737 >            checkCompletedWithWrappedException(h4, ex);
2738 >            rs[4].assertNotInvoked();
2739          }
2519    }
2520
2521    public void testRunAfterEither_exceptionalCompletion3() {
2522        for (ExecutionMode m : ExecutionMode.values())
2523        for (Integer v1 : new Integer[] { 1, null }) {
2524
2525        final CompletableFuture<Integer> f = new CompletableFuture<>();
2526        final CompletableFuture<Integer> g = new CompletableFuture<>();
2527        final Noop r = new Noop();
2528        final CFException ex = new CFException();
2529
2530        g.completeExceptionally(ex);
2531        f.complete(v1);
2532        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2533
2534        // unspecified behavior
2535        Integer v;
2740          try {
2741 <            assertEquals(h.join(), null);
2742 <            assertEquals(1, r.invocationCount);
2741 >            assertNull(h5.join());
2742 >            rs[5].assertInvoked();
2743          } catch (CompletionException ok) {
2744 <            checkCompletedWithWrappedCFException(h, ex);
2745 <            assertEquals(0, r.invocationCount);
2744 >            checkCompletedWithWrappedException(h5, ex);
2745 >            rs[5].assertNotInvoked();
2746          }
2747  
2748 <        checkCompletedWithWrappedCFException(g, ex);
2749 <        checkCompletedNormally(f, v1);
2750 <        }
2751 <    }
2748 >        checkCompletedExceptionally(f, ex);
2749 >        checkCompletedNormally(g, v1);
2750 >        checkCompletedWithWrappedException(h0, ex);
2751 >        checkCompletedWithWrappedException(h1, ex);
2752 >        checkCompletedWithWrappedException(h2, ex);
2753 >        checkCompletedWithWrappedException(h3, ex);
2754 >        checkCompletedWithWrappedException(h4, ex);
2755 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2756 >    }}
2757  
2758 <    public void testRunAfterEither_exceptionalCompletion4() {
2758 >    public void testRunAfterEither_exceptionalCompletion2() {
2759          for (ExecutionMode m : ExecutionMode.values())
2760 <        for (Integer v1 : new Integer[] { 1, null }) {
2761 <
2760 >        for (boolean fFirst : new boolean[] { true, false })
2761 >        for (Integer v1 : new Integer[] { 1, null })
2762 >    {
2763          final CompletableFuture<Integer> f = new CompletableFuture<>();
2764          final CompletableFuture<Integer> g = new CompletableFuture<>();
2555        final Noop r = new Noop();
2765          final CFException ex = new CFException();
2766 +        final Noop[] rs = new Noop[6];
2767 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2768  
2769 <        f.completeExceptionally(ex);
2770 <        g.complete(v1);
2771 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2769 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2770 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2771 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2772 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2773 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2774 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2775  
2776 <        // unspecified behavior
2563 <        Integer v;
2776 >        // unspecified behavior - both source completions available
2777          try {
2778 <            assertEquals(h.join(), null);
2779 <            assertEquals(1, r.invocationCount);
2778 >            assertEquals(null, h0.join());
2779 >            rs[0].assertInvoked();
2780          } catch (CompletionException ok) {
2781 <            checkCompletedWithWrappedCFException(h, ex);
2782 <            assertEquals(0, r.invocationCount);
2781 >            checkCompletedWithWrappedException(h0, ex);
2782 >            rs[0].assertNotInvoked();
2783          }
2784 <
2785 <        checkCompletedWithWrappedCFException(f, ex);
2786 <        checkCompletedNormally(g, v1);
2784 >        try {
2785 >            assertEquals(null, h1.join());
2786 >            rs[1].assertInvoked();
2787 >        } catch (CompletionException ok) {
2788 >            checkCompletedWithWrappedException(h1, ex);
2789 >            rs[1].assertNotInvoked();
2790          }
2791 <    }
2792 <
2793 <    /**
2794 <     * runAfterEither result completes exceptionally if action does
2795 <     */
2796 <    public void testRunAfterEither_actionFailed1() {
2797 <        for (ExecutionMode m : ExecutionMode.values())
2798 <        for (Integer v1 : new Integer[] { 1, null })
2799 <        for (Integer v2 : new Integer[] { 2, null }) {
2800 <
2801 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2802 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2803 <        final FailingNoop r = new FailingNoop();
2588 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2589 <
2590 <        f.complete(v1);
2591 <        checkCompletedWithWrappedCFException(h);
2592 <        g.complete(v2);
2593 <        checkCompletedNormally(f, v1);
2594 <        checkCompletedNormally(g, v2);
2791 >        try {
2792 >            assertEquals(null, h2.join());
2793 >            rs[2].assertInvoked();
2794 >        } catch (CompletionException ok) {
2795 >            checkCompletedWithWrappedException(h2, ex);
2796 >            rs[2].assertNotInvoked();
2797 >        }
2798 >        try {
2799 >            assertEquals(null, h3.join());
2800 >            rs[3].assertInvoked();
2801 >        } catch (CompletionException ok) {
2802 >            checkCompletedWithWrappedException(h3, ex);
2803 >            rs[3].assertNotInvoked();
2804          }
2596    }
2597
2598    public void testRunAfterEither_actionFailed2() {
2599        for (ExecutionMode m : ExecutionMode.values())
2600        for (Integer v1 : new Integer[] { 1, null })
2601        for (Integer v2 : new Integer[] { 2, null }) {
2602
2603        final CompletableFuture<Integer> f = new CompletableFuture<>();
2604        final CompletableFuture<Integer> g = new CompletableFuture<>();
2605        final FailingNoop r = new FailingNoop();
2606        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2805  
2608        g.complete(v2);
2609        checkCompletedWithWrappedCFException(h);
2610        f.complete(v1);
2806          checkCompletedNormally(f, v1);
2807 <        checkCompletedNormally(g, v2);
2808 <        }
2614 <    }
2807 >        checkCompletedExceptionally(g, ex);
2808 >    }}
2809  
2810      /**
2811       * runAfterEither result completes exceptionally if either source cancelled
2812       */
2813 <    public void testRunAfterEither_sourceCancelled1() {
2813 >    public void testRunAfterEither_sourceCancelled() {
2814          for (ExecutionMode m : ExecutionMode.values())
2815          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2816 <        for (Integer v1 : new Integer[] { 1, null }) {
2817 <
2624 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2625 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2626 <        final Noop r = new Noop();
2627 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2628 <
2629 <        assertTrue(f.cancel(mayInterruptIfRunning));
2630 <        checkCompletedWithWrappedCancellationException(h);
2631 <        g.complete(v1);
2632 <
2633 <        checkCancelled(f);
2634 <        assertEquals(0, r.invocationCount);
2635 <        checkCompletedNormally(g, v1);
2636 <        checkCompletedWithWrappedCancellationException(h);
2637 <        }
2638 <    }
2639 <
2640 <    public void testRunAfterEither_sourceCancelled2() {
2641 <        for (ExecutionMode m : ExecutionMode.values())
2642 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2643 <        for (Integer v1 : new Integer[] { 1, null }) {
2644 <
2816 >        for (Integer v1 : new Integer[] { 1, null })
2817 >    {
2818          final CompletableFuture<Integer> f = new CompletableFuture<>();
2819          final CompletableFuture<Integer> g = new CompletableFuture<>();
2820 <        final Noop r = new Noop();
2821 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2649 <
2650 <        assertTrue(g.cancel(mayInterruptIfRunning));
2651 <        checkCompletedWithWrappedCancellationException(h);
2652 <        f.complete(v1);
2653 <
2654 <        checkCancelled(g);
2655 <        assertEquals(0, r.invocationCount);
2656 <        checkCompletedNormally(f, v1);
2657 <        checkCompletedWithWrappedCancellationException(h);
2658 <        }
2659 <    }
2660 <
2661 <    public void testRunAfterEither_sourceCancelled3() {
2662 <        for (ExecutionMode m : ExecutionMode.values())
2663 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2664 <        for (Integer v1 : new Integer[] { 1, null }) {
2820 >        final Noop[] rs = new Noop[6];
2821 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2822  
2823 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2824 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2825 <        final Noop r = new Noop();
2823 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2824 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2825 >        checkIncomplete(h0);
2826 >        checkIncomplete(h1);
2827 >        rs[0].assertNotInvoked();
2828 >        rs[1].assertNotInvoked();
2829 >        f.cancel(mayInterruptIfRunning);
2830 >        checkCompletedWithWrappedCancellationException(h0);
2831 >        checkCompletedWithWrappedCancellationException(h1);
2832 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2833 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2834 >        checkCompletedWithWrappedCancellationException(h2);
2835 >        checkCompletedWithWrappedCancellationException(h3);
2836  
2837 <        assertTrue(g.cancel(mayInterruptIfRunning));
2671 <        f.complete(v1);
2672 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2837 >        assertTrue(g.complete(v1));
2838  
2839 <        // unspecified behavior
2840 <        Integer v;
2839 >        // unspecified behavior - both source completions available
2840 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2841 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2842          try {
2843 <            assertEquals(h.join(), null);
2844 <            assertEquals(1, r.invocationCount);
2843 >            assertNull(h4.join());
2844 >            rs[4].assertInvoked();
2845          } catch (CompletionException ok) {
2846 <            checkCompletedWithWrappedCancellationException(h);
2847 <            assertEquals(0, r.invocationCount);
2682 <        }
2683 <
2684 <        checkCancelled(g);
2685 <        checkCompletedNormally(f, v1);
2846 >            checkCompletedWithWrappedCancellationException(h4);
2847 >            rs[4].assertNotInvoked();
2848          }
2687    }
2688
2689    public void testRunAfterEither_sourceCancelled4() {
2690        for (ExecutionMode m : ExecutionMode.values())
2691        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2692        for (Integer v1 : new Integer[] { 1, null }) {
2693
2694        final CompletableFuture<Integer> f = new CompletableFuture<>();
2695        final CompletableFuture<Integer> g = new CompletableFuture<>();
2696        final Noop r = new Noop();
2697
2698        assertTrue(f.cancel(mayInterruptIfRunning));
2699        g.complete(v1);
2700        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2701
2702        // unspecified behavior
2703        Integer v;
2849          try {
2850 <            assertEquals(h.join(), null);
2851 <            assertEquals(1, r.invocationCount);
2850 >            assertNull(h5.join());
2851 >            rs[5].assertInvoked();
2852          } catch (CompletionException ok) {
2853 <            checkCompletedWithWrappedCancellationException(h);
2854 <            assertEquals(0, r.invocationCount);
2853 >            checkCompletedWithWrappedCancellationException(h5);
2854 >            rs[5].assertNotInvoked();
2855          }
2856  
2857          checkCancelled(f);
2858          checkCompletedNormally(g, v1);
2859 <        }
2860 <    }
2859 >        checkCompletedWithWrappedCancellationException(h0);
2860 >        checkCompletedWithWrappedCancellationException(h1);
2861 >        checkCompletedWithWrappedCancellationException(h2);
2862 >        checkCompletedWithWrappedCancellationException(h3);
2863 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2864 >    }}
2865  
2866      /**
2867 <     * thenCompose result completes normally after normal completion of source
2867 >     * runAfterEither result completes exceptionally if action does
2868       */
2869 <    public void testThenCompose_normalCompletion1() {
2869 >    public void testRunAfterEither_actionFailed() {
2870          for (ExecutionMode m : ExecutionMode.values())
2871 <        for (Integer v1 : new Integer[] { 1, null }) {
2872 <
2871 >        for (Integer v1 : new Integer[] { 1, null })
2872 >        for (Integer v2 : new Integer[] { 2, null })
2873 >    {
2874          final CompletableFuture<Integer> f = new CompletableFuture<>();
2875 <        final CompletableFutureInc r = new CompletableFutureInc();
2876 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2877 <        f.complete(v1);
2878 <        checkCompletedNormally(g, inc(v1));
2875 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2876 >        final FailingRunnable[] rs = new FailingRunnable[6];
2877 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2878 >
2879 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2880 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2881 >        assertTrue(f.complete(v1));
2882 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2883 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2884 >        checkCompletedWithWrappedCFException(h0);
2885 >        checkCompletedWithWrappedCFException(h1);
2886 >        checkCompletedWithWrappedCFException(h2);
2887 >        checkCompletedWithWrappedCFException(h3);
2888 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2889 >        assertTrue(g.complete(v2));
2890 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2891 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2892 >        checkCompletedWithWrappedCFException(h4);
2893 >        checkCompletedWithWrappedCFException(h5);
2894 >
2895          checkCompletedNormally(f, v1);
2896 <        assertEquals(1, r.invocationCount);
2897 <        }
2898 <    }
2896 >        checkCompletedNormally(g, v2);
2897 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2898 >    }}
2899  
2900 <    public void testThenCompose_normalCompletion2() {
2900 >    /**
2901 >     * thenCompose result completes normally after normal completion of source
2902 >     */
2903 >    public void testThenCompose_normalCompletion() {
2904          for (ExecutionMode m : ExecutionMode.values())
2905 <        for (Integer v1 : new Integer[] { 1, null }) {
2906 <
2905 >        for (boolean createIncomplete : new boolean[] { true, false })
2906 >        for (Integer v1 : new Integer[] { 1, null })
2907 >    {
2908          final CompletableFuture<Integer> f = new CompletableFuture<>();
2909 <        final CompletableFutureInc r = new CompletableFutureInc();
2910 <        f.complete(v1);
2911 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2909 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2910 >        if (!createIncomplete) assertTrue(f.complete(v1));
2911 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2912 >        if (createIncomplete) assertTrue(f.complete(v1));
2913 >
2914          checkCompletedNormally(g, inc(v1));
2915          checkCompletedNormally(f, v1);
2916 <        assertEquals(1, r.invocationCount);
2917 <        }
2746 <    }
2916 >        r.assertValue(v1);
2917 >    }}
2918  
2919      /**
2920       * thenCompose result completes exceptionally after exceptional
2921       * completion of source
2922       */
2923 <    public void testThenCompose_exceptionalCompletion1() {
2924 <        for (ExecutionMode m : ExecutionMode.values()) {
2925 <
2923 >    public void testThenCompose_exceptionalCompletion() {
2924 >        for (ExecutionMode m : ExecutionMode.values())
2925 >        for (boolean createIncomplete : new boolean[] { true, false })
2926 >    {
2927          final CFException ex = new CFException();
2928 <        final CompletableFutureInc r = new CompletableFutureInc();
2928 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2929          final CompletableFuture<Integer> f = new CompletableFuture<>();
2930 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2931 <        f.completeExceptionally(ex);
2932 <        checkCompletedWithWrappedCFException(g, ex);
2761 <        checkCompletedWithWrappedCFException(f, ex);
2762 <        }
2763 <    }
2764 <
2765 <    public void testThenCompose_exceptionalCompletion2() {
2766 <        for (ExecutionMode m : ExecutionMode.values()) {
2930 >        if (!createIncomplete) f.completeExceptionally(ex);
2931 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2932 >        if (createIncomplete) f.completeExceptionally(ex);
2933  
2934 <        final CFException ex = new CFException();
2935 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2936 <        f.completeExceptionally(ex);
2937 <        final CompletableFutureInc r = new CompletableFutureInc();
2772 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2773 <        checkCompletedWithWrappedCFException(g, ex);
2774 <        checkCompletedWithWrappedCFException(f, ex);
2775 <        }
2776 <    }
2934 >        checkCompletedWithWrappedException(g, ex);
2935 >        checkCompletedExceptionally(f, ex);
2936 >        r.assertNotInvoked();
2937 >    }}
2938  
2939      /**
2940       * thenCompose result completes exceptionally if action does
2941       */
2942 <    public void testThenCompose_actionFailed1() {
2942 >    public void testThenCompose_actionFailed() {
2943          for (ExecutionMode m : ExecutionMode.values())
2944 <        for (Integer v1 : new Integer[] { 1, null }) {
2945 <
2944 >        for (boolean createIncomplete : new boolean[] { true, false })
2945 >        for (Integer v1 : new Integer[] { 1, null })
2946 >    {
2947          final CompletableFuture<Integer> f = new CompletableFuture<>();
2948          final FailingCompletableFutureFunction r
2949 <            = new FailingCompletableFutureFunction();
2950 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2951 <        f.complete(v1);
2952 <        checkCompletedWithWrappedCFException(g);
2791 <        checkCompletedNormally(f, v1);
2792 <        }
2793 <    }
2794 <
2795 <    public void testThenCompose_actionFailed2() {
2796 <        for (ExecutionMode m : ExecutionMode.values())
2797 <        for (Integer v1 : new Integer[] { 1, null }) {
2949 >            = new FailingCompletableFutureFunction(m);
2950 >        if (!createIncomplete) assertTrue(f.complete(v1));
2951 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2952 >        if (createIncomplete) assertTrue(f.complete(v1));
2953  
2799        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800        f.complete(v1);
2801        final FailingCompletableFutureFunction r
2802            = new FailingCompletableFutureFunction();
2803        final CompletableFuture<Integer> g = f.thenCompose(r);
2954          checkCompletedWithWrappedCFException(g);
2955          checkCompletedNormally(f, v1);
2956 <        }
2807 <    }
2956 >    }}
2957  
2958      /**
2959       * thenCompose result completes exceptionally if source cancelled
2960       */
2961 <    public void testThenCompose_sourceCancelled1() {
2961 >    public void testThenCompose_sourceCancelled() {
2962          for (ExecutionMode m : ExecutionMode.values())
2963 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2964 <
2963 >        for (boolean createIncomplete : new boolean[] { true, false })
2964 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2965 >    {
2966          final CompletableFuture<Integer> f = new CompletableFuture<>();
2967 <        final CompletableFutureInc r = new CompletableFutureInc();
2968 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2969 <        assertTrue(f.cancel(mayInterruptIfRunning));
2970 <        checkCompletedWithWrappedCancellationException(g);
2971 <        checkCancelled(f);
2967 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2968 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2969 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2970 >        if (createIncomplete) {
2971 >            checkIncomplete(g);
2972 >            assertTrue(f.cancel(mayInterruptIfRunning));
2973          }
2823    }
2974  
2825    public void testThenCompose_sourceCancelled2() {
2826        for (ExecutionMode m : ExecutionMode.values())
2827        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2828
2829        final CompletableFuture<Integer> f = new CompletableFuture<>();
2830        assertTrue(f.cancel(mayInterruptIfRunning));
2831        final CompletableFutureInc r = new CompletableFutureInc();
2832        final CompletableFuture<Integer> g = f.thenCompose(r);
2975          checkCompletedWithWrappedCancellationException(g);
2976          checkCancelled(f);
2977 <        }
2836 <    }
2837 <
2838 <    // asyncs
2839 <
2840 <    /**
2841 <     * thenRunAsync result completes normally after normal completion of source
2842 <     */
2843 <    public void testThenRunAsync() {
2844 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2845 <        Noop r = new Noop();
2846 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2847 <        f.complete(null);
2848 <        checkCompletedNormally(g, null);
2849 <
2850 <        // reordered version
2851 <        f = new CompletableFuture<>();
2852 <        f.complete(null);
2853 <        r = new Noop();
2854 <        g = f.thenRunAsync(r);
2855 <        checkCompletedNormally(g, null);
2856 <    }
2857 <
2858 <    /**
2859 <     * thenRunAsync result completes exceptionally after exceptional
2860 <     * completion of source
2861 <     */
2862 <    public void testThenRunAsync2() {
2863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2864 <        Noop r = new Noop();
2865 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2866 <        f.completeExceptionally(new CFException());
2867 <        try {
2868 <            g.join();
2869 <            shouldThrow();
2870 <        } catch (CompletionException success) {}
2871 <        checkCompletedWithWrappedCFException(g);
2872 <    }
2873 <
2874 <    /**
2875 <     * thenRunAsync result completes exceptionally if action does
2876 <     */
2877 <    public void testThenRunAsync3() {
2878 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2879 <        FailingNoop r = new FailingNoop();
2880 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2881 <        f.complete(null);
2882 <        checkCompletedWithWrappedCFException(g);
2883 <    }
2884 <
2885 <    /**
2886 <     * thenRunAsync result completes exceptionally if source cancelled
2887 <     */
2888 <    public void testThenRunAsync4() {
2889 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2890 <        Noop r = new Noop();
2891 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2892 <        assertTrue(f.cancel(true));
2893 <        checkCompletedWithWrappedCancellationException(g);
2894 <    }
2977 >    }}
2978  
2979      /**
2980 <     * thenApplyAsync result completes normally after normal completion of source
2980 >     * thenCompose result completes exceptionally if the result of the action does
2981       */
2982 <    public void testThenApplyAsync() {
2983 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2984 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2985 <        f.complete(one);
2986 <        checkCompletedNormally(g, two);
2987 <    }
2988 <
2989 <    /**
2990 <     * thenApplyAsync result completes exceptionally after exceptional
2991 <     * completion of source
2992 <     */
2993 <    public void testThenApplyAsync2() {
2994 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2995 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2996 <        f.completeExceptionally(new CFException());
2997 <        checkCompletedWithWrappedCFException(g);
2998 <    }
2999 <
3000 <    /**
3001 <     * thenApplyAsync result completes exceptionally if action does
3002 <     */
3003 <    public void testThenApplyAsync3() {
3004 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3005 <        FailingFunction r = new FailingFunction();
3006 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3007 <        f.complete(null);
3008 <        checkCompletedWithWrappedCFException(g);
3009 <    }
3010 <
3011 <    /**
3012 <     * thenApplyAsync result completes exceptionally if source cancelled
3013 <     */
3014 <    public void testThenApplyAsync4() {
3015 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3016 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3017 <        assertTrue(f.cancel(true));
3018 <        checkCompletedWithWrappedCancellationException(g);
3019 <    }
3020 <
3021 <    /**
3022 <     * thenAcceptAsync result completes normally after normal
3023 <     * completion of source
3024 <     */
2942 <    public void testThenAcceptAsync() {
2943 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2944 <        IncAction r = new IncAction();
2945 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2946 <        f.complete(one);
2947 <        checkCompletedNormally(g, null);
2948 <        assertEquals(r.value, (Integer) 2);
2949 <    }
2950 <
2951 <    /**
2952 <     * thenAcceptAsync result completes exceptionally after exceptional
2953 <     * completion of source
2954 <     */
2955 <    public void testThenAcceptAsync2() {
2956 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2957 <        IncAction r = new IncAction();
2958 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2959 <        f.completeExceptionally(new CFException());
2960 <        checkCompletedWithWrappedCFException(g);
2961 <    }
2962 <
2963 <    /**
2964 <     * thenAcceptAsync result completes exceptionally if action does
2965 <     */
2966 <    public void testThenAcceptAsync3() {
2967 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2968 <        FailingConsumer r = new FailingConsumer();
2969 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2970 <        f.complete(null);
2971 <        checkCompletedWithWrappedCFException(g);
2972 <    }
2973 <
2974 <    /**
2975 <     * thenAcceptAsync result completes exceptionally if source cancelled
2976 <     */
2977 <    public void testThenAcceptAsync4() {
2978 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2979 <        IncAction r = new IncAction();
2980 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2981 <        assertTrue(f.cancel(true));
2982 <        checkCompletedWithWrappedCancellationException(g);
2983 <    }
2984 <
2985 <    // async with explicit executors
2986 <
2987 <    /**
2988 <     * thenRunAsync result completes normally after normal completion of source
2989 <     */
2990 <    public void testThenRunAsyncE() {
2991 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2992 <        Noop r = new Noop();
2993 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2994 <        f.complete(null);
2995 <        checkCompletedNormally(g, null);
2996 <
2997 <        // reordered version
2998 <        f = new CompletableFuture<>();
2999 <        f.complete(null);
3000 <        r = new Noop();
3001 <        g = f.thenRunAsync(r, new ThreadExecutor());
3002 <        checkCompletedNormally(g, null);
3003 <    }
3004 <
3005 <    /**
3006 <     * thenRunAsync result completes exceptionally after exceptional
3007 <     * completion of source
3008 <     */
3009 <    public void testThenRunAsync2E() {
3010 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3011 <        Noop r = new Noop();
3012 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3013 <        f.completeExceptionally(new CFException());
3014 <        try {
3015 <            g.join();
3016 <            shouldThrow();
3017 <        } catch (CompletionException success) {}
3018 <        checkCompletedWithWrappedCFException(g);
3019 <    }
3020 <
3021 <    /**
3022 <     * thenRunAsync result completes exceptionally if action does
3023 <     */
3024 <    public void testThenRunAsync3E() {
3025 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3026 <        FailingNoop r = new FailingNoop();
3027 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3028 <        f.complete(null);
3029 <        checkCompletedWithWrappedCFException(g);
3030 <    }
3031 <
3032 <    /**
3033 <     * thenRunAsync result completes exceptionally if source cancelled
3034 <     */
3035 <    public void testThenRunAsync4E() {
3036 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3037 <        Noop r = new Noop();
3038 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3039 <        assertTrue(f.cancel(true));
3040 <        checkCompletedWithWrappedCancellationException(g);
3041 <    }
3042 <
3043 <    /**
3044 <     * thenApplyAsync result completes normally after normal completion of source
3045 <     */
3046 <    public void testThenApplyAsyncE() {
3047 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3048 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3049 <        f.complete(one);
3050 <        checkCompletedNormally(g, two);
3051 <    }
3052 <
3053 <    /**
3054 <     * thenApplyAsync result completes exceptionally after exceptional
3055 <     * completion of source
3056 <     */
3057 <    public void testThenApplyAsync2E() {
3058 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3059 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3060 <        f.completeExceptionally(new CFException());
3061 <        checkCompletedWithWrappedCFException(g);
3062 <    }
3063 <
3064 <    /**
3065 <     * thenApplyAsync result completes exceptionally if action does
3066 <     */
3067 <    public void testThenApplyAsync3E() {
3068 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3069 <        FailingFunction r = new FailingFunction();
3070 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3071 <        f.complete(null);
3072 <        checkCompletedWithWrappedCFException(g);
3073 <    }
3074 <
3075 <    /**
3076 <     * thenApplyAsync result completes exceptionally if source cancelled
3077 <     */
3078 <    public void testThenApplyAsync4E() {
3079 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3080 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3081 <        assertTrue(f.cancel(true));
3082 <        checkCompletedWithWrappedCancellationException(g);
3083 <    }
3084 <
3085 <    /**
3086 <     * thenAcceptAsync result completes normally after normal
3087 <     * completion of source
3088 <     */
3089 <    public void testThenAcceptAsyncE() {
3090 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3091 <        IncAction r = new IncAction();
3092 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3093 <        f.complete(one);
3094 <        checkCompletedNormally(g, null);
3095 <        assertEquals(r.value, (Integer) 2);
3096 <    }
3097 <
3098 <    /**
3099 <     * thenAcceptAsync result completes exceptionally after exceptional
3100 <     * completion of source
3101 <     */
3102 <    public void testThenAcceptAsync2E() {
3103 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3104 <        IncAction r = new IncAction();
3105 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3106 <        f.completeExceptionally(new CFException());
3107 <        checkCompletedWithWrappedCFException(g);
3108 <    }
3109 <
3110 <    /**
3111 <     * thenAcceptAsync result completes exceptionally if action does
3112 <     */
3113 <    public void testThenAcceptAsync3E() {
3114 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3115 <        FailingConsumer r = new FailingConsumer();
3116 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3117 <        f.complete(null);
3118 <        checkCompletedWithWrappedCFException(g);
3119 <    }
2982 >    public void testThenCompose_actionReturnsFailingFuture() {
2983 >        for (ExecutionMode m : ExecutionMode.values())
2984 >        for (int order = 0; order < 6; order++)
2985 >        for (Integer v1 : new Integer[] { 1, null })
2986 >    {
2987 >        final CFException ex = new CFException();
2988 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2989 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2990 >        final CompletableFuture<Integer> h;
2991 >        // Test all permutations of orders
2992 >        switch (order) {
2993 >        case 0:
2994 >            assertTrue(f.complete(v1));
2995 >            assertTrue(g.completeExceptionally(ex));
2996 >            h = m.thenCompose(f, (x -> g));
2997 >            break;
2998 >        case 1:
2999 >            assertTrue(f.complete(v1));
3000 >            h = m.thenCompose(f, (x -> g));
3001 >            assertTrue(g.completeExceptionally(ex));
3002 >            break;
3003 >        case 2:
3004 >            assertTrue(g.completeExceptionally(ex));
3005 >            assertTrue(f.complete(v1));
3006 >            h = m.thenCompose(f, (x -> g));
3007 >            break;
3008 >        case 3:
3009 >            assertTrue(g.completeExceptionally(ex));
3010 >            h = m.thenCompose(f, (x -> g));
3011 >            assertTrue(f.complete(v1));
3012 >            break;
3013 >        case 4:
3014 >            h = m.thenCompose(f, (x -> g));
3015 >            assertTrue(f.complete(v1));
3016 >            assertTrue(g.completeExceptionally(ex));
3017 >            break;
3018 >        case 5:
3019 >            h = m.thenCompose(f, (x -> g));
3020 >            assertTrue(f.complete(v1));
3021 >            assertTrue(g.completeExceptionally(ex));
3022 >            break;
3023 >        default: throw new AssertionError();
3024 >        }
3025  
3026 <    /**
3027 <     * thenAcceptAsync result completes exceptionally if source cancelled
3028 <     */
3029 <    public void testThenAcceptAsync4E() {
3125 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3126 <        IncAction r = new IncAction();
3127 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3128 <        assertTrue(f.cancel(true));
3129 <        checkCompletedWithWrappedCancellationException(g);
3130 <    }
3026 >        checkCompletedExceptionally(g, ex);
3027 >        checkCompletedWithWrappedException(h, ex);
3028 >        checkCompletedNormally(f, v1);
3029 >    }}
3030  
3031      // other static methods
3032  
# Line 3145 | Line 3044 | public class CompletableFutureTest exten
3044       * when all components complete normally
3045       */
3046      public void testAllOf_normal() throws Exception {
3047 <        for (int k = 1; k < 20; ++k) {
3048 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3049 <            for (int i = 0; i < k; ++i)
3047 >        for (int k = 1; k < 10; k++) {
3048 >            CompletableFuture<Integer>[] fs
3049 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3050 >            for (int i = 0; i < k; i++)
3051 >                fs[i] = new CompletableFuture<>();
3052 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3053 >            for (int i = 0; i < k; i++) {
3054 >                checkIncomplete(f);
3055 >                checkIncomplete(CompletableFuture.allOf(fs));
3056 >                fs[i].complete(one);
3057 >            }
3058 >            checkCompletedNormally(f, null);
3059 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3060 >        }
3061 >    }
3062 >
3063 >    public void testAllOf_backwards() throws Exception {
3064 >        for (int k = 1; k < 10; k++) {
3065 >            CompletableFuture<Integer>[] fs
3066 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3067 >            for (int i = 0; i < k; i++)
3068                  fs[i] = new CompletableFuture<>();
3069              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3070 <            for (int i = 0; i < k; ++i) {
3070 >            for (int i = k - 1; i >= 0; i--) {
3071                  checkIncomplete(f);
3072                  checkIncomplete(CompletableFuture.allOf(fs));
3073                  fs[i].complete(one);
# Line 3160 | Line 3077 | public class CompletableFutureTest exten
3077          }
3078      }
3079  
3080 +    public void testAllOf_exceptional() throws Exception {
3081 +        for (int k = 1; k < 10; k++) {
3082 +            CompletableFuture<Integer>[] fs
3083 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3084 +            CFException ex = new CFException();
3085 +            for (int i = 0; i < k; i++)
3086 +                fs[i] = new CompletableFuture<>();
3087 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3088 +            for (int i = 0; i < k; i++) {
3089 +                checkIncomplete(f);
3090 +                checkIncomplete(CompletableFuture.allOf(fs));
3091 +                if (i != k / 2) {
3092 +                    fs[i].complete(i);
3093 +                    checkCompletedNormally(fs[i], i);
3094 +                } else {
3095 +                    fs[i].completeExceptionally(ex);
3096 +                    checkCompletedExceptionally(fs[i], ex);
3097 +                }
3098 +            }
3099 +            checkCompletedWithWrappedException(f, ex);
3100 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3101 +        }
3102 +    }
3103 +
3104      /**
3105       * anyOf(no component futures) returns an incomplete future
3106       */
3107      public void testAnyOf_empty() throws Exception {
3108 +        for (Integer v1 : new Integer[] { 1, null })
3109 +    {
3110          CompletableFuture<Object> f = CompletableFuture.anyOf();
3111          checkIncomplete(f);
3112 <    }
3112 >
3113 >        f.complete(v1);
3114 >        checkCompletedNormally(f, v1);
3115 >    }}
3116  
3117      /**
3118       * anyOf returns a future completed normally with a value when
3119       * a component future does
3120       */
3121      public void testAnyOf_normal() throws Exception {
3122 <        for (int k = 0; k < 10; ++k) {
3122 >        for (int k = 0; k < 10; k++) {
3123              CompletableFuture[] fs = new CompletableFuture[k];
3124 <            for (int i = 0; i < k; ++i)
3124 >            for (int i = 0; i < k; i++)
3125                  fs[i] = new CompletableFuture<>();
3126              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3127              checkIncomplete(f);
3128 <            for (int i = 0; i < k; ++i) {
3129 <                fs[i].complete(one);
3130 <                checkCompletedNormally(f, one);
3131 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3128 >            for (int i = 0; i < k; i++) {
3129 >                fs[i].complete(i);
3130 >                checkCompletedNormally(f, 0);
3131 >                int x = (int) CompletableFuture.anyOf(fs).join();
3132 >                assertTrue(0 <= x && x <= i);
3133 >            }
3134 >        }
3135 >    }
3136 >    public void testAnyOf_normal_backwards() throws Exception {
3137 >        for (int k = 0; k < 10; k++) {
3138 >            CompletableFuture[] fs = new CompletableFuture[k];
3139 >            for (int i = 0; i < k; i++)
3140 >                fs[i] = new CompletableFuture<>();
3141 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3142 >            checkIncomplete(f);
3143 >            for (int i = k - 1; i >= 0; i--) {
3144 >                fs[i].complete(i);
3145 >                checkCompletedNormally(f, k - 1);
3146 >                int x = (int) CompletableFuture.anyOf(fs).join();
3147 >                assertTrue(i <= x && x <= k - 1);
3148              }
3149          }
3150      }
# Line 3191 | Line 3153 | public class CompletableFutureTest exten
3153       * anyOf result completes exceptionally when any component does.
3154       */
3155      public void testAnyOf_exceptional() throws Exception {
3156 <        for (int k = 0; k < 10; ++k) {
3156 >        for (int k = 0; k < 10; k++) {
3157 >            CompletableFuture[] fs = new CompletableFuture[k];
3158 >            CFException[] exs = new CFException[k];
3159 >            for (int i = 0; i < k; i++) {
3160 >                fs[i] = new CompletableFuture<>();
3161 >                exs[i] = new CFException();
3162 >            }
3163 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3164 >            checkIncomplete(f);
3165 >            for (int i = 0; i < k; i++) {
3166 >                fs[i].completeExceptionally(exs[i]);
3167 >                checkCompletedWithWrappedException(f, exs[0]);
3168 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3169 >            }
3170 >        }
3171 >    }
3172 >
3173 >    public void testAnyOf_exceptional_backwards() throws Exception {
3174 >        for (int k = 0; k < 10; k++) {
3175              CompletableFuture[] fs = new CompletableFuture[k];
3176 <            for (int i = 0; i < k; ++i)
3176 >            CFException[] exs = new CFException[k];
3177 >            for (int i = 0; i < k; i++) {
3178                  fs[i] = new CompletableFuture<>();
3179 +                exs[i] = new CFException();
3180 +            }
3181              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3182              checkIncomplete(f);
3183 <            for (int i = 0; i < k; ++i) {
3184 <                fs[i].completeExceptionally(new CFException());
3185 <                checkCompletedWithWrappedCFException(f);
3183 >            for (int i = k - 1; i >= 0; i--) {
3184 >                fs[i].completeExceptionally(exs[i]);
3185 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3186                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3187              }
3188          }
# Line 3212 | Line 3195 | public class CompletableFutureTest exten
3195          CompletableFuture<Integer> f = new CompletableFuture<>();
3196          CompletableFuture<Integer> g = new CompletableFuture<>();
3197          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3215        CompletableFuture<?> h;
3198          ThreadExecutor exec = new ThreadExecutor();
3199  
3200          Runnable[] throwingActions = {
3201              () -> CompletableFuture.supplyAsync(null),
3202              () -> CompletableFuture.supplyAsync(null, exec),
3203 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3203 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3204  
3205              () -> CompletableFuture.runAsync(null),
3206              () -> CompletableFuture.runAsync(null, exec),
# Line 3291 | Line 3273 | public class CompletableFutureTest exten
3273  
3274              () -> f.thenCompose(null),
3275              () -> f.thenComposeAsync(null),
3276 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3276 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3277              () -> f.thenComposeAsync(null, exec),
3278  
3279              () -> f.exceptionally(null),
# Line 3309 | Line 3291 | public class CompletableFutureTest exten
3291              () -> CompletableFuture.anyOf(null, f),
3292  
3293              () -> f.obtrudeException(null),
3294 +
3295 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3296 +            () -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
3297 +            () -> CompletableFuture.delayedExecutor(1L, null),
3298 +
3299 +            () -> f.orTimeout(1L, null),
3300 +            () -> f.completeOnTimeout(42, 1L, null),
3301 +
3302 +            () -> CompletableFuture.failedFuture(null),
3303 +            () -> CompletableFuture.failedStage(null),
3304          };
3305  
3306          assertThrows(NullPointerException.class, throwingActions);
# Line 3323 | Line 3315 | public class CompletableFutureTest exten
3315          assertSame(f, f.toCompletableFuture());
3316      }
3317  
3318 +    // jdk9
3319 +
3320      /**
3321 <     * whenComplete action executes on normal completion, propagating
3328 <     * source result.
3321 >     * newIncompleteFuture returns an incomplete CompletableFuture
3322       */
3323 <    public void testWhenComplete_normalCompletion1() {
3324 <        for (boolean createIncomplete : new boolean[] { true, false })
3325 <        for (ExecutionMode m : ExecutionMode.values())
3326 <        for (Integer v1 : new Integer[] { 1, null }) {
3327 <
3328 <        final AtomicInteger a = new AtomicInteger();
3329 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3330 <        if (!createIncomplete) f.complete(v1);
3338 <        final CompletableFuture<Integer> g =
3339 <            m.whenComplete(f,
3340 <                           (Integer x, Throwable t) -> {
3341 <                               threadAssertSame(x, v1);
3342 <                               threadAssertNull(t);
3343 <                               a.getAndIncrement();
3344 <                           });
3345 <        if (createIncomplete) f.complete(v1);
3323 >    public void testNewIncompleteFuture() {
3324 >        for (Integer v1 : new Integer[] { 1, null })
3325 >    {
3326 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3327 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3328 >        checkIncomplete(f);
3329 >        checkIncomplete(g);
3330 >        f.complete(v1);
3331          checkCompletedNormally(f, v1);
3332 +        checkIncomplete(g);
3333 +        g.complete(v1);
3334          checkCompletedNormally(g, v1);
3335 <        assertEquals(a.get(), 1);
3336 <        }
3335 >        assertSame(g.getClass(), CompletableFuture.class);
3336 >    }}
3337 >
3338 >    /**
3339 >     * completedStage returns a completed CompletionStage
3340 >     */
3341 >    public void testCompletedStage() {
3342 >        AtomicInteger x = new AtomicInteger(0);
3343 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3344 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3345 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3346 >        assertEquals(x.get(), 1);
3347 >        assertNull(r.get());
3348      }
3349  
3350      /**
3351 <     * whenComplete action executes on exceptional completion, propagating
3352 <     * source result.
3351 >     * defaultExecutor by default returns the commonPool if
3352 >     * it supports more than one thread.
3353       */
3354 <    public void testWhenComplete_exceptionalCompletion() {
3355 <        for (boolean createIncomplete : new boolean[] { true, false })
3356 <        for (ExecutionMode m : ExecutionMode.values())
3357 <        for (Integer v1 : new Integer[] { 1, null }) {
3354 >    public void testDefaultExecutor() {
3355 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3356 >        Executor e = f.defaultExecutor();
3357 >        Executor c = ForkJoinPool.commonPool();
3358 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3359 >            assertSame(e, c);
3360 >        else
3361 >            assertNotSame(e, c);
3362 >    }
3363  
3364 <        final AtomicInteger a = new AtomicInteger();
3365 <        final CFException ex = new CFException();
3366 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3367 <        if (!createIncomplete) f.completeExceptionally(ex);
3368 <        final CompletableFuture<Integer> g = m.whenComplete
3369 <            (f,
3370 <             (Integer x, Throwable t) -> {
3371 <                threadAssertNull(x);
3369 <                threadAssertSame(t, ex);
3370 <                a.getAndIncrement();
3371 <            });
3372 <        if (createIncomplete) f.completeExceptionally(ex);
3373 <        checkCompletedWithWrappedCFException(f, ex);
3374 <        checkCompletedWithWrappedCFException(g, ex);
3375 <        assertEquals(a.get(), 1);
3376 <        }
3364 >    /**
3365 >     * failedFuture returns a CompletableFuture completed
3366 >     * exceptionally with the given Exception
3367 >     */
3368 >    public void testFailedFuture() {
3369 >        CFException ex = new CFException();
3370 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3371 >        checkCompletedExceptionally(f, ex);
3372      }
3373  
3374      /**
3375 <     * If a whenComplete action throws an exception when triggered by
3381 <     * a normal completion, it completes exceptionally
3375 >     * failedFuture(null) throws NPE
3376       */
3377 <    public void testWhenComplete_actionFailed() {
3378 <        for (boolean createIncomplete : new boolean[] { true, false })
3379 <        for (ExecutionMode m : ExecutionMode.values())
3380 <        for (Integer v1 : new Integer[] { 1, null }) {
3377 >    public void testFailedFuture_null() {
3378 >        try {
3379 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3380 >            shouldThrow();
3381 >        } catch (NullPointerException success) {}
3382 >    }
3383  
3384 <        final CFException ex = new CFException();
3385 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3386 <        if (!createIncomplete) f.complete(v1);
3387 <        final CompletableFuture<Integer> g = m.whenComplete
3388 <            (f,
3389 <             (Integer x, Throwable t) -> {
3390 <                threadAssertSame(x, v1);
3391 <                threadAssertNull(t);
3392 <                throw ex;
3393 <            });
3394 <        if (createIncomplete) f.complete(v1);
3395 <        checkCompletedNormally(f, v1);
3400 <        checkCompletedWithWrappedCFException(g, ex);
3401 <        }
3384 >    /**
3385 >     * copy returns a CompletableFuture that is completed normally,
3386 >     * with the same value, when source is.
3387 >     */
3388 >    public void testCopy() {
3389 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3390 >        CompletableFuture<Integer> g = f.copy();
3391 >        checkIncomplete(f);
3392 >        checkIncomplete(g);
3393 >        f.complete(1);
3394 >        checkCompletedNormally(f, 1);
3395 >        checkCompletedNormally(g, 1);
3396      }
3397  
3398      /**
3399 <     * If a whenComplete action throws an exception when triggered by
3400 <     * a source completion that also throws an exception, the source
3407 <     * exception takes precedence.
3399 >     * copy returns a CompletableFuture that is completed exceptionally
3400 >     * when source is.
3401       */
3402 <    public void testWhenComplete_actionFailedSourceFailed() {
3403 <        for (boolean createIncomplete : new boolean[] { true, false })
3404 <        for (ExecutionMode m : ExecutionMode.values())
3405 <        for (Integer v1 : new Integer[] { 1, null }) {
3402 >    public void testCopy2() {
3403 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3404 >        CompletableFuture<Integer> g = f.copy();
3405 >        checkIncomplete(f);
3406 >        checkIncomplete(g);
3407 >        CFException ex = new CFException();
3408 >        f.completeExceptionally(ex);
3409 >        checkCompletedExceptionally(f, ex);
3410 >        checkCompletedWithWrappedException(g, ex);
3411 >    }
3412  
3413 <        final CFException ex1 = new CFException();
3414 <        final CFException ex2 = new CFException();
3415 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3413 >    /**
3414 >     * minimalCompletionStage returns a CompletableFuture that is
3415 >     * completed normally, with the same value, when source is.
3416 >     */
3417 >    public void testMinimalCompletionStage() {
3418 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3419 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3420 >        AtomicInteger x = new AtomicInteger(0);
3421 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3422 >        checkIncomplete(f);
3423 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3424 >        f.complete(1);
3425 >        checkCompletedNormally(f, 1);
3426 >        assertEquals(x.get(), 1);
3427 >        assertNull(r.get());
3428 >    }
3429  
3430 <        if (!createIncomplete) f.completeExceptionally(ex1);
3431 <        final CompletableFuture<Integer> g = m.whenComplete
3432 <            (f,
3433 <             (Integer x, Throwable t) -> {
3434 <                threadAssertSame(t, ex1);
3435 <                threadAssertNull(x);
3436 <                throw ex2;
3437 <            });
3438 <        if (createIncomplete) f.completeExceptionally(ex1);
3430 >    /**
3431 >     * minimalCompletionStage returns a CompletableFuture that is
3432 >     * completed exceptionally when source is.
3433 >     */
3434 >    public void testMinimalCompletionStage2() {
3435 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3436 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3437 >        AtomicInteger x = new AtomicInteger(0);
3438 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3439 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3440 >        checkIncomplete(f);
3441 >        CFException ex = new CFException();
3442 >        f.completeExceptionally(ex);
3443 >        checkCompletedExceptionally(f, ex);
3444 >        assertEquals(x.get(), 0);
3445 >        assertEquals(r.get().getCause(), ex);
3446 >    }
3447  
3448 <        checkCompletedWithWrappedCFException(f, ex1);
3449 <        checkCompletedWithWrappedCFException(g, ex1);
3450 <        }
3448 >    /**
3449 >     * failedStage returns a CompletionStage completed
3450 >     * exceptionally with the given Exception
3451 >     */
3452 >    public void testFailedStage() {
3453 >        CFException ex = new CFException();
3454 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3455 >        AtomicInteger x = new AtomicInteger(0);
3456 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3457 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3458 >        assertEquals(x.get(), 0);
3459 >        assertEquals(r.get(), ex);
3460      }
3461  
3462      /**
3463 <     * handleAsync action completes normally with function value on
3435 <     * either normal or exceptional completion of source
3463 >     * completeAsync completes with value of given supplier
3464       */
3465 <    public void testHandleAsync() {
3466 <        CompletableFuture<Integer> f, g;
3467 <        IntegerHandler r;
3465 >    public void testCompleteAsync() {
3466 >        for (Integer v1 : new Integer[] { 1, null })
3467 >    {
3468 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3469 >        f.completeAsync(() -> v1);
3470 >        f.join();
3471 >        checkCompletedNormally(f, v1);
3472 >    }}
3473  
3474 <        f = new CompletableFuture<>();
3475 <        g = f.handleAsync(r = new IntegerHandler());
3476 <        assertEquals(0, r.invocationCount);
3477 <        f.completeExceptionally(new CFException());
3478 <        checkCompletedWithWrappedCFException(f);
3479 <        checkCompletedNormally(g, three);
3480 <        assertEquals(1, r.invocationCount);
3474 >    /**
3475 >     * completeAsync completes exceptionally if given supplier throws
3476 >     */
3477 >    public void testCompleteAsync2() {
3478 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3479 >        CFException ex = new CFException();
3480 >        f.completeAsync(() -> {if (true) throw ex; return 1;});
3481 >        try {
3482 >            f.join();
3483 >            shouldThrow();
3484 >        } catch (CompletionException success) {}
3485 >        checkCompletedWithWrappedException(f, ex);
3486 >    }
3487  
3488 <        f = new CompletableFuture<>();
3489 <        g = f.handleAsync(r = new IntegerHandler());
3490 <        assertEquals(0, r.invocationCount);
3491 <        f.completeExceptionally(new CFException());
3492 <        checkCompletedWithWrappedCFException(f);
3493 <        checkCompletedNormally(g, three);
3494 <        assertEquals(1, r.invocationCount);
3488 >    /**
3489 >     * completeAsync with given executor completes with value of given supplier
3490 >     */
3491 >    public void testCompleteAsync3() {
3492 >        for (Integer v1 : new Integer[] { 1, null })
3493 >    {
3494 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3495 >        ThreadExecutor executor = new ThreadExecutor();
3496 >        f.completeAsync(() -> v1, executor);
3497 >        assertSame(v1, f.join());
3498 >        checkCompletedNormally(f, v1);
3499 >        assertEquals(1, executor.count.get());
3500 >    }}
3501  
3502 <        f = new CompletableFuture<>();
3503 <        g = f.handleAsync(r = new IntegerHandler());
3504 <        assertEquals(0, r.invocationCount);
3505 <        f.complete(one);
3506 <        checkCompletedNormally(f, one);
3507 <        checkCompletedNormally(g, two);
3508 <        assertEquals(1, r.invocationCount);
3502 >    /**
3503 >     * completeAsync with given executor completes exceptionally if
3504 >     * given supplier throws
3505 >     */
3506 >    public void testCompleteAsync4() {
3507 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3508 >        CFException ex = new CFException();
3509 >        ThreadExecutor executor = new ThreadExecutor();
3510 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3511 >        try {
3512 >            f.join();
3513 >            shouldThrow();
3514 >        } catch (CompletionException success) {}
3515 >        checkCompletedWithWrappedException(f, ex);
3516 >        assertEquals(1, executor.count.get());
3517 >    }
3518  
3519 <        f = new CompletableFuture<>();
3520 <        g = f.handleAsync(r = new IntegerHandler());
3521 <        assertEquals(0, r.invocationCount);
3522 <        f.complete(one);
3523 <        checkCompletedNormally(f, one);
3524 <        checkCompletedNormally(g, two);
3525 <        assertEquals(1, r.invocationCount);
3519 >    /**
3520 >     * orTimeout completes with TimeoutException if not complete
3521 >     */
3522 >    public void testOrTimeout_timesOut() {
3523 >        long timeoutMillis = timeoutMillis();
3524 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3525 >        long startTime = System.nanoTime();
3526 >        f.orTimeout(timeoutMillis, MILLISECONDS);
3527 >        checkCompletedWithTimeoutException(f);
3528 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3529      }
3530  
3531      /**
3532 <     * handleAsync action with Executor completes normally with
3476 <     * function value on either normal or exceptional completion of
3477 <     * source
3532 >     * orTimeout completes normally if completed before timeout
3533       */
3534 <    public void testHandleAsync2() {
3535 <        CompletableFuture<Integer> f, g;
3536 <        ThreadExecutor exec = new ThreadExecutor();
3537 <        IntegerHandler r;
3534 >    public void testOrTimeout_completed() {
3535 >        for (Integer v1 : new Integer[] { 1, null })
3536 >    {
3537 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3538 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3539 >        long startTime = System.nanoTime();
3540 >        f.complete(v1);
3541 >        f.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3542 >        g.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3543 >        g.complete(v1);
3544 >        checkCompletedNormally(f, v1);
3545 >        checkCompletedNormally(g, v1);
3546 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3547 >    }}
3548  
3549 <        f = new CompletableFuture<>();
3550 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3551 <        assertEquals(0, r.invocationCount);
3552 <        f.completeExceptionally(new CFException());
3553 <        checkCompletedWithWrappedCFException(f);
3554 <        checkCompletedNormally(g, three);
3555 <        assertEquals(1, r.invocationCount);
3549 >    /**
3550 >     * completeOnTimeout completes with given value if not complete
3551 >     */
3552 >    public void testCompleteOnTimeout_timesOut() {
3553 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3554 >                       () -> testCompleteOnTimeout_timesOut(null));
3555 >    }
3556  
3557 <        f = new CompletableFuture<>();
3558 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3559 <        assertEquals(0, r.invocationCount);
3560 <        f.completeExceptionally(new CFException());
3561 <        checkCompletedWithWrappedCFException(f);
3562 <        checkCompletedNormally(g, three);
3563 <        assertEquals(1, r.invocationCount);
3557 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3558 >        long timeoutMillis = timeoutMillis();
3559 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3560 >        long startTime = System.nanoTime();
3561 >        f.completeOnTimeout(v, timeoutMillis, MILLISECONDS);
3562 >        assertSame(v, f.join());
3563 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3564 >        f.complete(99);         // should have no effect
3565 >        checkCompletedNormally(f, v);
3566 >    }
3567  
3568 <        f = new CompletableFuture<>();
3569 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3570 <        assertEquals(0, r.invocationCount);
3571 <        f.complete(one);
3572 <        checkCompletedNormally(f, one);
3573 <        checkCompletedNormally(g, two);
3574 <        assertEquals(1, r.invocationCount);
3568 >    /**
3569 >     * completeOnTimeout has no effect if completed within timeout
3570 >     */
3571 >    public void testCompleteOnTimeout_completed() {
3572 >        for (Integer v1 : new Integer[] { 1, null })
3573 >    {
3574 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3575 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3576 >        long startTime = System.nanoTime();
3577 >        f.complete(v1);
3578 >        f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3579 >        g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3580 >        g.complete(v1);
3581 >        checkCompletedNormally(f, v1);
3582 >        checkCompletedNormally(g, v1);
3583 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3584 >    }}
3585  
3586 <        f = new CompletableFuture<>();
3587 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3588 <        assertEquals(0, r.invocationCount);
3589 <        f.complete(one);
3590 <        checkCompletedNormally(f, one);
3591 <        checkCompletedNormally(g, two);
3592 <        assertEquals(1, r.invocationCount);
3586 >    /**
3587 >     * delayedExecutor returns an executor that delays submission
3588 >     */
3589 >    public void testDelayedExecutor() {
3590 >        testInParallel(() -> testDelayedExecutor(null, null),
3591 >                       () -> testDelayedExecutor(null, 1),
3592 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3593 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3594      }
3595  
3596 +    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3597 +        long timeoutMillis = timeoutMillis();
3598 +        // Use an "unreasonably long" long timeout to catch lingering threads
3599 +        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3600 +        final Executor delayer, longDelayer;
3601 +        if (executor == null) {
3602 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3603 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3604 +        } else {
3605 +            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3606 +            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3607 +        }
3608 +        long startTime = System.nanoTime();
3609 +        CompletableFuture<Integer> f =
3610 +            CompletableFuture.supplyAsync(() -> v, delayer);
3611 +        CompletableFuture<Integer> g =
3612 +            CompletableFuture.supplyAsync(() -> v, longDelayer);
3613 +
3614 +        assertNull(g.getNow(null));
3615 +
3616 +        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3617 +        long millisElapsed = millisElapsedSince(startTime);
3618 +        assertTrue(millisElapsed >= timeoutMillis);
3619 +        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3620 +
3621 +        checkCompletedNormally(f, v);
3622 +
3623 +        checkIncomplete(g);
3624 +        assertTrue(g.cancel(true));
3625 +    }
3626 +
3627 +    //--- tests of implementation details; not part of official tck ---
3628 +
3629 +    Object resultOf(CompletableFuture<?> f) {
3630 +        try {
3631 +            java.lang.reflect.Field resultField
3632 +                = CompletableFuture.class.getDeclaredField("result");
3633 +            resultField.setAccessible(true);
3634 +            return resultField.get(f);
3635 +        } catch (Throwable t) { throw new AssertionError(t); }
3636 +    }
3637 +
3638 +    public void testExceptionPropagationReusesResultObject() {
3639 +        if (!testImplementationDetails) return;
3640 +        for (ExecutionMode m : ExecutionMode.values())
3641 +    {
3642 +        final CFException ex = new CFException();
3643 +        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3644 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3645 +
3646 +        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3647 +            = new ArrayList<>();
3648 +
3649 +        funs.add((y) -> m.thenRun(y, new Noop(m)));
3650 +        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3651 +        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3652 +
3653 +        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3654 +        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3655 +        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3656 +
3657 +        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3658 +        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3659 +        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3660 +
3661 +        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3662 +
3663 +        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3664 +
3665 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3666 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3667 +
3668 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3669 +                 fun : funs) {
3670 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3671 +            f.completeExceptionally(ex);
3672 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3673 +            checkCompletedWithWrappedException(src, ex);
3674 +            CompletableFuture<?> dep = fun.apply(src);
3675 +            checkCompletedWithWrappedException(dep, ex);
3676 +            assertSame(resultOf(src), resultOf(dep));
3677 +        }
3678 +
3679 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3680 +                 fun : funs) {
3681 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3682 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3683 +            CompletableFuture<?> dep = fun.apply(src);
3684 +            f.completeExceptionally(ex);
3685 +            checkCompletedWithWrappedException(src, ex);
3686 +            checkCompletedWithWrappedException(dep, ex);
3687 +            assertSame(resultOf(src), resultOf(dep));
3688 +        }
3689 +
3690 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3691 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3692 +                 fun : funs) {
3693 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3694 +            f.cancel(mayInterruptIfRunning);
3695 +            checkCancelled(f);
3696 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3697 +            checkCompletedWithWrappedCancellationException(src);
3698 +            CompletableFuture<?> dep = fun.apply(src);
3699 +            checkCompletedWithWrappedCancellationException(dep);
3700 +            assertSame(resultOf(src), resultOf(dep));
3701 +        }
3702 +
3703 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3704 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3705 +                 fun : funs) {
3706 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3707 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3708 +            CompletableFuture<?> dep = fun.apply(src);
3709 +            f.cancel(mayInterruptIfRunning);
3710 +            checkCancelled(f);
3711 +            checkCompletedWithWrappedCancellationException(src);
3712 +            checkCompletedWithWrappedCancellationException(dep);
3713 +            assertSame(resultOf(src), resultOf(dep));
3714 +        }
3715 +    }}
3716 +
3717 +    /**
3718 +     * Minimal completion stages throw UOE for all non-CompletionStage methods
3719 +     */
3720 +    public void testMinimalCompletionStage_minimality() {
3721 +        if (!testImplementationDetails) return;
3722 +        Function<Method, String> toSignature =
3723 +            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3724 +        Predicate<Method> isNotStatic =
3725 +            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3726 +        List<Method> minimalMethods =
3727 +            Stream.of(Object.class, CompletionStage.class)
3728 +            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3729 +            .filter(isNotStatic)
3730 +            .collect(Collectors.toList());
3731 +        // Methods from CompletableFuture permitted NOT to throw UOE
3732 +        String[] signatureWhitelist = {
3733 +            "newIncompleteFuture[]",
3734 +            "defaultExecutor[]",
3735 +            "minimalCompletionStage[]",
3736 +            "copy[]",
3737 +        };
3738 +        Set<String> permittedMethodSignatures =
3739 +            Stream.concat(minimalMethods.stream().map(toSignature),
3740 +                          Stream.of(signatureWhitelist))
3741 +            .collect(Collectors.toSet());
3742 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3743 +            .filter(isNotStatic)
3744 +            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3745 +            .collect(Collectors.toList());
3746 +
3747 +        CompletionStage<Integer> minimalStage =
3748 +            new CompletableFuture<Integer>().minimalCompletionStage();
3749 +
3750 +        List<Method> bugs = new ArrayList<>();
3751 +        for (Method method : allMethods) {
3752 +            Class<?>[] parameterTypes = method.getParameterTypes();
3753 +            Object[] args = new Object[parameterTypes.length];
3754 +            // Manufacture boxed primitives for primitive params
3755 +            for (int i = 0; i < args.length; i++) {
3756 +                Class<?> type = parameterTypes[i];
3757 +                if (parameterTypes[i] == boolean.class)
3758 +                    args[i] = false;
3759 +                else if (parameterTypes[i] == int.class)
3760 +                    args[i] = 0;
3761 +                else if (parameterTypes[i] == long.class)
3762 +                    args[i] = 0L;
3763 +            }
3764 +            try {
3765 +                method.invoke(minimalStage, args);
3766 +                bugs.add(method);
3767 +            }
3768 +            catch (java.lang.reflect.InvocationTargetException expected) {
3769 +                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3770 +                    bugs.add(method);
3771 +                    // expected.getCause().printStackTrace();
3772 +                }
3773 +            }
3774 +            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3775 +        }
3776 +        if (!bugs.isEmpty())
3777 +            throw new Error("Methods did not throw UOE: " + bugs.toString());
3778 +    }
3779 +
3780 +    static class Monad {
3781 +        static class ZeroException extends RuntimeException {
3782 +            public ZeroException() { super("monadic zero"); }
3783 +        }
3784 +        // "return", "unit"
3785 +        static <T> CompletableFuture<T> unit(T value) {
3786 +            return completedFuture(value);
3787 +        }
3788 +        // monadic zero ?
3789 +        static <T> CompletableFuture<T> zero() {
3790 +            return failedFuture(new ZeroException());
3791 +        }
3792 +        // >=>
3793 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
3794 +            (Function<T, CompletableFuture<U>> f,
3795 +             Function<U, CompletableFuture<V>> g) {
3796 +            return (x) -> f.apply(x).thenCompose(g);
3797 +        }
3798 +
3799 +        static void assertZero(CompletableFuture<?> f) {
3800 +            try {
3801 +                f.getNow(null);
3802 +                throw new AssertionFailedError("should throw");
3803 +            } catch (CompletionException success) {
3804 +                assertTrue(success.getCause() instanceof ZeroException);
3805 +            }
3806 +        }
3807 +
3808 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
3809 +                                           CompletableFuture<T> g) {
3810 +            T fval = null, gval = null;
3811 +            Throwable fex = null, gex = null;
3812 +
3813 +            try { fval = f.get(); }
3814 +            catch (ExecutionException ex) { fex = ex.getCause(); }
3815 +            catch (Throwable ex) { fex = ex; }
3816 +
3817 +            try { gval = g.get(); }
3818 +            catch (ExecutionException ex) { gex = ex.getCause(); }
3819 +            catch (Throwable ex) { gex = ex; }
3820 +
3821 +            if (fex != null || gex != null)
3822 +                assertSame(fex.getClass(), gex.getClass());
3823 +            else
3824 +                assertEquals(fval, gval);
3825 +        }
3826 +
3827 +        static class PlusFuture<T> extends CompletableFuture<T> {
3828 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
3829 +        }
3830 +
3831 +        /** Implements "monadic plus". */
3832 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
3833 +                                             CompletableFuture<? extends T> g) {
3834 +            PlusFuture<T> plus = new PlusFuture<T>();
3835 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
3836 +                try {
3837 +                    if (ex == null) {
3838 +                        if (plus.complete(result))
3839 +                            if (plus.firstFailure.get() != null)
3840 +                                plus.firstFailure.set(null);
3841 +                    }
3842 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
3843 +                        if (plus.isDone())
3844 +                            plus.firstFailure.set(null);
3845 +                    }
3846 +                    else {
3847 +                        // first failure has precedence
3848 +                        Throwable first = plus.firstFailure.getAndSet(null);
3849 +
3850 +                        // may fail with "Self-suppression not permitted"
3851 +                        try { first.addSuppressed(ex); }
3852 +                        catch (Exception ignored) {}
3853 +
3854 +                        plus.completeExceptionally(first);
3855 +                    }
3856 +                } catch (Throwable unexpected) {
3857 +                    plus.completeExceptionally(unexpected);
3858 +                }
3859 +            };
3860 +            f.whenComplete(action);
3861 +            g.whenComplete(action);
3862 +            return plus;
3863 +        }
3864 +    }
3865 +
3866 +    /**
3867 +     * CompletableFuture is an additive monad - sort of.
3868 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
3869 +     */
3870 +    public void testAdditiveMonad() throws Throwable {
3871 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
3872 +        CompletableFuture<Long> zero = Monad.zero();
3873 +
3874 +        // Some mutually non-commutative functions
3875 +        Function<Long, CompletableFuture<Long>> triple
3876 +            = (x) -> Monad.unit(3 * x);
3877 +        Function<Long, CompletableFuture<Long>> inc
3878 +            = (x) -> Monad.unit(x + 1);
3879 +
3880 +        // unit is a right identity: m >>= unit === m
3881 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
3882 +                                 inc.apply(5L));
3883 +        // unit is a left identity: (unit x) >>= f === f x
3884 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
3885 +                                 inc.apply(5L));
3886 +
3887 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
3888 +        Monad.assertFutureEquals(
3889 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
3890 +            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
3891 +
3892 +        // The case for CompletableFuture as an additive monad is weaker...
3893 +
3894 +        // zero is a monadic zero
3895 +        Monad.assertZero(zero);
3896 +
3897 +        // left zero: zero >>= f === zero
3898 +        Monad.assertZero(zero.thenCompose(inc));
3899 +        // right zero: f >>= (\x -> zero) === zero
3900 +        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
3901 +
3902 +        // f plus zero === f
3903 +        Monad.assertFutureEquals(Monad.unit(5L),
3904 +                                 Monad.plus(Monad.unit(5L), zero));
3905 +        // zero plus f === f
3906 +        Monad.assertFutureEquals(Monad.unit(5L),
3907 +                                 Monad.plus(zero, Monad.unit(5L)));
3908 +        // zero plus zero === zero
3909 +        Monad.assertZero(Monad.plus(zero, zero));
3910 +        {
3911 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
3912 +                                                   Monad.unit(8L));
3913 +            // non-determinism
3914 +            assertTrue(f.get() == 5L || f.get() == 8L);
3915 +        }
3916 +
3917 +        CompletableFuture<Long> godot = new CompletableFuture<>();
3918 +        // f plus godot === f (doesn't wait for godot)
3919 +        Monad.assertFutureEquals(Monad.unit(5L),
3920 +                                 Monad.plus(Monad.unit(5L), godot));
3921 +        // godot plus f === f (doesn't wait for godot)
3922 +        Monad.assertFutureEquals(Monad.unit(5L),
3923 +                                 Monad.plus(godot, Monad.unit(5L)));
3924 +    }
3925 +
3926 + //     static <U> U join(CompletionStage<U> stage) {
3927 + //         CompletableFuture<U> f = new CompletableFuture<>();
3928 + //         stage.whenComplete((v, ex) -> {
3929 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
3930 + //         });
3931 + //         return f.join();
3932 + //     }
3933 +
3934 + //     static <U> boolean isDone(CompletionStage<U> stage) {
3935 + //         CompletableFuture<U> f = new CompletableFuture<>();
3936 + //         stage.whenComplete((v, ex) -> {
3937 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
3938 + //         });
3939 + //         return f.isDone();
3940 + //     }
3941 +
3942 + //     static <U> U join2(CompletionStage<U> stage) {
3943 + //         return stage.toCompletableFuture().copy().join();
3944 + //     }
3945 +
3946 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
3947 + //         return stage.toCompletableFuture().copy().isDone();
3948 + //     }
3949 +
3950   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines